From 3e830e44d3eb23325fbda6f2053e58926ee2136e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 16 Jan 2013 12:00:00 +0100 Subject: [PATCH] winbind: Use standard tevent_context_init This makes winbind use epoll instead of poll Reviewed by: Jeremy Allison --- source3/winbindd/winbindd.c | 38 +++++++++++++++++++++++++++++++++----- source3/winbindd/winbindd.h | 2 -- source3/winbindd/winbindd_proto.h | 1 + 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 698c96cd539..ebaa080bc00 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -49,14 +49,42 @@ static bool interactive = False; extern bool override_logfile; +struct tevent_context *winbind_event_context(void) +{ + static struct tevent_context *ev = NULL; + + if (ev != NULL) { + return ev; + } + + /* + * Note we MUST use the NULL context here, not the autofree context, + * to avoid side effects in forked children exiting. + */ + ev = tevent_context_init(NULL); + if (ev == NULL) { + smb_panic("Could not init winbindd's messaging context.\n"); + } + return ev; +} + struct messaging_context *winbind_messaging_context(void) { - struct messaging_context *msg_ctx = server_messaging_context(); - if (likely(msg_ctx != NULL)) { - return msg_ctx; + static struct messaging_context *msg = NULL; + + if (msg != NULL) { + return msg; + } + + /* + * Note we MUST use the NULL context here, not the autofree context, + * to avoid side effects in forked children exiting. + */ + msg = messaging_init(NULL, winbind_event_context()); + if (msg == NULL) { + smb_panic("Could not init winbindd's messaging context.\n"); } - smb_panic("Could not init winbindd's messaging context.\n"); - return NULL; + return msg; } /* Reload configuration */ diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index 33c7bbe5c68..c01cac7ab3a 100644 --- a/source3/winbindd/winbindd.h +++ b/source3/winbindd/winbindd.h @@ -396,6 +396,4 @@ struct WINBINDD_CCACHE_ENTRY { #define WINBINDD_PAM_AUTH_KRB5_RENEW_TIME 2592000 /* one month */ #define DOM_SEQUENCE_NONE ((uint32)-1) -#define winbind_event_context server_event_context - #endif /* _WINBINDD_H */ diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 44693d71dc3..33b0f01f3de 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -34,6 +34,7 @@ bool winbindd_use_idmap_cache(void); bool winbindd_use_cache(void); const char *get_winbind_pipe_dir(void); char *get_winbind_priv_pipe_dir(void); +struct tevent_context *winbind_event_context(void); int main(int argc, char **argv, char **envp); /* The following definitions come from winbindd/winbindd_ads.c */ -- 2.11.4.GIT