summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-27 14:24:30 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-27 07:36:05 +0100
commitc318c94170d58aeaa34f00e06fbf960816f7d0d9 (patch)
treea81232d7fa943db0c94f8d0b13f529c7eebd1801 /source3/smbd
parentd21f7783f6062118edf2c7b8dab79ebc5459317a (diff)
downloadsamba-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')
-rw-r--r--source3/smbd/negprot.c4
-rw-r--r--source3/smbd/process.c2
-rw-r--r--source3/smbd/smb2_negprot.c18
3 files changed, 12 insertions, 12 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 717000a432..2f3fd450ca 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -695,8 +695,8 @@ void reply_negprot(struct smb_request *req)
/* Check for protocols, most desirable first */
for (protocol = 0; supported_protocols[protocol].proto_name; protocol++) {
i = 0;
- if ((supported_protocols[protocol].protocol_level <= lp_maxprotocol()) &&
- (supported_protocols[protocol].protocol_level >= lp_minprotocol()))
+ if ((supported_protocols[protocol].protocol_level <= lp_srv_maxprotocol()) &&
+ (supported_protocols[protocol].protocol_level >= lp_srv_minprotocol()))
while (i < num_cliprotos) {
if (strequal(cliprotos[i],supported_protocols[protocol].proto_name))
choice = i;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 391ddc70ba..ba6314cda0 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3013,7 +3013,7 @@ void smbd_process(struct tevent_context *ev_ctx,
char *rhost;
int ret;
- if (lp_maxprotocol() >= PROTOCOL_SMB2_02) {
+ if (lp_srv_maxprotocol() >= PROTOCOL_SMB2_02) {
/*
* We're not making the decision here,
* we're just allowing the client
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;
}