Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French 2006-06-01 19:38:46 +00:00
parent 7c7b25bc8e
commit 3856a9d443
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/Kconfig
View file

@ -1731,7 +1731,7 @@ config CIFS_POSIX
CIFS POSIX ACL support. If unsure, say N. CIFS POSIX ACL support. If unsure, say N.
config CIFS_DEBUG2 config CIFS_DEBUG2
bool "Enable additional CIFS debugging routines bool "Enable additional CIFS debugging routines"
help help
Enabling this option adds a few more debugging routines Enabling this option adds a few more debugging routines
to the cifs code which slightly increases the size of to the cifs code which slightly increases the size of

11
fs/cifs/cifssmb.c
View file

@ -436,9 +436,9 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
a common dialect */ a common dialect */
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
goto neg_err_exit; goto neg_err_exit;
} else if((pSMBr->hdr.WordCount == 13) && #ifdef CONFIG_CIFS_WEAK_PW_HASH
(pSMBr->DialectIndex == LANMAN_PROT)) { } else if((pSMBr->hdr.WordCount == 13)
#ifdef CONFIG_CIFS_WEAK_PW_HASH && (pSMBr->DialectIndex == LANMAN_PROT)) {
struct lanman_neg_rsp * rsp = struct lanman_neg_rsp * rsp =
(struct lanman_neg_rsp *)pSMBr; (struct lanman_neg_rsp *)pSMBr;
@ -477,8 +477,9 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
cFYI(1,("LANMAN negotiated")); /* BB removeme BB */ cFYI(1,("LANMAN negotiated")); /* BB removeme BB */
#else /* weak security disabled */ #else /* weak security disabled */
cERROR(1,("mount failed, cifs module not built with " } else if(pSMBr->hdr.WordCount == 13)
"CIFS_WEAK_PW_HASH support")); cERROR(1,("mount failed, cifs module not built "
"with CIFS_WEAK_PW_HASH support"));
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
#endif /* WEAK_PW_HASH */ #endif /* WEAK_PW_HASH */
goto neg_err_exit; goto neg_err_exit;