From 55a025e0410e8105af42838ba2a4b8a7933d6dd0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 21 Jun 2011 14:14:18 +0200
Subject: s3-smbd: Pass ev_ctx and msg_ctx to smbd_accept_connection().

---
 source3/smbd/server.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'source3/smbd/server.c')

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 50b205324a..4991331a8f 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -513,6 +513,8 @@ static void smbd_accept_connection(struct tevent_context *ev,
 }
 
 static bool smbd_open_one_socket(struct smbd_parent_context *parent,
+				 struct tevent_context *ev_ctx,
+				 struct messaging_context *msg_ctx,
 				 const struct sockaddr_storage *ifss,
 				 uint16_t port)
 {
@@ -555,7 +557,7 @@ static bool smbd_open_one_socket(struct smbd_parent_context *parent,
 		return false;
 	}
 
-	s->fde = tevent_add_fd(server_event_context(),
+	s->fde = tevent_add_fd(ev_ctx,
 			       s,
 			       s->fd, TEVENT_FD_READ,
 			       smbd_accept_connection,
@@ -663,7 +665,11 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
 					dns_port = port;
 				}
 
-				if (!smbd_open_one_socket(parent, ifss, port)) {
+				if (!smbd_open_one_socket(parent,
+							  ev_ctx,
+							  msg_ctx,
+							  ifss,
+							  port)) {
 					return false;
 				}
 			}
@@ -710,7 +716,11 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
 					continue;
 				}
 
-				if (!smbd_open_one_socket(parent, &ss, port)) {
+				if (!smbd_open_one_socket(parent,
+							  ev_ctx,
+							  msg_ctx,
+							  &ss,
+							  port)) {
 					return false;
 				}
 			}
-- 
cgit