diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-20 12:19:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-20 12:19:38 -0500 |
| commit | 252ec9e28f0cf350e246c065ffe70a2e32b84ad4 (patch) | |
| tree | d282a3293c9547da95c4e145175bd86741f5d5f4 /fs/cifs/cifsencrypt.c | |
| parent | d4892279d786dd11f9d6269b3029ad3340e79597 (diff) | |
| parent | 1e6b39fbb61800e3ecee58dc8c4bca57c89365cd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Diffstat (limited to 'fs/cifs/cifsencrypt.c')
| -rw-r--r-- | fs/cifs/cifsencrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index 1959c7c4b185..fe2bb7c4c912 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c | |||
| @@ -149,7 +149,7 @@ int CalcNTLMv2_partial_mac_key(struct cifsSesInfo * ses, struct nls_table * nls_ | |||
| 149 | char temp_hash[16]; | 149 | char temp_hash[16]; |
| 150 | struct HMACMD5Context ctx; | 150 | struct HMACMD5Context ctx; |
| 151 | char * ucase_buf; | 151 | char * ucase_buf; |
| 152 | wchar_t * unicode_buf; | 152 | __le16 * unicode_buf; |
| 153 | unsigned int i,user_name_len,dom_name_len; | 153 | unsigned int i,user_name_len,dom_name_len; |
| 154 | 154 | ||
| 155 | if(ses == NULL) | 155 | if(ses == NULL) |