Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3856a9d4 authored by Steve French's avatar Steve French
Browse files

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



Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 7c7b25bc

fs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/cifs/cifssmb.c

+6 −5
Original line number Diff line number Diff line
@@ -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 

                } 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;