s3:Winbindd Move winbindd_event_context to a different file

This allows this function to be easily replaced in s3compat

Andrew Bartlett

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5e63602459e6260a80b67574c8e1a3f4b119fff6..06e288c7fad7ce202d86b8a0fe8d05e9c92f093b 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1155,6 +1155,7 @@ IDMAP_ADEX_OBJ = \
 
 WINBINDD_OBJ1 = \
                winbindd/winbindd.o       \
+               winbindd/winbindd_event.o \
                winbindd/winbindd_group.o \
                winbindd/winbindd_util.o  \
                winbindd/winbindd_cache.o \

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 2484fa0f2eb45fb6eb9cdc73a0c6cbe91d82faf1..948e9ec93ab116b1c8c70a6e950888e12ebc8f63 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -37,16 +37,6 @@ static bool interactive = False;
 
 extern bool override_logfile;
 
-struct event_context *winbind_event_context(void)
-{
-       static struct event_context *ctx;
-
-       if (!ctx && !(ctx = event_context_init(NULL))) {
-               smb_panic("Could not init winbind event context");
-       }
-       return ctx;
-}
-
 struct messaging_context *winbind_messaging_context(void)
 {
        static struct messaging_context *ctx;

diff --git a/source3/winbindd/winbindd_event.c b/source3/winbindd/winbindd_event.c
new file mode 100644 (file)
index 0000000..b6e8353
--- /dev/null
+++ b/source3/winbindd/winbindd_event.c
@@ -0,0 +1,37 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Winbind daemon for ntdom nss module
+
+   Copyright (C) by Tim Potter 2000-2002
+   Copyright (C) Andrew Tridgell 2002
+   Copyright (C) Jelmer Vernooij 2003
+   Copyright (C) Volker Lendecke 2004
+   Copyright (C) Andrew Bartlett 2010
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "winbindd.h"
+
+struct event_context *winbind_event_context(void)
+{
+       static struct event_context *winbindd_event_ctx;
+       if (!winbindd_event_ctx && !(winbindd_event_ctx = event_context_init(NULL))) {
+               smb_panic("Could not init winbind event context");
+       }
+       return winbindd_event_ctx;
+}
+

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index fa1d5f2c99a402853b5fbf749fbe0c19173b57d1..a449f424523b5862bf9eb6adfd0868a94eac85c8 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -40,9 +40,10 @@ void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token);
 void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
                           int n_groups, gid_t *groups);
 
-/* The following definitions come from winbindd/winbindd.c  */
-
+/* The following definitions come from winbindd/winbindd_event.c  */
 struct event_context *winbind_event_context(void);
+
+/* The following definitions come from winbindd/winbindd.c  */
 struct messaging_context *winbind_messaging_context(void);
 void request_error(struct winbindd_cli_state *state);
 void request_ok(struct winbindd_cli_state *state);