diff options
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 8 | ||||
| -rw-r--r-- | source3/libsmb/libsmb_server.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/trusts_util.c | 4 |
3 files changed, 6 insertions, 8 deletions
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; |