diff options
| author | Jeremy Allison <jra@samba.org> | 2010-11-13 20:28:41 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-11-14 04:39:05 +0000 |
| commit | 781c4aabb87e63df77c76a360b6ed5f6a20e6d58 (patch) | |
| tree | e53eb195b8116ab29b73c34c3f00474b9c137d0c /source3/lib | |
| parent | 7cb0f95bf28c24c45955d6df52f505019341ef31 (diff) | |
| download | samba-781c4aabb87e63df77c76a360b6ed5f6a20e6d58.tar.gz samba-781c4aabb87e63df77c76a360b6ed5f6a20e6d58.tar.bz2 samba-781c4aabb87e63df77c76a360b6ed5f6a20e6d58.zip | |
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.
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/messages.c | 4 | ||||
| -rw-r--r-- | source3/lib/messages_local.c | 2 | ||||
| -rw-r--r-- | source3/lib/server_contexts.c | 3 |
3 files changed, 3 insertions, 6 deletions
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; } |