Message ID | 4f795fd099859c91c56b7a05996bc38a040bc9c0.1393535604.git.joseph.salisbury@canonical.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, 2014-02-28 at 16:07 -0500, Joseph Salisbury wrote: > Backport from mainline commit: 0b7bc84000d71f3647ca33ab1bf5bd928535c846. > 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> Queued up for 3.2, thanks. Please include the original patch header in future. Ben. > --- > 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;
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;
Backport from mainline commit: 0b7bc84000d71f3647ca33ab1bf5bd928535c846. 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> --- fs/cifs/connect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)