[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  4a1a9f5... Simplify the logic. Jeremy.
      from  843adc1... 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 :-). Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4a1a9f579265e885c6fabb3acc3cf0d930feacc3
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 22 15:26:22 2009 -0700

    Simplify the logic.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/libsmb_server.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 18b12a1..50ecee2 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -498,13 +498,10 @@ again:
                         errno = EPERM;
                         return NULL;
                 }
-		status = cli_init_creds(c, username_used,
-				*pp_workgroup, *pp_password);
-	} else {
-		status = cli_init_creds(c, username_used,
-				*pp_workgroup, *pp_password);
 	}
 
+	status = cli_init_creds(c, username_used,
+				*pp_workgroup, *pp_password);
 	if (!NT_STATUS_IS_OK(status)) {
 		errno = map_errno_from_nt_status(status);
 		cli_shutdown(c);


-- 
Samba Shared Repository