]> err.no Git - linux-2.6/commitdiff
[CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined
authorSteve French <sfrench@us.ibm.com>
Mon, 24 Apr 2006 16:24:54 +0000 (16:24 +0000)
committerSteve French <sfrench@us.ibm.com>
Mon, 24 Apr 2006 16:24:54 +0000 (16:24 +0000)
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/connect.c

index aaf151cb5822b35c3e95eb04ec99a1036a4ea6da..d2ec806a4f32b516cc7a320b39fb3974bc5dd2e2 100644 (file)
@@ -3447,10 +3447,13 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,
                        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
+               else
+#endif
+               if (extended_security
                                && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY)
                                && (pSesInfo->server->secType == NTLMSSP)) {
                        cFYI(1, ("New style sesssetup"));