[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  fafd386 Fix const warning.
      from  b19b05c s3-rpc_server: Do not set msg_ctx twice

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


- Log -----------------------------------------------------------------
commit fafd386910ca5f17c42cd0cf0a7c759f0950d518
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jul 21 14:02:10 2011 -0700

    Fix const warning.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Jul 22 01:58:39 CEST 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 2689afd..a261e39 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -562,14 +562,17 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
 
 	if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) ||
 	    (server_info->nss_token)) {
+		char *found_username = NULL;
 		status = create_token_from_username(session_info,
 						    server_info->unix_name,
 						    server_info->guest,
 						    &session_info->unix_token->uid,
 						    &session_info->unix_token->gid,
-						    &session_info->unix_info->unix_name,
+						    &found_username,
 						    &session_info->security_token);
-
+		if (NT_STATUS_IS_OK(status)) {
+			session_info->unix_info->unix_name = found_username;
+		}
 	} else {
 		status = create_local_nt_token_from_info3(session_info,
 							  server_info->guest,


-- 
Samba Shared Repository