diff options
| author | Martijn de Gouw <martijn.de.gouw@prodrive.nl> | 2012-10-24 11:45:46 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-02 00:59:01 +0100 |
| commit | 9924c0fa968bb6104a99b7b7961a6c188fed9b31 (patch) | |
| tree | 56ab8371f91da7a3c228cdd673c0fee3615899e3 /fs/cifs | |
| parent | ffbd2b62c349e1541513883b25bcecc2fa238e60 (diff) | |
| download | kernel_samsung_smdk4412-9924c0fa968bb6104a99b7b7961a6c188fed9b31.zip kernel_samsung_smdk4412-9924c0fa968bb6104a99b7b7961a6c188fed9b31.tar.gz kernel_samsung_smdk4412-9924c0fa968bb6104a99b7b7961a6c188fed9b31.tar.bz2 | |
cifs: set MAY_SIGN when sec=krb5
commit 0b7bc84000d71f3647ca33ab1bf5bd928535c846 upstream.
Setting this secFlg allows usage of dfs where some servers require
signing and others don't.
Signed-off-by: Martijn de Gouw <martijn.de.gouw@prodrive.nl>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
[Joseph Salisbury: This backport was done so including mainline commit
8830d7e07a5e38bc47650a7554b7c1cfd49902bf is not needed.]
BugLink: http://bugs.launchpad.net/bugs/1285723
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/connect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 56c152d..49d6e21 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1113,7 +1113,8 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, cERROR(1, "Krb5 cifs privacy not supported"); goto cifs_parse_mount_err; } else if (strnicmp(value, "krb5", 4) == 0) { - vol->secFlg |= CIFSSEC_MAY_KRB5; + vol->secFlg |= CIFSSEC_MAY_KRB5 | + CIFSSEC_MAY_SIGN; } else if (strnicmp(value, "ntlmsspi", 8) == 0) { vol->secFlg |= CIFSSEC_MAY_NTLMSSP | CIFSSEC_MUST_SIGN; |