Skip to contentSkip to conversation

cifs: set MAY_SIGN when sec=krb5

PATCH Applied Joseph Salisbury 2 participants 3 messages Feb 28, 2014 – Mar 30, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover cifs: set MAY_SIGN when sec=krb5

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(-)
Signature · 1 line
1.7.9.5
#1 lore raw

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.

---
 fs/cifs/connect.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/cifs/connect.c +2 -1
index 56c152d..49d6e21 100644
@@ -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;
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 7 lines · Joseph Salisbury

Backport from mainline commit: 0b7bc84000d71f3647ca33ab1bf5bd928535c846. This backport was done so including mainline commit 8830d7e07a5e38bc47650a7554b7c1cfd49902bf is not needed.

Queued up for 3.2, thanks.

Please include the original patch header in future.

Ben.

Quoted 18 lines
---
 fs/cifs/connect.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/cifs/connect.c +2 -1
index 56c152d..49d6e21 100644
@@ -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;
Signature · 2 lines
Ben Hutchings
If more than one person is responsible for a bug, no one is at fault.