summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-04-24 16:24:54 +0000
committerSteve French <sfrench@us.ibm.com>2006-04-24 16:24:54 +0000
commit301dc3e6f6ea83703fa52919c00e60661da5a8fe (patch)
tree83c2d250eee5b2583ac317e61a5f424517785cf6
parent6b426e785cb81e53dc2fc4dcf997661472b470ef (diff)
downloadlinux-301dc3e6f6ea83703fa52919c00e60661da5a8fe.tar.gz
linux-301dc3e6f6ea83703fa52919c00e60661da5a8fe.tar.bz2
linux-301dc3e6f6ea83703fa52919c00e60661da5a8fe.zip
[CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/connect.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index aaf151cb5822..d2ec806a4f32 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -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"));