diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-27 21:23:44 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-27 21:23:44 +0300 |
| commit | fbe601f7a34b395deb85a63ae5cddd0c084c8db1 (patch) | |
| tree | 1ad0a0d205f3741a8dd1e2e773b11c75f615862f /fs/cifs/ntlmssp.h | |
| parent | 5b7452c840ad085e5ca1bb5b5a23a18e6d5b0c33 (diff) | |
| parent | 45e8a2583d97ca758a55c608f78c4cef562644d1 (diff) | |
| download | linux-fbe601f7a34b395deb85a63ae5cddd0c084c8db1.tar.xz | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"Various small cifs/smb3 fixes, include some for stable, and some from
the recent SMB3 test event"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
File names with trailing period or space need special case conversion
Fix reconnect to not defer smb3 session reconnect long after socket reconnect
cifs: check hash calculating succeeded
cifs: dynamic allocation of ntlmssp blob
cifs: use CIFS_MAX_DOMAINNAME_LEN when converting the domain name
cifs: stuff the fl_owner into "pid" field in the lock request
Diffstat (limited to 'fs/cifs/ntlmssp.h')
| -rw-r--r-- | fs/cifs/ntlmssp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/ntlmssp.h b/fs/cifs/ntlmssp.h index 848249fa120f..3079b38f0afb 100644 --- a/fs/cifs/ntlmssp.h +++ b/fs/cifs/ntlmssp.h @@ -133,6 +133,6 @@ typedef struct _AUTHENTICATE_MESSAGE { int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len, struct cifs_ses *ses); void build_ntlmssp_negotiate_blob(unsigned char *pbuffer, struct cifs_ses *ses); -int build_ntlmssp_auth_blob(unsigned char *pbuffer, u16 *buflen, +int build_ntlmssp_auth_blob(unsigned char **pbuffer, u16 *buflen, struct cifs_ses *ses, const struct nls_table *nls_cp); |