s3: Remove unused "retry" from cli_full_connection

17 files changed, 25 insertions, 32 deletions

diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index ad6c2a80a0..00f9b5cc8a 100644
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -150,7 +150,7 @@ static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct loadparm_context *lp_
 			ads->auth.password,
 			CLI_FULL_CONNECTION_USE_KERBEROS |
 			CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS,
-			Undefined, NULL);
+			Undefined);
 	if (!NT_STATUS_IS_OK(result)) {
 		DEBUG(10,("check_refresh_gpo: "
 				"failed to connect: %s\n",
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index c9eaa64d36..0f541cd1e7 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -143,7 +143,7 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
 
 	/* Attempt connection */
 	result = cli_full_connection(cli, global_myname(), dc_name, dc_ss, 0, 
-		"IPC$", "IPC", "", "", "", 0, Undefined, NULL);
+		"IPC$", "IPC", "", "", "", 0, Undefined);
 
 	if (!NT_STATUS_IS_OK(result)) {
 		/* map to something more useful */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 11060aa6d3..d18e0cd2a5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1660,8 +1660,7 @@ NTSTATUS cli_full_connection(struct cli_state **output_cli,
 			     const char *service, const char *service_type,
 			     const char *user, const char *domain, 
 			     const char *password, int flags,
-			     int signing_state,
-			     bool *retry) ;
+			     int signing_state);
 bool attempt_netbios_session_request(struct cli_state **ppcli, const char *srchost, const char *desthost,
                                      struct sockaddr_storage *pdest_ss);
 NTSTATUS cli_raw_tcon(struct cli_state *cli, 
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 424945146b..18986d9e33 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -697,7 +697,7 @@ static NTSTATUS libnet_join_connect_dc_ipc(const char *dc,
 				   NULL,
 				   pass,
 				   flags,
-				   Undefined, NULL);
+				   Undefined);
 }
 
 /****************************************************************
@@ -1111,7 +1111,7 @@ NTSTATUS libnet_join_ok(const char *netbios_domain_name,
 				     NULL,
 				     machine_password,
 				     0,
-				     Undefined, NULL);
+				     Undefined);
 	free(machine_account);
 	free(machine_password);
 
@@ -1124,7 +1124,7 @@ NTSTATUS libnet_join_ok(const char *netbios_domain_name,
 					     NULL,
 					     "",
 					     0,
-					     Undefined, NULL);
+					     Undefined);
 	}
 
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index ec9ff58a17..68a953c196 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2604,7 +2604,6 @@ again:
    @param user Username, unix string
    @param domain User's domain
    @param password User's password, unencrypted unix string.
-   @param retry bool. Did this connection fail with a retryable error ?
 */
 
 NTSTATUS cli_full_connection(struct cli_state **output_cli, 
@@ -2614,8 +2613,7 @@ NTSTATUS cli_full_connection(struct cli_state **output_cli,
 			     const char *service, const char *service_type,
 			     const char *user, const char *domain, 
 			     const char *password, int flags,
-			     int signing_state,
-			     bool *retry) 
+			     int signing_state)
 {
 	NTSTATUS nt_status;
 	struct cli_state *cli = NULL;
@@ -2629,7 +2627,7 @@ NTSTATUS cli_full_connection(struct cli_state **output_cli,
 
 	nt_status = cli_start_connection(&cli, my_name, dest_host,
 					 dest_ss, port, signing_state,
-					 flags, retry);
+					 flags, NULL);
 
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		return nt_status;
@@ -2810,7 +2808,7 @@ struct cli_state *get_ipc_connect(char *server,
 					lp_workgroup(),
 					user_info->password ? user_info->password : "",
 					flags,
-					Undefined, NULL);
+					Undefined);
 
 	if (NT_STATUS_IS_OK(nt_status)) {
 		return cli;
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 369e03781a..428480224d 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -777,7 +777,7 @@ SMBC_attr_server(TALLOC_CTX *ctx,
 						*pp_workgroup,
 						*pp_password,
 						flags,
-						Undefined, NULL);
+						Undefined);
                 if (! NT_STATUS_IS_OK(nt_status)) {
                         DEBUG(1,("cli_full_connection failed! (%s)\n",
                                  nt_errstr(nt_status)));
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index 25f97bb488..c7db679539 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -166,7 +166,7 @@ bool enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain,
 	/* setup the anonymous connection */
 
 	result = cli_full_connection( &cli, global_myname(), dc_name, &dc_ss, 0, "IPC$", "IPC",
-		"", "", "", 0, Undefined, NULL);
+		"", "", "", 0, Undefined);
 	if ( !NT_STATUS_IS_OK(result) )
 		goto done;
 
@@ -257,7 +257,7 @@ NTSTATUS change_trust_account_password( const char *domain, const char *remote_m
 					   NULL, 0,
 					   "IPC$", "IPC",
 					   "", "",
-					   "", 0, Undefined, NULL))) {
+					   "", 0, Undefined))) {
 		DEBUG(0,("modify_trust_password: Connection to %s failed!\n", dc_name));
 		nt_status = NT_STATUS_UNSUCCESSFUL;
 		goto failed;
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 65314df21a..6f28eceda4 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -2504,7 +2504,7 @@ static bool spoolss_connect_to_client(struct rpc_pipe_client **pp_pipe,
 		"", /* username */
 		"", /* domain */
 		"", /* password */
-		0, lp_client_signing(), NULL );
+		0, lp_client_signing());
 
 	if ( !NT_STATUS_IS_OK( ret ) ) {
 		DEBUG(2,("spoolss_connect_to_client: connection to [%s] failed!\n",
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 1bb3a71d5e..50f1209c45 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -3313,7 +3313,7 @@ static WERROR cmd_spoolss_printercmp(struct rpc_pipe_client *cli,
 					lp_workgroup(),
 					get_cmdline_auth_info_password(rpcclient_auth_info),
 					get_cmdline_auth_info_use_kerberos(rpcclient_auth_info) ? CLI_FULL_CONNECTION_USE_KERBEROS : 0,
-					get_cmdline_auth_info_signing_state(rpcclient_auth_info), NULL);
+					get_cmdline_auth_info_signing_state(rpcclient_auth_info));
 
 	if ( !NT_STATUS_IS_OK(nt_status) )
 		return WERR_GENERAL_FAILURE;
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 707889a44f..cd77a942b4 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -1088,8 +1088,7 @@ out_free:
 					get_cmdline_auth_info_domain(rpcclient_auth_info),
 					get_cmdline_auth_info_password(rpcclient_auth_info),
 					flags,
-					get_cmdline_auth_info_signing_state(rpcclient_auth_info),
-					NULL);
+					get_cmdline_auth_info_signing_state(rpcclient_auth_info));
 
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0,("Cannot connect to server.  Error was %s\n", nt_errstr(nt_status)));
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 033fe123ad..782427b8a9 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -190,7 +190,7 @@ static struct cli_state *connect_one(char *share)
 
 	nt_status = cli_full_connection(&c, myname, server_n, NULL, 0, share, "?????", 
 					username, lp_workgroup(), password, 0,
-					Undefined, NULL);
+					Undefined);
 
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0, ("cli_full_connection failed with error %s\n", nt_errstr(nt_status)));
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 32c2a61434..1b492ce736 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -412,7 +412,7 @@ static bool torture_open_connection_share(struct cli_state **c,
 				     hostname, NULL, port_to_use, 
 				     sharename, "?????", 
 				     username, workgroup, 
-				     password, flags, signing_state, NULL);
+				     password, flags, signing_state);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("failed to open share connection: //%s/%s port:%d - %s\n",
 			hostname, sharename, port_to_use, nt_errstr(status));
@@ -1461,7 +1461,7 @@ static bool run_tcon_devtype_test(int dummy)
 				     host, NULL, port_to_use,
 				     NULL, NULL,
 				     username, workgroup,
-				     password, flags, signing_state, NULL);
+				     password, flags, signing_state);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("could not open connection\n");
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;