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

[Dave Jones <davej@redhat.com>]

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