diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:33:26 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:34:59 +0100 |
| commit | 0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6 (patch) | |
| tree | 5ac6a5d6276f2645e0d4f2ae89c92420bd66985f /source3/smbd/negprot.c | |
| parent | 81c46686db36eaffd25c013f19094b01a8406c6a (diff) | |
| download | samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.gz samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.bz2 samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.zip | |
Revert "s3: Move the global variable Protocol to struct smbd_server_connection"
This reverts commit c85a4c9ba4a7de65a7850f6f9708df66bd24deea.
Diffstat (limited to 'source3/smbd/negprot.c')
| -rw-r--r-- | source3/smbd/negprot.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 8b1355ceac..81d29d90f9 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -60,7 +60,7 @@ static void reply_corep(struct smb_request *req, uint16 choice) reply_outbuf(req, 1, 0); SSVAL(req->outbuf, smb_vwv0, choice); - set_Protocol(req->sconn, PROTOCOL_CORE); + set_Protocol(PROTOCOL_CORE); } /**************************************************************************** @@ -80,7 +80,7 @@ static void reply_coreplus(struct smb_request *req, uint16 choice) SCVAL(req->outbuf,smb_flg,FLAG_REPLY|FLAG_SUPPORT_LOCKREAD); SSVAL(req->outbuf,smb_vwv1,0x1); /* user level security, don't * encrypt */ - set_Protocol(req->sconn, PROTOCOL_COREPLUS); + set_Protocol(PROTOCOL_COREPLUS); } /**************************************************************************** @@ -113,7 +113,7 @@ static void reply_lanman1(struct smb_request *req, uint16 choice) SSVAL(req->outbuf,smb_vwv11, 8); } - set_Protocol(req->sconn, PROTOCOL_LANMAN1); + set_Protocol(PROTOCOL_LANMAN1); /* Reply, SMBlockread, SMBwritelock supported. */ SCVAL(req->outbuf,smb_flg,FLAG_REPLY|FLAG_SUPPORT_LOCKREAD); @@ -162,7 +162,7 @@ static void reply_lanman2(struct smb_request *req, uint16 choice) SSVAL(req->outbuf,smb_vwv11, 8); } - set_Protocol(req->sconn, PROTOCOL_LANMAN2); + set_Protocol(PROTOCOL_LANMAN2); /* Reply, SMBlockread, SMBwritelock supported. */ SCVAL(req->outbuf,smb_flg,FLAG_REPLY|FLAG_SUPPORT_LOCKREAD); @@ -344,7 +344,7 @@ static void reply_nt1(struct smb_request *req, uint16 choice) SSVAL(req->outbuf,smb_vwv0,choice); SCVAL(req->outbuf,smb_vwv1,secword); - set_Protocol(req->sconn, PROTOCOL_NT1); + set_Protocol(PROTOCOL_NT1); SSVAL(req->outbuf,smb_vwv1+1,lp_maxmux()); /* maxmpx */ SSVAL(req->outbuf,smb_vwv2+1,1); /* num vcs */ @@ -697,8 +697,7 @@ void reply_negprot(struct smb_request *req) DEBUG( 5, ( "negprot index=%d\n", choice ) ); - if ((lp_server_signing() == Required) - && (get_Protocol(req->sconn) < PROTOCOL_NT1)) { + if ((lp_server_signing() == Required) && (get_Protocol() < PROTOCOL_NT1)) { exit_server_cleanly("SMB signing is required and " "client negotiated a downlevel protocol"); } |