summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-06-23 17:35:08 +0200
committerMichael Adam <obnox@samba.org>2008-06-26 12:31:10 +0200
commit59634c91ec08c1f1f0f3d1c5af985b7b381cb1ac (patch)
treef4c8171ee8bbd9f42812f34c0ecba7809a651035
parent8b6d41b3b083dd5876e8fbfdce4afed191b8da0f (diff)
downloadsamba-59634c91ec08c1f1f0f3d1c5af985b7b381cb1ac.tar.gz
samba-59634c91ec08c1f1f0f3d1c5af985b7b381cb1ac.tar.bz2
samba-59634c91ec08c1f1f0f3d1c5af985b7b381cb1ac.zip
smbd: untangle logic in smbd_messaging_context() slightly.
Michael (This used to be commit fae4c21b14b9d288e06f6b4b4e1527e2c6d58dca)
-rw-r--r--source3/smbd/server.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index ed07e5c02b..4a0e60a8d7 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -90,8 +90,11 @@ struct messaging_context *smbd_messaging_context(void)
{
static struct messaging_context *ctx;
- if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
- smbd_event_context()))) {
+ if (ctx == NULL) {
+ ctx = messaging_init(NULL, server_id_self(),
+ smbd_event_context());
+ }
+ if (ctx == NULL) {
DEBUG(0, ("Could not init smbd messaging context.\n"));
}
return ctx;