From 00ee53dec3577e6d7c72862a3466f6fa1b28d94c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 22 Oct 2009 15:35:59 -0700 Subject: [PATCH] Fix bug 6829 - smbclient does not show special characters properly. All successful calls to cli_session_setup() *must* be followed by calls to cli_init_creds() to stash the credentials we successfully connected with. There were 2 codepaths where this was missing. This caused smbclient to be unable to open the \srvsvc pipe to do an RPC netserverenum, and cause it to fall back to a RAP netserverenum, which uses DOS codepage conversion rather than the full UCS2 of RPC, so the returned characters were not correct (unless the DOS codepage was set correctly). Phew. That was fun to track down :-). Includes logic simplification in libsmb_server.c Jeremy. --- source/libsmb/clidfs.c | 3 +++ source/libsmb/libsmb_server.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/source/libsmb/clidfs.c b/source/libsmb/clidfs.c index 5379ff9..1b17679 100644 --- a/source/libsmb/clidfs.c +++ b/source/libsmb/clidfs.c @@ -235,6 +235,9 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx, return NULL; } d_printf("Anonymous login successful\n"); + cli_init_creds(c, "", lp_workgroup(), ""); + } else { + cli_init_creds(c, username, lp_workgroup(), password); } if ( show_sessetup ) { diff --git a/source/libsmb/libsmb_server.c b/source/libsmb/libsmb_server.c index 6880f5c..dfb56b0 100644 --- a/source/libsmb/libsmb_server.c +++ b/source/libsmb/libsmb_server.c @@ -497,6 +497,8 @@ again: return NULL; } } + + cli_init_creds(c, username_used, *pp_workgroup, *pp_password); DEBUG(4,(" session setup ok\n")); -- 1.5.4.3