[PATCH] Fix cifs breakage when CONFIG_CIFS_EXPERIMENTAL=n

[PATCH] Fix cifs breakage when CONFIG_CIFS_EXPERIMENTAL=n

[Jean Delvare]

Hi Steve,

Cifs is currently broken when CONFIG_CIFS_EXPERIMENTAL=n:

fs/cifs/connect.c: In function `cifs_setup_session':
fs/cifs/connect.c:3451: warning: implicit declaration of function `CIFS_SessSetup'
(...)
WARNING: "CIFS_SessSetup" [fs/cifs/cifs.ko] undefined!

The following patch attempts to fix that. Untested beyond compilation.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
 fs/cifs/cifsproto.h |    2 --
 fs/cifs/cifssmb.c   |    2 --
 fs/cifs/ntlmssp.c   |    2 --
 3 files changed, 6 deletions(-)

--- linux-2.6.17-rc2.orig/fs/cifs/cifsproto.h	2006-04-24 21:56:45.000000000 +0200
+++ linux-2.6.17-rc2/fs/cifs/cifsproto.h	2006-04-24 22:05:43.000000000 +0200
@@ -64,14 +64,12 @@
 extern void header_assemble(struct smb_hdr *, char /* command */ ,
 			    const struct cifsTconInfo *, int /* length of
 			    fixed section (word count) in two byte units */);
-#ifdef CONFIG_CIFS_EXPERIMENTAL
 extern int small_smb_init_no_tc(const int smb_cmd, const int wct,
 				struct cifsSesInfo *ses,
 				void ** request_buf);
 extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
 			     const int stage, int * pNTLMv2_flg,
 			     const struct nls_table *nls_cp);
-#endif
 extern __u16 GetNextMid(struct TCP_Server_Info *server);
 extern struct oplock_q_entry * AllocOplockQEntry(struct inode *, u16, 
 						 struct cifsTconInfo *);
--- linux-2.6.17-rc2.orig/fs/cifs/ntlmssp.c	2006-04-24 21:56:45.000000000 +0200
+++ linux-2.6.17-rc2/fs/cifs/ntlmssp.c	2006-04-24 22:09:34.000000000 +0200
@@ -27,7 +27,6 @@
 #include "ntlmssp.h"
 #include "nterr.h"
 
-#ifdef CONFIG_CIFS_EXPERIMENTAL
 static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB)
 {
 	__u32 capabilities = 0;
@@ -140,4 +139,3 @@
 
 	return rc;
 }
-#endif /* CONFIG_CIFS_EXPERIMENTAL */
--- linux-2.6.17-rc2.orig/fs/cifs/cifssmb.c	2006-04-24 10:47:55.000000000 +0200
+++ linux-2.6.17-rc2/fs/cifs/cifssmb.c	2006-04-24 22:08:19.000000000 +0200
@@ -188,7 +188,6 @@
 	return rc;
 }
 
-#ifdef CONFIG_CIFS_EXPERIMENTAL  
 int
 small_smb_init_no_tc(const int smb_command, const int wct, 
 		     struct cifsSesInfo *ses, void **request_buf)
@@ -214,7 +213,6 @@
 
 	return rc;
 }
-#endif  /* CONFIG_CIFS_EXPERIMENTAL */
 
 /* If the return code is zero, this function must fill in request_buf pointer */
 static int



-- 
Jean Delvare

Re: [PATCH] Fix cifs breakage when CONFIG_CIFS_EXPERIMENTAL=n

[Dave Jones]

On Mon, Apr 24, 2006 at 10:25:39PM +0200, Jean Delvare wrote:
 > Hi Steve,
 > 
 > Cifs is currently broken when CONFIG_CIFS_EXPERIMENTAL=n:
 > 
 > The following patch attempts to fix that. Untested beyond compilation.

I fixed it with a smaller equally untested patch:

Signed-off-by: Dave Jones <davej@redhat.com>

fs/cifs/connect.c: In function 'cifs_setup_session':
fs/cifs/connect.c:3451: error: implicit declaration of function 'CIFS_SessSetup'

Signed-off-by: Dave Jones <davej@redhat.com>

--- linux-2.6.16.noarch/fs/cifs/connect.c~	2006-04-23 23:08:32.000000000 -0400
+++ linux-2.6.16.noarch/fs/cifs/connect.c	2006-04-23 23:09:45.000000000 -0400
@@ -3447,10 +3447,13 @@ int cifs_setup_session(unsigned int xid,
 			pSesInfo->server->secMode,
 			pSesInfo->server->capabilities,
 			pSesInfo->server->timeZone));
+#ifdef CONFIG_CIFS_EXPERIMENTAL
 		if(experimEnabled > 1)
 			rc = CIFS_SessSetup(xid, pSesInfo, CIFS_NTLM /* type */,
-					    &ntlmv2_flag, nls_info);	
-		else if (extended_security
+					    &ntlmv2_flag, nls_info);
+		else
+#endif
+			if (extended_security
 				&& (pSesInfo->capabilities & CAP_EXTENDED_SECURITY)
 				&& (pSesInfo->server->secType == NTLMSSP)) {
 			cFYI(1, ("New style sesssetup"));
-- 
http://www.codemonkey.org.uk