summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-06-23 17:32:32 +0200
committerMichael Adam <obnox@samba.org>2008-06-26 12:31:10 +0200
commit8b6d41b3b083dd5876e8fbfdce4afed191b8da0f (patch)
tree73abe5063bbf533b164b8c1f6d83b06116b33ac7
parenta8936da0e90fad3efc173f4ac2a4fcf384ade43a (diff)
downloadsamba-8b6d41b3b083dd5876e8fbfdce4afed191b8da0f.tar.gz
samba-8b6d41b3b083dd5876e8fbfdce4afed191b8da0f.tar.bz2
samba-8b6d41b3b083dd5876e8fbfdce4afed191b8da0f.zip
smbd: don't panic if messaging_init() fails but return NULL
leaving panic or more appropriate action to callers. This can for instance happen in a clustered setup, when ctdb is not running. This allows for a more defined behaviour, reducing chicken-egg-problems. Michael (This used to be commit 3b6541ff483d5fea4fd30bb6a01a560c05028d4e)
-rw-r--r--source3/smbd/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 035469cd62..ed07e5c02b 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -92,7 +92,7 @@ struct messaging_context *smbd_messaging_context(void)
if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
smbd_event_context()))) {
- smb_panic("Could not init smbd messaging context");
+ DEBUG(0, ("Could not init smbd messaging context.\n"));
}
return ctx;
}