diff options
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/nmbd.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 2bae5f7b27..d6943b19e6 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; } /**************************************************************************** ** |