s3: Remove unused "retry" from cli_start_connection

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon Dec 20 17:58:33 CET 2010 on sn-devel-104

diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 1dc548727c37ee65caff4b00bc99b8e271d67601..0804eb56ec839644e23c9c060baf9594ac2ef096 100644 (file)
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -401,7 +401,7 @@ smb_complete_connection(const char *myname,
        /* Start the SMB connection */
        *need_auth = false;
        nt_status = cli_start_connection(&cli, myname, server, NULL, port,
-                                        Undefined, flags, NULL);
+                                        Undefined, flags);
        if (!NT_STATUS_IS_OK(nt_status)) {
                fprintf(stderr, "ERROR: Connection failed: %s\n", nt_errstr(nt_status));
                return NULL;

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d18e0cd2a59e990dfafa186e63e619af7a7e9d4f..dabb3158753d302cce905c7046cdbcc8545d91b0 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1651,8 +1651,7 @@ NTSTATUS cli_start_connection(struct cli_state **output_cli,
                              const char *my_name, 
                              const char *dest_host, 
                              struct sockaddr_storage *dest_ss, int port,
-                             int signing_state, int flags,
-                             bool *retry) ;
+                             int signing_state, int flags);
 NTSTATUS cli_full_connection(struct cli_state **output_cli, 
                             const char *my_name, 
                             const char *dest_host, 

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 68a953c196af1a5b8ad5db902f36af79ed500fe9..25df2b2b4eaebd9d50508daaf3d934e461b24aed 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2498,15 +2498,12 @@ NTSTATUS cli_connect(struct cli_state *cli,
    @param dest_host The netbios name of the remote host
    @param dest_ss (optional) The the destination IP, NULL for name based lookup
    @param port (optional) The destination port (0 for default)
-   @param retry bool. Did this connection fail with a retryable error ?
-
 */
 NTSTATUS cli_start_connection(struct cli_state **output_cli, 
                              const char *my_name, 
                              const char *dest_host, 
                              struct sockaddr_storage *dest_ss, int port,
-                             int signing_state, int flags,
-                             bool *retry) 
+                             int signing_state, int flags)
 {
        NTSTATUS nt_status;
        struct nmb_name calling;
@@ -2514,9 +2511,6 @@ NTSTATUS cli_start_connection(struct cli_state **output_cli,
        struct cli_state *cli;
        struct sockaddr_storage ss;
 
-       if (retry)
-               *retry = False;
-
        if (!my_name) 
                my_name = global_myname();
 
@@ -2550,9 +2544,6 @@ again:
                return nt_status;
        }
 
-       if (retry)
-               *retry = True;
-
        if (!cli_session_request(cli, &calling, &called)) {
                char *p;
                DEBUG(1,("session request to %s failed (%s)\n",
@@ -2627,7 +2618,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, NULL);
+                                        flags);
 
        if (!NT_STATUS_IS_OK(nt_status)) {
                return nt_status;

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 1b492ce736b6f5a9d6e5f28dbc3f5c3584809859..f1f2e99760c35203f8e9f6ab9efd9b4e4bf79d64 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -5673,7 +5673,7 @@ static bool run_chain2(int dummy)
 
        printf("starting chain2 test\n");
        status = cli_start_connection(&cli1, global_myname(), host, NULL,
-                                     port_to_use, Undefined, 0, NULL);
+                                     port_to_use, Undefined, 0);
        if (!NT_STATUS_IS_OK(status)) {
                return False;
        }