From e1205c5ce78632b795b5247dc8e8d17c35acbd60 Mon Sep 17 00:00:00 2001
From: Jeff <jlayton@redhat.com>
Date: Fri, 6 Jul 2007 21:10:07 +0000
Subject: [PATCH] --- yaml --- r: 61486 b: refs/heads/master c:
 38c10a1ddb24b9fa9f25b6c21d0390a9723ae6d6 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/CHANGES   | 1 +
 trunk/fs/cifs/cifssmb.c | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c4e7eeea516..41af65a8870e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d38d8c74c7cdfae910f9cd0ac5e1b7ba2d8a2fb2
+refs/heads/master: 38c10a1ddb24b9fa9f25b6c21d0390a9723ae6d6
diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES
index b4d388d2b524..258130eea9e7 100644
--- a/trunk/fs/cifs/CHANGES
+++ b/trunk/fs/cifs/CHANGES
@@ -12,6 +12,7 @@ to match what documentation said. Support for very large reads, over 127K,
 available to some newer servers (such as Samba 3.0.26 and later but
 note that it also requires setting CIFSMaxBufSize at module install
 time to a larger value which may hurt performance in some cases).
+Make sign option force signing (or fail if server does not support it).
 
 Version 1.48
 ------------
diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c
index 4a2458e78784..b4916eb6fd43 100644
--- a/trunk/fs/cifs/cifssmb.c
+++ b/trunk/fs/cifs/cifssmb.c
@@ -645,11 +645,12 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
 			~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
 	} else if ((secFlags & CIFSSEC_MUST_SIGN) == CIFSSEC_MUST_SIGN) {
 		/* signing required */
-		cFYI(1, ("Must sign - segFlags 0x%x", secFlags));
+		cFYI(1, ("Must sign - secFlags 0x%x", secFlags));
 		if ((server->secMode &
 			(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED)) == 0) {
 			cERROR(1,
 				("signing required but server lacks support"));
+			rc = -EOPNOTSUPP;
 		} else
 			server->secMode |= SECMODE_SIGN_REQUIRED;
 	} else {