diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-27 14:24:30 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-27 07:36:05 +0100 |
| commit | c318c94170d58aeaa34f00e06fbf960816f7d0d9 (patch) | |
| tree | a81232d7fa943db0c94f8d0b13f529c7eebd1801 /source3/smbd/smb2_negprot.c | |
| parent | d21f7783f6062118edf2c7b8dab79ebc5459317a (diff) | |
| download | samba-c318c94170d58aeaa34f00e06fbf960816f7d0d9.tar.gz samba-c318c94170d58aeaa34f00e06fbf960816f7d0d9.tar.bz2 samba-c318c94170d58aeaa34f00e06fbf960816f7d0d9.zip | |
s3-param: Align lp_{max,min}protocol with lib/param names
This adds an alisas to ensure that both our loadparm systems know all
the names.
I would like to move to the 'server ..' name as canonical, and this
will be raised on the list.
Andrew Bartlett
Diffstat (limited to 'source3/smbd/smb2_negprot.c')
| -rw-r--r-- | source3/smbd/smb2_negprot.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index 4cae143d75..d971fba034 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -119,10 +119,10 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) indyn = (const uint8_t *)req->in.vector[i+2].iov_base; for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) { - if (lp_maxprotocol() < PROTOCOL_SMB2_24) { + if (lp_srv_maxprotocol() < PROTOCOL_SMB2_24) { break; } - if (lp_minprotocol() > PROTOCOL_SMB2_24) { + if (lp_srv_minprotocol() > PROTOCOL_SMB2_24) { break; } @@ -134,10 +134,10 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) } for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) { - if (lp_maxprotocol() < PROTOCOL_SMB2_22) { + if (lp_srv_maxprotocol() < PROTOCOL_SMB2_22) { break; } - if (lp_minprotocol() > PROTOCOL_SMB2_22) { + if (lp_srv_minprotocol() > PROTOCOL_SMB2_22) { break; } @@ -149,10 +149,10 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) } for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) { - if (lp_maxprotocol() < PROTOCOL_SMB2_10) { + if (lp_srv_maxprotocol() < PROTOCOL_SMB2_10) { break; } - if (lp_minprotocol() > PROTOCOL_SMB2_10) { + if (lp_srv_minprotocol() > PROTOCOL_SMB2_10) { break; } @@ -164,10 +164,10 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) } for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) { - if (lp_maxprotocol() < PROTOCOL_SMB2_02) { + if (lp_srv_maxprotocol() < PROTOCOL_SMB2_02) { break; } - if (lp_minprotocol() > PROTOCOL_SMB2_02) { + if (lp_srv_minprotocol() > PROTOCOL_SMB2_02) { break; } @@ -179,7 +179,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) } for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) { - if (lp_maxprotocol() < PROTOCOL_SMB2_10) { + if (lp_srv_maxprotocol() < PROTOCOL_SMB2_10) { break; } |