From d096de56b16c50c7cc22df08895dc29567ee15d7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 20 Dec 2010 16:37:23 +0100 Subject: s3: Remove unused "retry" from cli_full_connection --- source3/utils/net_ads.c | 2 +- source3/utils/net_util.c | 6 +++--- source3/utils/netlookup.c | 3 +-- source3/utils/smbcacls.c | 3 +-- source3/utils/smbcquotas.c | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index daf26020fe..ec5ecab65e 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1810,7 +1810,7 @@ static int net_ads_printer_publish(struct net_context *c, int argc, const char * c->opt_user_name, c->opt_workgroup, c->opt_password ? c->opt_password : "", CLI_FULL_CONNECTION_USE_KERBEROS, - Undefined, NULL); + Undefined); if (NT_STATUS_IS_ERR(nt_status)) { d_fprintf(stderr, _("Unable to open a connnection to %s to " diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c index 6badf940b8..2f031c4123 100644 --- a/source3/utils/net_util.c +++ b/source3/utils/net_util.c @@ -120,7 +120,7 @@ NTSTATUS connect_to_service(struct net_context *c, server_ss, c->opt_port, service_name, service_type, c->opt_user_name, c->opt_workgroup, - c->opt_password, flags, Undefined, NULL); + c->opt_password, flags, Undefined); if (!NT_STATUS_IS_OK(nt_status)) { d_fprintf(stderr, _("Could not connect to server %s\n"), server_name); @@ -204,7 +204,7 @@ NTSTATUS connect_to_ipc_anonymous(struct net_context *c, server_name, server_ss, c->opt_port, "IPC$", "IPC", "", "", - "", 0, Undefined, NULL); + "", 0, Undefined); if (NT_STATUS_IS_OK(nt_status)) { return nt_status; @@ -264,7 +264,7 @@ NTSTATUS connect_to_ipc_krb5(struct net_context *c, user_and_realm, c->opt_workgroup, c->opt_password, CLI_FULL_CONNECTION_USE_KERBEROS, - Undefined, NULL); + Undefined); SAFE_FREE(user_and_realm); diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c index ef254beb24..fa631314c4 100644 --- a/source3/utils/netlookup.c +++ b/source3/utils/netlookup.c @@ -109,8 +109,7 @@ static struct con_struct *create_cs(struct net_context *c, "", #endif 0, - Undefined, - NULL); + Undefined); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(2,("create_cs: Connect failed. Error was %s\n", nt_errstr(nt_status))); diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 9f740f7f34..2800ed982b 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -1137,8 +1137,7 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info, lp_workgroup(), get_cmdline_auth_info_password(auth_info), flags, - get_cmdline_auth_info_signing_state(auth_info), - NULL); + get_cmdline_auth_info_signing_state(auth_info)); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0,("cli_full_connection failed! (%s)\n", nt_errstr(nt_status))); return NULL; diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c index 63ea269cb5..522af17306 100644 --- a/source3/utils/smbcquotas.c +++ b/source3/utils/smbcquotas.c @@ -404,8 +404,7 @@ static struct cli_state *connect_one(const char *share) lp_workgroup(), get_cmdline_auth_info_password(smbcquotas_auth_info), flags, - get_cmdline_auth_info_signing_state(smbcquotas_auth_info), - NULL); + get_cmdline_auth_info_signing_state(smbcquotas_auth_info)); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0,("cli_full_connection failed! (%s)\n", nt_errstr(nt_status))); return NULL; -- cgit