s3:smbd: remember the event context on smbd_server_connection
authorStefan Metzmacher <metze@samba.org>
Mon, 12 Dec 2011 12:18:59 +0000 (13:18 +0100)
committerStefan Metzmacher <metze@samba.org>
Mon, 12 Dec 2011 13:35:42 +0000 (14:35 +0100)
metze

source3/smbd/globals.c
source3/smbd/globals.h
source3/smbd/smb2_server.c

index 043b1da660236383257fe78cf35e89769931fb5d..aa17f69c873a6adc89d69b6684015ce547abf46a 100644 (file)
@@ -174,6 +174,7 @@ void smbd_init_globals(void)
                exit_server("failed to create smbd_server_connection");
        }
 
+       smbd_server_conn->ev_ctx = server_event_context();
        smbd_server_conn->smb1.echo_handler.trusted_fd = -1;
        smbd_server_conn->smb1.echo_handler.socket_lock_fd = -1;
 }
index a02988a47d1cd9524160cca631e7f5b980d5511f..7b7389ae5b6645f02a14ccad11ca067b0b021b2f 100644 (file)
@@ -451,6 +451,7 @@ struct smbd_server_connection {
        const struct tsocket_address *local_address;
        const struct tsocket_address *remote_address;
        const char *remote_hostname;
+       struct tevent_context *ev_ctx;
        struct messaging_context *msg_ctx;
        struct {
                bool got_session;
index 851e2fd7ef4a6cce56ef248205bde9735d101b30..d4147a1f0f5f7e82b5db7fdc47480b6ae3ea8889 100644 (file)
@@ -98,7 +98,7 @@ static NTSTATUS smbd_initialize_smb2(struct smbd_server_connection *sconn)
 
        TALLOC_FREE(sconn->smb1.fde);
 
-       sconn->smb2.event_ctx = server_event_context();
+       sconn->smb2.event_ctx = sconn->ev_ctx;
 
        sconn->smb2.recv_queue = tevent_queue_create(sconn, "smb2 recv queue");
        if (sconn->smb2.recv_queue == NULL) {