From: Stefan Metzmacher Date: Tue, 24 Jul 2018 15:13:39 +0000 (+0200) Subject: smbd: only pass struct smbXsrv_client to smb1srv_tcon_disconnect_all() X-Git-Tag: ldb-1.5.0~182 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cb94ca028c3fccd9a778123834bb2681aa73136;p=thirdparty%2Fsamba.git smbd: only pass struct smbXsrv_client to smb1srv_tcon_disconnect_all() That's all it needs. Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index f463da8a36e..a6213718b6b 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -620,7 +620,7 @@ NTSTATUS smb1srv_tcon_create(struct smbXsrv_connection *conn, NTSTATUS smb1srv_tcon_lookup(struct smbXsrv_connection *conn, uint16_t tree_id, NTTIME now, struct smbXsrv_tcon **tcon); -NTSTATUS smb1srv_tcon_disconnect_all(struct smbXsrv_connection *conn); +NTSTATUS smb1srv_tcon_disconnect_all(struct smbXsrv_client *client); NTSTATUS smb2srv_tcon_table_init(struct smbXsrv_session *session); NTSTATUS smb2srv_tcon_create(struct smbXsrv_session *session, NTTIME now, diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c index 50b43a1ced4..00d9fefed9a 100644 --- a/source3/smbd/server_exit.c +++ b/source3/smbd/server_exit.c @@ -144,7 +144,7 @@ static void exit_server_common(enum server_exit_reason how, * Note: this is a no-op for smb2 as * conn->tcon_table is empty */ - status = smb1srv_tcon_disconnect_all(xconn); + status = smb1srv_tcon_disconnect_all(client); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("Server exit (%s)\n", (reason ? reason : "normal exit"))); diff --git a/source3/smbd/smbXsrv_tcon.c b/source3/smbd/smbXsrv_tcon.c index 627eeb166d9..4552ebb15eb 100644 --- a/source3/smbd/smbXsrv_tcon.c +++ b/source3/smbd/smbXsrv_tcon.c @@ -1112,9 +1112,8 @@ NTSTATUS smb1srv_tcon_lookup(struct smbXsrv_connection *conn, local_id, now, tcon); } -NTSTATUS smb1srv_tcon_disconnect_all(struct smbXsrv_connection *conn) +NTSTATUS smb1srv_tcon_disconnect_all(struct smbXsrv_client *client) { - struct smbXsrv_client *client = conn->client; /* * We do not pass a vuid here,