diff options
author | Jeff Layton <jlayton@redhat.com> | 2013-05-26 07:01:00 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2013-06-24 02:56:43 -0400 |
commit | 28e11bd86d63ce18b481cd9f90bd5fa1b5ba746b (patch) | |
tree | a039b42511ec25fc96827f5bb894270965624a05 /fs/cifs/connect.c | |
parent | e598d1d8fb512c7a4d86c729cdca30e87fe7cfc9 (diff) |
cifs: add new fields to cifs_ses to track requested security flavor
Currently we have the overrideSecFlg field, but it's quite cumbersome
to work with. Add some new fields that will eventually supercede it.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 160134902233..2a8b2107ad5f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -2501,6 +2501,8 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info) | |||
2501 | ses->linux_uid = volume_info->linux_uid; | 2501 | ses->linux_uid = volume_info->linux_uid; |
2502 | 2502 | ||
2503 | ses->overrideSecFlg = volume_info->secFlg; | 2503 | ses->overrideSecFlg = volume_info->secFlg; |
2504 | ses->sectype = volume_info->sectype; | ||
2505 | ses->sign = volume_info->sign; | ||
2504 | 2506 | ||
2505 | mutex_lock(&ses->session_mutex); | 2507 | mutex_lock(&ses->session_mutex); |
2506 | rc = cifs_negotiate_protocol(xid, ses); | 2508 | rc = cifs_negotiate_protocol(xid, ses); |
@@ -3918,6 +3920,8 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid) | |||
3918 | vol_info->nocase = master_tcon->nocase; | 3920 | vol_info->nocase = master_tcon->nocase; |
3919 | vol_info->local_lease = master_tcon->local_lease; | 3921 | vol_info->local_lease = master_tcon->local_lease; |
3920 | vol_info->no_linux_ext = !master_tcon->unix_ext; | 3922 | vol_info->no_linux_ext = !master_tcon->unix_ext; |
3923 | vol_info->sectype = master_tcon->ses->sectype; | ||
3924 | vol_info->sign = master_tcon->ses->sign; | ||
3921 | 3925 | ||
3922 | rc = cifs_set_vol_auth(vol_info, master_tcon->ses); | 3926 | rc = cifs_set_vol_auth(vol_info, master_tcon->ses); |
3923 | if (rc) { | 3927 | if (rc) { |