[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1227-g2467671

Karolin Seeger kseeger at samba.org
Fri Aug 28 06:12:01 MDT 2009


The branch, v3-4-test has been updated
       via  2467671ba55c5ac834a8aa7ae8ad736958baab1d (commit)
      from  0911f7137bf37a9a14e6ebff9a0990482a11375b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 2467671ba55c5ac834a8aa7ae8ad736958baab1d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Aug 27 13:16:15 2009 +0200

    s3:netlogon: replace cred_hash3 by des_crypt112_16
    
    This makes sure we don't truncate the session key to 8 bytes
    Fixes bug #6664
    
    metze

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

Summary of changes:
 source3/rpc_client/cli_netlogon.c  |    6 +++---
 source3/rpc_server/srv_netlog_nt.c |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 5f115e5..4d7347f 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -601,9 +601,9 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
 
 		struct samr_Password new_password;
 
-		cred_hash3(new_password.hash,
-			   new_trust_passwd_hash,
-			   cli->dc->sess_key, 1);
+		des_crypt112_16(new_password.hash,
+				new_trust_passwd_hash,
+				cli->dc->sess_key, 1);
 
 		result = rpccli_netr_ServerPasswordSet(cli, mem_ctx,
 						       cli->dc->remote_machine,
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 79606ab..3337c87 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -741,8 +741,7 @@ NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
 		return NT_STATUS_ACCOUNT_DISABLED;
 	}
 
-	/* Woah - what does this to to the credential chain ? JRA */
-	cred_hash3(pwd, r->in.new_password->hash, p->dc->sess_key, 0);
+	des_crypt112_16(pwd, r->in.new_password->hash, p->dc->sess_key, 0);
 
 	DEBUG(100,("_netr_ServerPasswordSet: new given value was :\n"));
 	for(i = 0; i < sizeof(pwd); i++)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list