diff options
| author | Tim Potter <tpot@samba.org> | 2001-02-14 05:34:50 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2001-02-14 05:34:50 +0000 |
| commit | 64172d82fcf1762a8bc938282919f9e3bd39675d (patch) | |
| tree | d1aceb0a9bb586242c5a0eba36b5aacfe5b50ce2 /source3/smbd/reply.c | |
| parent | da20d4e5df3c908cc00bf31570892fa5f19853e7 (diff) | |
| download | samba-64172d82fcf1762a8bc938282919f9e3bd39675d.tar.gz samba-64172d82fcf1762a8bc938282919f9e3bd39675d.tar.bz2 samba-64172d82fcf1762a8bc938282919f9e3bd39675d.zip | |
Merge of i18n fixes from appliance branch. Samba can now talk to a network
with a PDC that has international netbios name and domain name. There's
still quite a bit of i18n stuff to fix though...
(This used to be commit 79045bd72ace9144e7dd73785b1d10a71b0d15aa)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 2d205543fb..e1feb921f5 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -900,7 +900,10 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int that */ if (!sys_getpwnam(user)) { pstring user2; - slprintf(user2,sizeof(user2),"%s%s%s", dos_to_unix(domain,False), lp_winbind_separator(), user); + + slprintf(user2,sizeof(user2),"%s%s%s", dos_to_unix(domain,False), + lp_winbind_separator(), user); + if (sys_getpwnam(user2)) { DEBUG(3,("Using unix username %s\n", user2)); pstrcpy(user, user2); @@ -1018,7 +1021,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int p = smb_buf(outbuf); pstrcpy(p,"Unix"); p = skip_string(p,1); pstrcpy(p,"Samba "); pstrcat(p,VERSION); p = skip_string(p,1); - pstrcpy(p,global_myworkgroup); p = skip_string(p,1); + pstrcpy(p,global_myworkgroup); unix_to_dos(p, True); p = skip_string(p,1); set_message(outbuf,3,PTR_DIFF(p,smb_buf(outbuf)),False); /* perhaps grab OS version here?? */ } |