From e0113918c51cb636c49a23fe0f502000ab5acfa7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 Jun 2017 17:03:05 +0200 Subject: [PATCH] s3:libsmb: remove unused 'bool show_hdr' from cli_cm_open() Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- source3/client/client.c | 10 +++++----- source3/lib/netapi/cm.c | 2 +- source3/libsmb/clidfs.c | 2 -- source3/libsmb/proto.h | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/source3/client/client.c b/source3/client/client.c index df36028a78e5..c431a0114665 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -5155,7 +5155,7 @@ static int process_command_string(const char *cmd_in) status = cli_cm_open(talloc_tos(), NULL, have_ip ? dest_ss_str : desthost, service, popt_get_cmdline_auth_info(), - false, smb_encrypt, + smb_encrypt, max_protocol, port, name_type, &cli); if (!NT_STATUS_IS_OK(status)) { @@ -5586,7 +5586,7 @@ static int process(const char *base_directory) status = cli_cm_open(talloc_tos(), NULL, have_ip ? dest_ss_str : desthost, service, popt_get_cmdline_auth_info(), - false, smb_encrypt, max_protocol, port, + smb_encrypt, max_protocol, port, name_type, &cli); if (!NT_STATUS_IS_OK(status)) { return 1; @@ -5623,7 +5623,7 @@ static int do_host_query(const char *query_host) status = cli_cm_open(talloc_tos(), NULL, have_ip ? dest_ss_str : query_host, "IPC$", popt_get_cmdline_auth_info(), - false, smb_encrypt, max_protocol, port, + smb_encrypt, max_protocol, port, name_type, &cli); if (!NT_STATUS_IS_OK(status)) { return 1; @@ -5662,7 +5662,7 @@ static int do_host_query(const char *query_host) status = cli_cm_open(talloc_tos(), NULL, have_ip ? dest_ss_str : query_host, "IPC$", popt_get_cmdline_auth_info(), - false, smb_encrypt, max_proto, + smb_encrypt, max_proto, NBT_SMB_PORT, name_type, &cli); if (!NT_STATUS_IS_OK(status)) { cli = NULL; @@ -5698,7 +5698,7 @@ static int do_tar_op(const char *base_directory) status = cli_cm_open(talloc_tos(), NULL, have_ip ? dest_ss_str : desthost, service, popt_get_cmdline_auth_info(), - false, smb_encrypt, max_protocol, + smb_encrypt, max_protocol, port, name_type, &cli); if (!NT_STATUS_IS_OK(status)) { ret = 1; diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 57e44ac778de..95132f28f05c 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -110,7 +110,7 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, status = cli_cm_open(ctx, NULL, server_name, "IPC$", auth_info, - false, false, + false, lp_client_ipc_max_protocol(), 0, 0x20, &cli_ipc); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index 017e3689a8e6..207b3240f5e8 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -413,7 +413,6 @@ NTSTATUS cli_cm_open(TALLOC_CTX *ctx, const char *server, const char *share, const struct user_auth_info *auth_info, - bool show_hdr, bool force_encrypt, int max_protocol, int port, @@ -974,7 +973,6 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx, smbXcli_conn_remote_name(rootcli->conn), "IPC$", dfs_auth_info, - false, smb1cli_conn_encryption_on(rootcli->conn), smbXcli_conn_protocol(rootcli->conn), 0, diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h index fb122b9493a5..47b9cf190bde 100644 --- a/source3/libsmb/proto.h +++ b/source3/libsmb/proto.h @@ -145,7 +145,6 @@ NTSTATUS cli_cm_open(TALLOC_CTX *ctx, const char *server, const char *share, const struct user_auth_info *auth_info, - bool show_hdr, bool force_encrypt, int max_protocol, int port, -- 2.34.1