summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-06-21 14:07:25 +0200
committerAndreas Schneider <asn@samba.org>2011-07-14 16:10:46 +0200
commita3dc8f71d27bf8e419aaf778dbfbb7faacdf9e74 (patch)
treec8d17c965515464c0fcc999768109027fe148360
parent4c446c0297560d2f6577a32680ac853868129626 (diff)
downloadsamba-a3dc8f71d27bf8e419aaf778dbfbb7faacdf9e74.tar.gz
samba-a3dc8f71d27bf8e419aaf778dbfbb7faacdf9e74.tar.bz2
samba-a3dc8f71d27bf8e419aaf778dbfbb7faacdf9e74.zip
s3-smbd: Pass ev_ctx to smbd_parent_loop().
-rw-r--r--source3/smbd/server.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 55935f851f..efe0e9a5e3 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -791,7 +791,8 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
return true;
}
-static void smbd_parent_loop(struct smbd_parent_context *parent)
+static void smbd_parent_loop(struct tevent_context *ev_ctx,
+ struct smbd_parent_context *parent)
{
/* now accept incoming connections - forking a new process
for each incoming connection */
@@ -800,7 +801,7 @@ static void smbd_parent_loop(struct smbd_parent_context *parent)
int ret;
TALLOC_CTX *frame = talloc_stackframe();
- ret = tevent_loop_once(server_event_context());
+ ret = tevent_loop_once(ev_ctx);
if (ret != 0) {
exit_server_cleanly("tevent_loop_once() error");
}
@@ -1294,7 +1295,7 @@ extern void build_options(bool screen);
/* make sure we always have a valid stackframe */
frame = talloc_stackframe();
- smbd_parent_loop(parent);
+ smbd_parent_loop(ev_ctx, parent);
exit_server_cleanly(NULL);
TALLOC_FREE(frame);