diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-04-24 18:24:54 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-04-24 18:24:54 +0200 |
| commit | 301dc3e6f6ea83703fa52919c00e60661da5a8fe (patch) | |
| tree | 83c2d250eee5b2583ac317e61a5f424517785cf6 /fs | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 (diff) | |
| download | linux-301dc3e6f6ea83703fa52919c00e60661da5a8fe.tar.xz 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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 5 |
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")); |