diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-12-12 13:18:59 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-12-12 14:35:42 +0100 |
| commit | 1ce9c0ea3215eaa0956338972987704608d9d78e (patch) | |
| tree | a8e48c0bf378dce155d6d858c367632e28bbc417 | |
| parent | 0b8eeb1edc8ece6538c88c026b90439d2823bd9e (diff) | |
| download | samba-1ce9c0ea3215eaa0956338972987704608d9d78e.tar.gz samba-1ce9c0ea3215eaa0956338972987704608d9d78e.tar.bz2 samba-1ce9c0ea3215eaa0956338972987704608d9d78e.zip | |
s3:smbd: remember the event context on smbd_server_connection
metze
| -rw-r--r-- | source3/smbd/globals.c | 1 | ||||
| -rw-r--r-- | source3/smbd/globals.h | 1 | ||||
| -rw-r--r-- | source3/smbd/smb2_server.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c index 043b1da660..aa17f69c87 100644 --- a/source3/smbd/globals.c +++ b/source3/smbd/globals.c @@ -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; } diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index a02988a47d..7b7389ae5b 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -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; diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 851e2fd7ef..d4147a1f0f 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -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) { |