diff options
author | Steve French <sfrench@us.ibm.com> | 2006-09-29 21:07:38 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-09-29 21:07:38 -0400 |
commit | 175ec9e11cf18f8373b32f7a33e75a4cf7ce25e3 (patch) | |
tree | d261c6ce707654685fefc1759044718a23c1add1 /fs/cifs/connect.c | |
parent | 25ee4a98c662317a7973f3053567d4ec51857511 (diff) |
[CIFS] Rename server time zone field
Server time zone is not really a time zone, rather a time adjustement
in seconds.
CC: Guenter Kukkukk <linux@kukkukk.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index b3268e53ab95..083b2b2c1571 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -3320,15 +3320,16 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
3320 | if(linuxExtEnabled == 0) | 3320 | if(linuxExtEnabled == 0) |
3321 | pSesInfo->capabilities &= (~CAP_UNIX); | 3321 | pSesInfo->capabilities &= (~CAP_UNIX); |
3322 | /* pSesInfo->sequence_number = 0;*/ | 3322 | /* pSesInfo->sequence_number = 0;*/ |
3323 | cFYI(1,("Security Mode: 0x%x Capabilities: 0x%x Time Zone: %d", | 3323 | cFYI(1,("Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d", |
3324 | pSesInfo->server->secMode, | 3324 | pSesInfo->server->secMode, |
3325 | pSesInfo->server->capabilities, | 3325 | pSesInfo->server->capabilities, |
3326 | pSesInfo->server->timeZone)); | 3326 | pSesInfo->server->timeAdj)); |
3327 | if(experimEnabled < 2) | 3327 | if(experimEnabled < 2) |
3328 | rc = CIFS_SessSetup(xid, pSesInfo, | 3328 | rc = CIFS_SessSetup(xid, pSesInfo, |
3329 | first_time, nls_info); | 3329 | first_time, nls_info); |
3330 | else if (extended_security | 3330 | else if (extended_security |
3331 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) | 3331 | && (pSesInfo->capabilities |
3332 | & CAP_EXTENDED_SECURITY) | ||
3332 | && (pSesInfo->server->secType == NTLMSSP)) { | 3333 | && (pSesInfo->server->secType == NTLMSSP)) { |
3333 | rc = -EOPNOTSUPP; | 3334 | rc = -EOPNOTSUPP; |
3334 | } else if (extended_security | 3335 | } else if (extended_security |
@@ -3342,7 +3343,7 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
3342 | if (!rc) { | 3343 | if (!rc) { |
3343 | if(ntlmv2_flag) { | 3344 | if(ntlmv2_flag) { |
3344 | char * v2_response; | 3345 | char * v2_response; |
3345 | cFYI(1,("Can use more secure NTLM version 2 password hash")); | 3346 | cFYI(1,("more secure NTLM ver2 hash")); |
3346 | if(CalcNTLMv2_partial_mac_key(pSesInfo, | 3347 | if(CalcNTLMv2_partial_mac_key(pSesInfo, |
3347 | nls_info)) { | 3348 | nls_info)) { |
3348 | rc = -ENOMEM; | 3349 | rc = -ENOMEM; |