2014-02-28 21:07:47

by Joseph Salisbury

[permalink] [raw]
Subject: [v3.2.y][PATCH 0/1] cifs: set MAY_SIGN when sec=krb5

BugLink: http://bugs.launchpad.net/bugs/1285723

Hi Ben,

Please consider including a backport of upstream commit 0b7bc84000d71f3647ca33ab1bf5bd928535c846 in the next v3.2.y release. It was included upstream as of v3.9-rc1. It has been tested and confirmed to resolve http://bugs.launchpad.net/bugs/1285723 .

commit 0b7bc84000d71f3647ca33ab1bf5bd928535c846
Author: Martijn de Gouw <[email protected]>
Date: Wed Oct 24 11:45:46 2012 +0200

cifs: set MAY_SIGN when sec=krb5

This commit has a requrement for commit 8830d7e07a5e38bc47650a7554b7c1cfd49902bf, so it does not apply cleanly to v3.2. I performed a backport to avoid this requirement, which is in email 1/1.


Sincerely,
Joseph Salisbury

Joseph Salisbury (1):
cifs: set MAY_SIGN when sec=krb5

fs/cifs/connect.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--
1.7.9.5


2014-02-28 21:07:45

by Joseph Salisbury

[permalink] [raw]
Subject: [v3.2.y][PATCH 1/1] cifs: set MAY_SIGN when sec=krb5

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 <[email protected]>
---
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;
--
1.7.9.5