summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-06-24 12:30:38 +0200
committerMichael Adam <obnox@samba.org>2008-06-26 12:31:10 +0200
commitb33d226a61fe8f2ab6e173e5f0182c208bc58b9e (patch)
treec41b4be2a34e280c6d9c33674cad324fd110ed56 /source3
parent7f8df9c217d9b5771a03067636e822ad4ffc030e (diff)
downloadsamba-b33d226a61fe8f2ab6e173e5f0182c208bc58b9e.tar.gz
samba-b33d226a61fe8f2ab6e173e5f0182c208bc58b9e.tar.bz2
samba-b33d226a61fe8f2ab6e173e5f0182c208bc58b9e.zip
winbind: untangle logic in winbind_messaging_context() slightly.
Michael (This used to be commit e710a9b73ea2fd176de7093125bc5f3f3f3a9404)
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/winbindd.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index a6c3dd8651..00951a609e 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -47,8 +47,11 @@ struct messaging_context *winbind_messaging_context(void)
{
static struct messaging_context *ctx;
- if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
- winbind_event_context()))) {
+ if (ctx == NULL) {
+ ctx = messaging_init(NULL, server_id_self(),
+ winbind_event_context());
+ }
+ if (ctx == NULL) {
DEBUG(0, ("Could not init winbind messaging context.\n"));
}
return ctx;