From 781c4aabb87e63df77c76a360b6ed5f6a20e6d58 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 13 Nov 2010 20:28:41 -0800 Subject: Move error reporting of messaging context creation fail into the daemons themselves. Allows client utilities to silently fail to create a messaging context due to access denied on the messaging tdb (which I need for the following patch). Jeremy. --- source3/lib/messages.c | 4 ++-- source3/lib/messages_local.c | 2 +- source3/lib/server_contexts.c | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/messages.c b/source3/lib/messages.c index 11dc931f0f..41f67d07db 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -194,7 +194,7 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, status = messaging_tdb_init(ctx, ctx, &ctx->local); if (!NT_STATUS_IS_OK(status)) { - DEBUG(0, ("messaging_tdb_init failed: %s\n", + DEBUG(2, ("messaging_tdb_init failed: %s\n", nt_errstr(status))); TALLOC_FREE(ctx); return NULL; @@ -205,7 +205,7 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, status = messaging_ctdbd_init(ctx, ctx, &ctx->remote); if (!NT_STATUS_IS_OK(status)) { - DEBUG(1, ("messaging_ctdb_init failed: %s\n", + DEBUG(2, ("messaging_ctdb_init failed: %s\n", nt_errstr(status))); TALLOC_FREE(ctx); return NULL; diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c index bad577cc35..8cc060b9e2 100644 --- a/source3/lib/messages_local.c +++ b/source3/lib/messages_local.c @@ -108,7 +108,7 @@ NTSTATUS messaging_tdb_init(struct messaging_context *msg_ctx, if (!ctx->tdb) { NTSTATUS status = map_nt_error_from_unix(errno); - DEBUG(0, ("ERROR: Failed to initialise messages database: " + DEBUG(2, ("ERROR: Failed to initialise messages database: " "%s\n", strerror(errno))); TALLOC_FREE(result); return status; diff --git a/source3/lib/server_contexts.c b/source3/lib/server_contexts.c index 5e48b7986d..f8fe9dceac 100644 --- a/source3/lib/server_contexts.c +++ b/source3/lib/server_contexts.c @@ -57,9 +57,6 @@ struct messaging_context *server_messaging_context(void) procid_self(), server_event_context()); } - if (server_msg_ctx == NULL) { - DEBUG(0, ("Could not init server's messaging context.\n")); - } return server_msg_ctx; } -- cgit