aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/connect.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-02-13 20:36:20 -0500
committerSteve French <sfrench@us.ibm.com>2006-02-13 20:36:20 -0500
commit5815449d1bfcb22f74b0e36a8b0631d6584cb7fc (patch)
treec97d3456c9df46ab3e73d8b0e9197d4dc1034697 /fs/cifs/connect.c
parentb580513e841d81eebf0d7b02f412be0882c2ce5f (diff)
[CIFS] SessionSetup cleanup part 2
The cifs session setup code has three cases, and a fourth for backlevel LANMAN2 style session setup needed to be added. This new session setup implmentation will eventually replace the other three and should be easier to read while fixing a few minor problems (not setting the LARGE READ/WRITEX flags when NTLMSSP was negotiated for example) and adding support for NTLMv2 (which will be added with the next patch. In the meantime, this code is marked in an CONFIG_CIFS_EXPERIMENTAL block and will not be turned on by default until it is tested against more server types. Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r--fs/cifs/connect.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 05aa651ea3da..0e1560ac5ad7 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * fs/cifs/connect.c 2 * fs/cifs/connect.c
3 * 3 *
4 * Copyright (C) International Business Machines Corp., 2002,2005 4 * Copyright (C) International Business Machines Corp., 2002,2006
5 * Author(s): Steve French (sfrench@us.ibm.com) 5 * Author(s): Steve French (sfrench@us.ibm.com)
6 * 6 *
7 * This library is free software; you can redistribute it and/or modify 7 * This library is free software; you can redistribute it and/or modify
@@ -2816,7 +2816,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
2816 } 2816 }
2817 } else { 2817 } else {
2818 cERROR(1, 2818 cERROR(1,
2819 (" Invalid Word count %d: ", 2819 (" Invalid Word count %d:",
2820 smb_buffer_response->WordCount)); 2820 smb_buffer_response->WordCount));
2821 rc = -EIO; 2821 rc = -EIO;
2822 } 2822 }
@@ -3433,7 +3433,7 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,
3433 if (extended_security 3433 if (extended_security
3434 && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) 3434 && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY)
3435 && (pSesInfo->server->secType == NTLMSSP)) { 3435 && (pSesInfo->server->secType == NTLMSSP)) {
3436 cFYI(1, ("New style sesssetup ")); 3436 cFYI(1, ("New style sesssetup"));
3437 rc = CIFSSpnegoSessSetup(xid, pSesInfo, 3437 rc = CIFSSpnegoSessSetup(xid, pSesInfo,
3438 NULL /* security blob */, 3438 NULL /* security blob */,
3439 0 /* blob length */, 3439 0 /* blob length */,
@@ -3441,7 +3441,7 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,
3441 } else if (extended_security 3441 } else if (extended_security
3442 && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) 3442 && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY)
3443 && (pSesInfo->server->secType == RawNTLMSSP)) { 3443 && (pSesInfo->server->secType == RawNTLMSSP)) {
3444 cFYI(1, ("NTLMSSP sesssetup ")); 3444 cFYI(1, ("NTLMSSP sesssetup"));
3445 rc = CIFSNTLMSSPNegotiateSessSetup(xid, 3445 rc = CIFSNTLMSSPNegotiateSessSetup(xid,
3446 pSesInfo, 3446 pSesInfo,
3447 &ntlmv2_flag, 3447 &ntlmv2_flag,