summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-06-21 14:14:18 +0200
committerAndreas Schneider <asn@samba.org>2011-07-14 16:10:46 +0200
commit55a025e0410e8105af42838ba2a4b8a7933d6dd0 (patch)
tree7c89b6912492f5f2c12e24abafb712b5bf55aae5 /source3
parent0b8f8f18fb24bf3f8521e85039762228e7027293 (diff)
downloadsamba-55a025e0410e8105af42838ba2a4b8a7933d6dd0.tar.gz
samba-55a025e0410e8105af42838ba2a4b8a7933d6dd0.tar.bz2
samba-55a025e0410e8105af42838ba2a4b8a7933d6dd0.zip
s3-smbd: Pass ev_ctx and msg_ctx to smbd_accept_connection().
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/server.c16
1 files changed, 13 insertions, 3 deletions
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;
}
}