Attachment 4602 Details for Bug 6664 – patch for 3.3

[patch] patch for 3.3

v3-3-test-netr_passwordset.diff (text/plain), 1.63 KB, created by Guenther Deschner on 2009-08-27 12:01:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2009-08-27 12:01:26 UTC

Size: 1.63 KB

patch

obsolete

>From af009bae44a42afb4194f3a822be3ae564b06425 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 27 Aug 2009 13:16:15 +0200
>Subject: [PATCH] s3:netlogon: replace cred_hash3 by des_crypt112_16
>
>This makes sure we don't truncate the session key to 8 bytes
>
>metze
>---
> source/rpc_client/cli_netlogon.c  |    6 +++---
> source/rpc_server/srv_netlog_nt.c |    3 +--
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
>diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
>index 23618ef..f2a260c 100644
>--- a/source/rpc_client/cli_netlogon.c
>+++ b/source/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/source/rpc_server/srv_netlog_nt.c b/source/rpc_server/srv_netlog_nt.c
>index dd49096..0c76c8e 100644
>--- a/source/rpc_server/srv_netlog_nt.c
>+++ b/source/rpc_server/srv_netlog_nt.c
>@@ -669,8 +669,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++)
>-- 
>1.6.2.5
>

Actions: View

Attachments on bug 6664: 4600 | 4601 | 4602