From: Steve French <sfrench@us.ibm.com>
Date: Thu, 1 Jun 2006 19:38:46 +0000 (+0000)
Subject: [CIFS] Fix minor build breaks due to cifs kconfig issues
X-Git-Tag: v2.6.18-rc1~463^2~23
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3856a9d443ee24248683c415e535f7a2b0fed0f3;p=linux-2.6

[CIFS] Fix minor build breaks due to cifs kconfig issues

Signed-off-by: Steve French <sfrench@us.ibm.com>
---

diff --git a/fs/Kconfig b/fs/Kconfig
index c4eaacb860..d49b2a8c0b 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1731,7 +1731,7 @@ config CIFS_POSIX
 	  CIFS POSIX ACL support.  If unsure, say N.
 
 config CIFS_DEBUG2
-	bool "Enable additional CIFS debugging routines
+	bool "Enable additional CIFS debugging routines"
 	help
 	   Enabling this option adds a few more debugging routines
 	   to the cifs code which slightly increases the size of
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 6b5be6d59f..eea8967e59 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -436,9 +436,9 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
 			a common dialect */
 			rc = -EOPNOTSUPP;
 			goto neg_err_exit;
-		} else if((pSMBr->hdr.WordCount == 13) && 
-			(pSMBr->DialectIndex == LANMAN_PROT)) {
-#ifdef CONFIG_CIFS_WEAK_PW_HASH
+#ifdef CONFIG_CIFS_WEAK_PW_HASH 
+                } else if((pSMBr->hdr.WordCount == 13)
+				&& (pSMBr->DialectIndex == LANMAN_PROT)) {
 			struct lanman_neg_rsp * rsp = 
 				(struct lanman_neg_rsp *)pSMBr;
 
@@ -477,8 +477,9 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
 
 			cFYI(1,("LANMAN negotiated")); /* BB removeme BB */
 #else /* weak security disabled */
-			cERROR(1,("mount failed, cifs module not built with "
-				"CIFS_WEAK_PW_HASH support"));
+		} else if(pSMBr->hdr.WordCount == 13)
+			cERROR(1,("mount failed, cifs module not built "
+				"with CIFS_WEAK_PW_HASH support"));
 			rc = -EOPNOTSUPP;
 #endif /* WEAK_PW_HASH */
 			goto neg_err_exit;