sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:libsmb: get rid of cli_state_disconnect

Browse Source 
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Luk Claes 2012-05-20 16:26:25 +02:00 committed by Stefan Metzmacher
parent 1ff8c404a6
commit 82895ab22f
5 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/libsmb/clientgen.c
View File

@ -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);
}

9
source3/libsmb/clierror.c
View File

@ -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);
}

1
source3/libsmb/proto.h
View File

@ -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 */

2
source3/torture/torture.c
View File

@ -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)

4
source3/winbindd/winbindd_cm.c
View File

@ -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);