[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  fd92db5... s3: Remove a pointless "else" branch from add_ccache_to_list()
       via  fc17573... s3: Slightly simplify winbindd_store_creds
       via  43c841b... s3: Fix a segfault in winbindd_dual_ccache_ntlm_auth()
      from  c03a101... s4-drs: instanceType is always sent, regardless of UDV values

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


- Log -----------------------------------------------------------------
commit fd92db55eb613c5189f1a4aed719f77d47b80d68
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 9 18:43:38 2010 +0100

    s3: Remove a pointless "else" branch from add_ccache_to_list()

commit fc1757369fe73eb2bdd0336c758cdae5a0e96974
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 9 19:01:35 2010 +0100

    s3: Slightly simplify winbindd_store_creds

commit 43c841b6bd92e987109df81b6b8a2b85f21b0181
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 9 20:22:00 2010 +0100

    s3: Fix a segfault in winbindd_dual_ccache_ntlm_auth()
    
    ntlmssp_update allocates the reply_blob as a child of ntlmssp_state. This means
    with ntlmss_end() it will be gone. winbindd_dual_ccache_ntlm_auth used the blob
    after the ntlmssp_end().

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

Summary of changes:
 source3/winbindd/winbindd_ccache_access.c |    2 +-
 source3/winbindd/winbindd_cred_cache.c    |    7 +++----
 source3/winbindd/winbindd_creds.c         |    6 ++----
 3 files changed, 6 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c
index 921110a..2f71aaa 100644
--- a/source3/winbindd/winbindd_ccache_access.c
+++ b/source3/winbindd/winbindd_ccache_access.c
@@ -116,7 +116,7 @@ static NTSTATUS do_ntlm_auth_with_hashes(const char *username,
 		data_blob_free(&reply);
 		goto done;
 	}
-	*auth_msg = reply;
+	*auth_msg = data_blob(reply.data, reply.length);
 	status = NT_STATUS_OK;
 
 done:
diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c
index e63e732..01b77f0 100644
--- a/source3/winbindd/winbindd_cred_cache.c
+++ b/source3/winbindd/winbindd_cred_cache.c
@@ -523,11 +523,10 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 				   "user krb5 ccache %s with %s\n", ccname,
 				   error_message(ret)));
 			return krb5_to_nt_status(ret);
-		} else {
-			DEBUG(10, ("add_ccache_to_list: successfully destroyed "
-				   "krb5 ccache %s for user %s\n", ccname,
-				   username));
 		}
+		DEBUG(10, ("add_ccache_to_list: successfully destroyed "
+			   "krb5 ccache %s for user %s\n", ccname,
+			   username));
 	}
 #endif
 
diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c
index 98a16ee..3874b6e 100644
--- a/source3/winbindd/winbindd_creds.c
+++ b/source3/winbindd/winbindd_creds.c
@@ -66,10 +66,8 @@ NTSTATUS winbindd_store_creds(struct winbindd_domain *domain,
 
 	if (info3 != NULL) {
 
-		DOM_SID sid;
-		sid_copy(&sid, info3->base.domain_sid);
-		sid_append_rid(&sid, info3->base.rid);
-		sid_copy(&cred_sid, &sid);
+		sid_compose(&cred_sid, info3->base.domain_sid,
+			    info3->base.rid);
 		info3->base.user_flags |= NETLOGON_CACHED_ACCOUNT;
 
 	} else if (user_sid != NULL) {


-- 
Samba Shared Repository