[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  fad5e3b Move the talloc_move call until *after* the check on status. Don't want to move something that might be invalid.
      from  85332eb s3:libsmb: check the wct of the incoming SMBnegprot responses

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


- Log -----------------------------------------------------------------
commit fad5e3be5e4739e9e19f3f87a49c059336a436d4
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Sep 12 11:23:17 2011 -0700

    Move the talloc_move call until *after* the check on status. Don't want to move something that might be invalid.
    
    Makes the code match what is currently in 3.6.x.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Mon Sep 12 22:21:24 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/auth/user_krb5.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/user_krb5.c b/source3/auth/user_krb5.c
index 489080e..b106e45 100644
--- a/source3/auth/user_krb5.c
+++ b/source3/auth/user_krb5.c
@@ -243,9 +243,6 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx,
 			status = make_server_info_pw(&tmp, username, pw);
 		}
 
-		/* Steal tmp server info into the server_info pointer. */
-		server_info = talloc_move(mem_ctx, &tmp);
-
 		TALLOC_FREE(sampass);
 
 		if (!NT_STATUS_IS_OK(status)) {
@@ -254,6 +251,9 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx,
 			return status;
                 }
 
+		/* Steal tmp server info into the server_info pointer. */
+		server_info = talloc_move(mem_ctx, &tmp);
+
 		/* make_server_info_pw does not set the domain. Without this
 		 * we end up with the local netbios name in substitutions for
 		 * %D. */


-- 
Samba Shared Repository