sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

s3:smbd: rename 'conn' to 'xconn' in exit_server_common()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-06-10 15:05:41 +02:00 committed by Michael Adam
parent a8e559051d
commit c5ab9557a9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/smbd/server_exit.c
View File

@ -85,12 +85,12 @@ static void exit_server_common(enum server_exit_reason how,
static void exit_server_common(enum server_exit_reason how,
const char *reason)
{
struct smbXsrv_connection *conn = global_smbXsrv_connection;
struct smbXsrv_connection *xconn = global_smbXsrv_connection;
struct smbd_server_connection *sconn = NULL;
struct messaging_context *msg_ctx = server_messaging_context();
if (conn != NULL) {
sconn = conn->sconn;
if (xconn != NULL) {
sconn = xconn->sconn;
}
if (!exit_firsttime)
@ -102,18 +102,18 @@ static void exit_server_common(enum server_exit_reason how,
if (sconn) {
NTSTATUS status;
if (NT_STATUS_IS_OK(conn->transport.status)) {
if (NT_STATUS_IS_OK(xconn->transport.status)) {
switch (how) {
case SERVER_EXIT_ABNORMAL:
conn->transport.status = NT_STATUS_INTERNAL_ERROR;
xconn->transport.status = NT_STATUS_INTERNAL_ERROR;
break;
case SERVER_EXIT_NORMAL:
conn->transport.status = NT_STATUS_LOCAL_DISCONNECT;
xconn->transport.status = NT_STATUS_LOCAL_DISCONNECT;
break;
}
}
TALLOC_FREE(conn->smb1.negprot.auth_context);
TALLOC_FREE(xconn->smb1.negprot.auth_context);
if (lp_log_writeable_files_on_exit()) {
bool found = false;
@ -124,7 +124,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(conn);
status = smb1srv_tcon_disconnect_all(xconn);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("Server exit (%s)\n",
(reason ? reason : "normal exit")));
@ -135,7 +135,7 @@ static void exit_server_common(enum server_exit_reason how,
reason = "smb1srv_tcon_disconnect_all failed";
}
status = smbXsrv_session_logoff_all(conn);
status = smbXsrv_session_logoff_all(xconn);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("Server exit (%s)\n",
(reason ? reason : "normal exit")));
@ -201,7 +201,7 @@ static void exit_server_common(enum server_exit_reason how,
* because smbd_msg_ctx is not a talloc child of smbd_server_conn.
*/
sconn = NULL;
conn = NULL;
xconn = NULL;
TALLOC_FREE(global_smbXsrv_connection);
server_messaging_context_free();
server_event_context_free();