aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-06-01 15:38:46 -0400
committerSteve French <sfrench@us.ibm.com>2006-06-01 15:38:46 -0400
commit3856a9d443ee24248683c415e535f7a2b0fed0f3 (patch)
treedf609fda7681cc04f1de402861e5048a503f0fbd /fs/cifs
parent7c7b25bc8e392aea781324efa771bc191377b876 (diff)
[CIFS] Fix minor build breaks due to cifs kconfig issues
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifssmb.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 6b5be6d59f07..eea8967e598e 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -436,9 +436,9 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
436 a common dialect */ 436 a common dialect */
437 rc = -EOPNOTSUPP; 437 rc = -EOPNOTSUPP;
438 goto neg_err_exit; 438 goto neg_err_exit;
439 } else if((pSMBr->hdr.WordCount == 13) && 439#ifdef CONFIG_CIFS_WEAK_PW_HASH
440 (pSMBr->DialectIndex == LANMAN_PROT)) { 440 } else if((pSMBr->hdr.WordCount == 13)
441#ifdef CONFIG_CIFS_WEAK_PW_HASH 441 && (pSMBr->DialectIndex == LANMAN_PROT)) {
442 struct lanman_neg_rsp * rsp = 442 struct lanman_neg_rsp * rsp =
443 (struct lanman_neg_rsp *)pSMBr; 443 (struct lanman_neg_rsp *)pSMBr;
444 444
@@ -477,8 +477,9 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
477 477
478 cFYI(1,("LANMAN negotiated")); /* BB removeme BB */ 478 cFYI(1,("LANMAN negotiated")); /* BB removeme BB */
479#else /* weak security disabled */ 479#else /* weak security disabled */
480 cERROR(1,("mount failed, cifs module not built with " 480 } else if(pSMBr->hdr.WordCount == 13)
481 "CIFS_WEAK_PW_HASH support")); 481 cERROR(1,("mount failed, cifs module not built "
482 "with CIFS_WEAK_PW_HASH support"));
482 rc = -EOPNOTSUPP; 483 rc = -EOPNOTSUPP;
483#endif /* WEAK_PW_HASH */ 484#endif /* WEAK_PW_HASH */
484 goto neg_err_exit; 485 goto neg_err_exit;