| From | Ben Hutchings <> | Date | Mon, 31 Mar 2014 00:23:35 +0100 | Subject | [PATCH 3.2 192/200] cifs: set MAY_SIGN when sec=krb5 |
| |
3.2.56-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Martijn de Gouw <martijn.de.gouw@prodrive.nl>
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> --- fs/cifs/connect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
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;
|