s3:libsmb: get rid of cli_state_disconnect

Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 20f9afdfa024ba7f825fe82151dcb29af8b86d63..d4138e9172794b00f572e2b33a662009b49dd639 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -323,7 +323,7 @@ static void _cli_shutdown(struct cli_state *cli)
         
        data_blob_free(&cli->user_session_key);
 
-       cli_state_disconnect(cli);
+       smbXcli_conn_disconnect(cli->conn, NT_STATUS_OK);
 
        TALLOC_FREE(cli);
 }

diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 4997d41fdf95419139f4d8422965b5f3775ddbea..a53c9c4e1e8d2311dbe64d319d111c288386f459 100644 (file)
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -190,12 +190,3 @@ bool cli_state_is_connected(struct cli_state *cli)
 
        return smbXcli_conn_is_connected(cli->conn);
 }
-
-void cli_state_disconnect(struct cli_state *cli)
-{
-       /*
-        * passing NT_STATUS_OK means the caller will not
-        * be notified, which matches the old behavior
-        */
-       smbXcli_conn_disconnect(cli->conn, NT_STATUS_OK);
-}

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index db45016ecbab996f1ad82ce268adf447777ebd2e..a584a6376343489119eeb0dee6c88ab46dedd802 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -207,7 +207,6 @@ bool cli_is_error(struct cli_state *cli);
 bool cli_is_nt_error(struct cli_state *cli);
 bool cli_is_dos_error(struct cli_state *cli);
 bool cli_state_is_connected(struct cli_state *cli);
-void cli_state_disconnect(struct cli_state *cli);
 
 /* The following definitions come from libsmb/clifile.c  */
 

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index bad398618847538a9da0e8ba1f0501e2114140e6..b49a7a73e24daebf51dc93fe3ba7254c0fb3296e 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -2580,7 +2580,7 @@ static void alarm_handler(int dummy)
 
 static void alarm_handler_parent(int dummy)
 {
-       cli_state_disconnect(alarm_cli);
+       smbXcli_conn_disconnect(alarm_cli->conn, NT_STATUS_OK);
 }
 
 static void do_local_lock(int read_fd, int write_fd)

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 81d19a9d72509859257333dbf3fe684b72d1ae4d..d4af23783df7cd354be7a1e4a269a3036a45c8a6 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1691,7 +1691,7 @@ void close_conns_after_fork(void)
                 * requests in invalidate_cm_connection()
                 */
                if (cli_state_is_connected(domain->conn.cli)) {
-                       cli_state_disconnect(domain->conn.cli);
+                       smbXcli_conn_disconnect(domain->conn.cli->conn, NT_STATUS_OK);
                }
 
                invalidate_cm_connection(&domain->conn);
@@ -2725,7 +2725,7 @@ void winbind_msg_ip_dropped(struct messaging_context *msg_ctx,
                               smbXcli_conn_local_sockaddr(domain->conn.cli->conn));
 
                if (strequal(sockaddr, addr)) {
-                       cli_state_disconnect(domain->conn.cli);
+                       smbXcli_conn_disconnect(domain->conn.cli->conn, NT_STATUS_OK);
                }
        }
        TALLOC_FREE(freeit);