diff options
| author | Jeff Layton <jlayton@redhat.com> | 2013-06-27 12:45:00 -0400 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2013-06-27 23:42:18 -0500 |
| commit | 50285882fdd919e2b9617fc844b4816b7833f115 (patch) | |
| tree | dfe5f3d8ffd8ffd520f12234712ca3a07db69039 /fs/cifs/smb1ops.c | |
| parent | e65a5cb41718e0eb17a470bc3acf2c3b2f00f1d0 (diff) | |
| download | lwn-50285882fdd919e2b9617fc844b4816b7833f115.tar.gz lwn-50285882fdd919e2b9617fc844b4816b7833f115.zip | |
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/smb1ops.c')
| -rw-r--r-- | fs/cifs/smb1ops.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index b28aabd33edd..e813f04511d8 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c @@ -957,4 +957,6 @@ struct smb_version_values smb1_values = { .cap_nt_find = CAP_NT_SMBS | CAP_NT_FIND, .cap_large_files = CAP_LARGE_FILES, .oplock_read = OPLOCK_READ, + .signing_enabled = SECMODE_SIGN_ENABLED, + .signing_required = SECMODE_SIGN_REQUIRED, }; |