summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-06-24 12:46:13 +0200
committerMichael Adam <obnox@samba.org>2008-06-26 12:31:11 +0200
commit7ec1678d6015ff7a5e262dc95bb6190748f1daff (patch)
treeffaf706938462520aec32f7c542bb2853bf77b44
parentc1562aae9b0293c6f5726482f0c95d65befe8a3a (diff)
downloadsamba-7ec1678d6015ff7a5e262dc95bb6190748f1daff.tar.gz
samba-7ec1678d6015ff7a5e262dc95bb6190748f1daff.tar.bz2
samba-7ec1678d6015ff7a5e262dc95bb6190748f1daff.zip
nmbd: untangle logic in nmbd_messaging_context() slightly.
Michael (This used to be commit 3baf9eb6a2cc6a4a153303b457d3a7067948495e)
-rw-r--r--source3/nmbd/nmbd.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 5126715a47..46c3f1dd3c 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -52,8 +52,11 @@ struct messaging_context *nmbd_messaging_context(void)
{
static struct messaging_context *ctx;
- if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
- nmbd_event_context()))) {
+ if (ctx == NULL) {
+ ctx = messaging_init(NULL, server_id_self(),
+ nmbd_event_context());
+ }
+ if (ctx == NULL) {
DEBUG(0, ("Could not init nmbd messaging context.\n"));
}
return ctx;