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/libsmb | |
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/libsmb')
-rw-r--r-- | source3/libsmb/cliconnect.c | 7 | ||||
-rw-r--r-- | source3/libsmb/namequery.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 3e41ec8296..96bf06d0ac 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -43,9 +43,9 @@ prots[] = /**************************************************************************** - Send a session setup. The username is in UNIX character format and must be - converted to DOS codepage format before sending. If the password is in - plaintext, the same should be done. + Send a session setup. The username and workgroup is in UNIX character + format and must be converted to DOS codepage format before sending. If the + password is in plaintext, the same should be done. ****************************************************************************/ BOOL cli_session_setup(struct cli_state *cli, @@ -166,6 +166,7 @@ BOOL cli_session_setup(struct cli_state *cli, strupper(p); p = skip_string(p,1); pstrcpy(p,workgroup); + unix_to_dos(p,True); strupper(p); p = skip_string(p,1); pstrcpy(p,"Unix");p = skip_string(p,1); diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 173fe12bcb..3e4855b037 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -184,6 +184,8 @@ BOOL name_status_find(int type, struct in_addr to_ip, char *name) StrnCpy(name, status[i].name, 15); + dos_to_unix(name, True); + free(status); return True; } |