diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:08 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:15 -0800 |
| commit | 5be5acb736e35a177452bfd9a7dd008c834f52dc (patch) | |
| tree | 20a9d736278f30e0cb66d85a6da1f568ddc92c14 /source3 | |
| parent | f54858505102f4c1b9321edf264752307097d98d (diff) | |
| download | samba-5be5acb736e35a177452bfd9a7dd008c834f52dc.tar.gz samba-5be5acb736e35a177452bfd9a7dd008c834f52dc.tar.xz samba-5be5acb736e35a177452bfd9a7dd008c834f52dc.zip | |
param: rename lp function and variable from "cli_minprotocol" to "client_min_protocol"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/clidfs.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/libsmb_server.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index cae5443472..6ca3bab828 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -3147,7 +3147,7 @@ static void cli_start_connection_connected(struct tevent_req *subreq) subreq = smbXcli_negprot_send(state, state->ev, state->cli->conn, state->cli->timeout, - lp_cli_minprotocol(), + lp_client_min_protocol(), lp_client_max_protocol()); if (tevent_req_nomem(subreq, req)) { return; diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index ff48719c76..80fba23f67 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -167,7 +167,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx, DEBUG(4,(" session request ok\n")); status = smbXcli_negprot(c->conn, c->timeout, - lp_cli_minprotocol(), + lp_client_min_protocol(), max_protocol); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c index c5159fc72c..3b7214c955 100644 --- a/source3/libsmb/libsmb_server.c +++ b/source3/libsmb/libsmb_server.c @@ -451,7 +451,7 @@ SMBC_server_internal(TALLOC_CTX *ctx, cli_set_timeout(c, smbc_getTimeout(context)); status = smbXcli_negprot(c->conn, c->timeout, - lp_cli_minprotocol(), + lp_client_min_protocol(), lp_client_max_protocol()); if (!NT_STATUS_IS_OK(status)) { cli_shutdown(c); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 6788d66c92..8f6d7756cf 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -822,7 +822,7 @@ static void init_globals(bool reinit_globals) Globals.srv_maxprotocol = PROTOCOL_SMB3_00; Globals.srv_minprotocol = PROTOCOL_LANMAN1; Globals.client_max_protocol = PROTOCOL_NT1; - Globals.cli_minprotocol = PROTOCOL_CORE; + Globals.client_min_protocol = PROTOCOL_CORE; Globals._security = SEC_AUTO; Globals.encrypted_passwords = true; Globals.client_schannel = Auto; diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 9e5adf11f0..669a43e5ac 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -905,7 +905,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain, cli_set_timeout(*cli, 10000); /* 10 seconds */ result = smbXcli_negprot((*cli)->conn, (*cli)->timeout, - lp_cli_minprotocol(), + lp_client_min_protocol(), lp_client_max_protocol()); if (!NT_STATUS_IS_OK(result)) { |