diff options
| author | Jeremy Allison <jra@samba.org> | 2012-08-24 15:54:07 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-11-01 09:10:37 +0100 |
| commit | d99ed100df916a95ffaf7872247ae731b4f42d64 (patch) | |
| tree | 11e0a051a0d8c79a4cfdefe308f372980ab33530 | |
| parent | 41d3ec2ed53d45128d13483ef6920c21839d8250 (diff) | |
| download | samba-d99ed100df916a95ffaf7872247ae731b4f42d64.tar.gz | |
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>.
(cherry picked from commit c13c6eb11f49b1fd3b3be95c7265cf9c0738b4e8)
| -rw-r--r-- | libcli/auth/smbencrypt.c | 5 | ||||
| -rw-r--r-- | 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 f7c60e7de12..e821dbcdf7c 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 e858280cd95..7b00469ffff 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; } |