diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-06-22 17:06:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:29 -0500 |
| commit | 7bf085571eba5f321d35ff449d68da39ec303dab (patch) | |
| tree | b2772f64d1ce496cd8c3dd6223da43a71951ad07 /source4/smb_server | |
| parent | d44c28b3a9ee09c27edb738684d79646b1e311a0 (diff) | |
| download | samba-7bf085571eba5f321d35ff449d68da39ec303dab.tar.gz samba-7bf085571eba5f321d35ff449d68da39ec303dab.tar.bz2 samba-7bf085571eba5f321d35ff449d68da39ec303dab.zip | |
r16464: split client and server min/max protocol settings
metze
(This used to be commit 6164d1e22e0545f558315591d49f862de06ea945)
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/smb/negprot.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb_server.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c index 5f1e75447b..29e6c0736f 100644 --- a/source4/smb_server/smb/negprot.c +++ b/source4/smb_server/smb/negprot.c @@ -509,8 +509,8 @@ void smbsrv_reply_negprot(struct smbsrv_request *req) for (protocol = 0; supported_protocols[protocol].proto_name; protocol++) { int i; - if (supported_protocols[protocol].protocol_level > lp_maxprotocol()) continue; - if (supported_protocols[protocol].protocol_level < lp_minprotocol()) continue; + if (supported_protocols[protocol].protocol_level > lp_srv_maxprotocol()) continue; + if (supported_protocols[protocol].protocol_level < lp_srv_minprotocol()) continue; for (i = 0; i < protos_count; i++) { if (strcmp(supported_protocols[protocol].proto_name, protos[i]) != 0) continue; diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ef8967f0b2..6df48f3df6 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -61,7 +61,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); case SMB2_MAGIC: - if (lp_maxprotocol() < PROTOCOL_SMB2) break; + if (lp_srv_maxprotocol() < PROTOCOL_SMB2) break; status = smbsrv_init_smb2_connection(smb_conn); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request); |