diff options
| -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 | ||||
| -rw-r--r-- | source3/nmbd/nmbd.c | 21 | ||||
| -rw-r--r-- | source3/smbd/globals.c | 6 | ||||
| -rw-r--r-- | source3/winbindd/winbindd.c | 10 | ||||
| -rw-r--r-- | source3/winbindd/winbindd.h | 1 |
7 files changed, 24 insertions, 23 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c index 11dc931f0f3..41f67d07dbd 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 bad577cc356..8cc060b9e2b 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 5e48b7986d2..f8fe9dceacb 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; } diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 2bae5f7b272..d6943b19e67 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -43,26 +43,17 @@ time_t StartupTime = 0; struct event_context *nmbd_event_context(void) { - static struct event_context *ctx; - - if (!ctx && !(ctx = event_context_init(NULL))) { - smb_panic("Could not init nmbd event context"); - } - return ctx; + return server_event_context(); } struct messaging_context *nmbd_messaging_context(void) { - static struct messaging_context *ctx; - - if (ctx == NULL) { - ctx = messaging_init(NULL, procid_self(), - nmbd_event_context()); - } - if (ctx == NULL) { - DEBUG(0, ("Could not init nmbd messaging context.\n")); + struct messaging_context *msg_ctx = server_messaging_context(); + if (likely(msg_ctx != NULL)) { + return msg_ctx; } - return ctx; + smb_panic("Could not init nmbd's messaging context.\n"); + return NULL; } /**************************************************************************** ** diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c index 4642328b465..aac30ea9c1c 100644 --- a/source3/smbd/globals.c +++ b/source3/smbd/globals.c @@ -117,7 +117,11 @@ struct smbd_server_connection *msg_ctx_to_sconn(struct messaging_context *msg_ct struct messaging_context *smbd_messaging_context(void) { - return server_messaging_context(); + struct messaging_context *msg_ctx = server_messaging_context(); + if (likely(msg_ctx != NULL)) { + return msg_ctx; + } + smb_panic("Could not init smbd's messaging context.\n"); } struct memcache *smbd_memcache(void) diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index c831c94221a..43cbd50d159 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -44,6 +44,16 @@ static bool interactive = False; extern bool override_logfile; +struct messaging_context *winbind_messaging_context(void) +{ + struct messaging_context *msg_ctx = server_messaging_context(); + if (likely(msg_ctx != NULL)) { + return msg_ctx; + } + smb_panic("Could not init winbindd's messaging context.\n"); + return NULL; +} + /* Reload configuration */ static bool reload_services_file(const char *lfile) diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index 1ba24b5d0a6..d276b869479 100644 --- a/source3/winbindd/winbindd.h +++ b/source3/winbindd/winbindd.h @@ -388,6 +388,5 @@ struct WINBINDD_CCACHE_ENTRY { #define DOM_SEQUENCE_NONE ((uint32)-1) #define winbind_event_context server_event_context -#define winbind_messaging_context server_messaging_context #endif /* _WINBINDD_H */ |