Attachment 7821 Details for Bug 9117 – git-am fix for 3.5.next

[patch] git-am fix for 3.5.next

0001-Fix-bug-9117-smbclient-can-t-connect-to-a-Windows-7-.patch (text/plain), 1.61 KB, created by Jeremy Allison on 2012-08-24 22:55:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2012-08-24 22:55:13 UTC

Size: 1.61 KB

patch

obsolete

>From c3a9ff4a6cd7859a2b16b6bdd48df91f79f45824 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 24 Aug 2012 15:54:07 -0700
>Subject: [PATCH] Fix bug #9117 - smbclient can't connect to a Windows 7
> server using NTLMv2 (crypto code changes domain case).
>
>Simple fix for 3.5.x, tested and confirmed as working by original reporter
>"Blohm, Guntram (I/FP-37, extern)" <extern.guntram.blohm@audi.de>.
>---
> libcli/auth/smbencrypt.c    |    5 ++++-
> source3/libsmb/cliconnect.c |    1 +
> 2 files changed, 5 insertions(+), 1 deletions(-)
>
>diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
>index f7c60e7..e821dbc 100644
>--- a/libcli/auth/smbencrypt.c
>+++ b/libcli/auth/smbencrypt.c
>@@ -471,8 +471,11 @@ bool SMBNTLMv2encrypt_hash(TALLOC_CTX *mem_ctx,
> 	/* We don't use the NT# directly.  Instead we use it mashed up with
> 	   the username and domain.
> 	   This prevents username swapping during the auth exchange
>+	   NB. *DON'T* tell ntv2_owf_gen() to uppercase the domain
>+	   name here, we may have already been added to an NTLMSSP
>+	   exchange in the non-uppercase form.
> 	*/
>-	if (!ntv2_owf_gen(nt_hash, user, domain, true, ntlm_v2_hash)) {
>+	if (!ntv2_owf_gen(nt_hash, user, domain, false, ntlm_v2_hash)) {
> 		return false;
> 	}
> 
>diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
>index e858280..7b00469 100644
>--- a/source3/libsmb/cliconnect.c
>+++ b/source3/libsmb/cliconnect.c
>@@ -1178,6 +1178,7 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
> 	    (p=strchr_m(user2,*lp_winbind_separator()))) {
> 		*p = 0;
> 		user = p+1;
>+		strupper_m(user2);
> 		workgroup = user2;
> 	}
> 
>-- 
>1.7.7.3
>

Flags:

abartlet: review+
ddiss: review+

Actions: View

Attachments on bug 9117: 7820 | 7821