diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-24 20:08:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-24 20:08:08 -0700 |
| commit | 454ac778459bc70f0a9818a6a8fd974ced11de66 (patch) | |
| tree | a1a7d7b6aaca16f48efa14e1d276fd2aeab4d884 | |
| parent | 18118cdbfd1f855e09ee511d764d6c9df3d4f952 (diff) | |
| parent | 301dc3e6f6ea83703fa52919c00e60661da5a8fe (diff) | |
| download | op-kernel-dev-454ac778459bc70f0a9818a6a8fd974ced11de66.zip op-kernel-dev-454ac778459bc70f0a9818a6a8fd974ced11de66.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable:
[CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined
| -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 aaf151c..d2ec806 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")); |
