diff options
| author | Simo Sorce <idra@samba.org> | 2010-06-10 11:54:00 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-06-10 17:30:45 -0400 |
| commit | 5e576a53abbf2822c0a8fcc87f76140a755599e4 (patch) | |
| tree | f026e75c6e9ab5e3dc3631be43930868ce76d077 /source3/smbd/globals.c | |
| parent | aeb25ad0b87af2a2af7735f49744a677ebf4fe06 (diff) | |
| download | samba-5e576a53abbf2822c0a8fcc87f76140a755599e4.tar.gz samba-5e576a53abbf2822c0a8fcc87f76140a755599e4.tar.bz2 samba-5e576a53abbf2822c0a8fcc87f76140a755599e4.zip | |
s3:lib make server contexts generic
Pair-programmed-with: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/smbd/globals.c')
| -rw-r--r-- | source3/smbd/globals.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c index 3150b9f67f..5df835d1aa 100644 --- a/source3/smbd/globals.c +++ b/source3/smbd/globals.c @@ -113,8 +113,6 @@ struct kernel_oplocks *koplocks = NULL; int am_parent = 1; int server_fd = -1; -struct event_context *smbd_event_ctx = NULL; -struct messaging_context *smbd_msg_ctx = NULL; struct memcache *smbd_memcache_ctx = NULL; bool exit_firsttime = true; struct child_pid *children = 0; @@ -124,20 +122,7 @@ struct smbd_server_connection *smbd_server_conn = NULL; struct messaging_context *smbd_messaging_context(void) { - if (smbd_msg_ctx == NULL) { - /* - * Note we MUST use the NULL context here, not the - * autofree context, to avoid side effects in forked - * children exiting. - */ - smbd_msg_ctx = messaging_init(NULL, - procid_self(), - smbd_event_context()); - } - if (smbd_msg_ctx == NULL) { - DEBUG(0, ("Could not init smbd messaging context.\n")); - } - return smbd_msg_ctx; + return server_messaging_context(); } struct memcache *smbd_memcache(void) |