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/connect.c | |
| parent | 6dbbd92522a13bcd5003829cbed30bc38a3d0362 (diff) | |
| parent | 9ef5992e442b2b0bf6364bfcc5574e983a983159 (diff) | |
| download | linux-1a67a573b8d9f02211f36fbab50f6265dc49384a.tar.bz2 | |
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/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index d545a95c30ed..c0458c543f17 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -3452,7 +3452,7 @@ CIFSTCon(unsigned int xid, struct cifs_ses *ses, else #endif /* CIFS_WEAK_PW_HASH */ rc = SMBNTencrypt(tcon->password, ses->server->cryptkey, - bcc_ptr); + bcc_ptr, nls_codepage); bcc_ptr += CIFS_AUTH_RESP_SIZE; if (ses->capabilities & CAP_UNICODE) { |