aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsglob.h
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2013-06-27 12:45:00 -0400
committerSteve French <smfrench@gmail.com>2013-06-28 00:42:18 -0400
commit50285882fdd919e2b9617fc844b4816b7833f115 (patch)
treedfe5f3d8ffd8ffd520f12234712ca3a07db69039 /fs/cifs/cifsglob.h
parente65a5cb41718e0eb17a470bc3acf2c3b2f00f1d0 (diff)
cifs: fix SMB2 signing enablement in cifs_enable_signing
Commit 9ddec56131 (cifs: move handling of signed connections into separate function) broke signing on SMB2/3 connections. While the code to enable signing on the connections was very similar between the two, the bits that get set in the sec_mode are different. Declare a couple of new smb_version_values fields and set them appropriately for SMB1 and SMB2/3. Then change cifs_enable_signing to use those instead. Reported-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Tested-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r--fs/cifs/cifsglob.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index b0f077ebb590..e66b08882548 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -387,6 +387,8 @@ struct smb_version_values {
387 unsigned int cap_nt_find; 387 unsigned int cap_nt_find;
388 unsigned int cap_large_files; 388 unsigned int cap_large_files;
389 unsigned int oplock_read; 389 unsigned int oplock_read;
390 __u16 signing_enabled;
391 __u16 signing_required;
390}; 392};
391 393
392#define HEADER_SIZE(server) (server->vals->header_size) 394#define HEADER_SIZE(server) (server->vals->header_size)