diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 21:07:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 21:07:58 -0700 |
| commit | 1a67a573b8d9f02211f36fbab50f6265dc49384a (patch) | |
| tree | 8435c615c4afbbc1eb4e80ba7185778a00147929 /fs/cifs/sess.c | |
| parent | 6dbbd92522a13bcd5003829cbed30bc38a3d0362 (diff) | |
| parent | 9ef5992e442b2b0bf6364bfcc5574e983a983159 (diff) | |
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6:
cifs: Assume passwords are encoded according to iocharset (try #2)
CIFS: Fix the VFS brlock cache usage in posix locking case
[CIFS] Update cifs version to 1.76
CIFS: Remove extra mutex_unlock in cifs_lock_add_if
Diffstat (limited to 'fs/cifs/sess.c')
| -rw-r--r-- | fs/cifs/sess.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index c7d80e24f24..4ec3ee9d72c 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -683,7 +683,7 @@ ssetup_ntlmssp_authenticate: cpu_to_le16(CIFS_AUTH_RESP_SIZE); /* calculate ntlm response and session key */ - rc = setup_ntlm_response(ses); + rc = setup_ntlm_response(ses, nls_cp); if (rc) { cERROR(1, "Error %d during NTLM authentication", rc); goto ssetup_exit; |