summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-05-13 17:07:15 +1000
committerStefan Metzmacher <metze@samba.org>2010-05-31 21:36:56 +0200
commitd33c41fbf5bd48fe32d82174d8bd25d1651ee374 (patch)
tree91856368f618cc5d2d899cdb8d7402d5868a6763 /source3/winbindd
parent19f4229fff0f0e350d0eb6e91f674c48c744d214 (diff)
downloadsamba-d33c41fbf5bd48fe32d82174d8bd25d1651ee374.tar.gz
samba-d33c41fbf5bd48fe32d82174d8bd25d1651ee374.tar.bz2
samba-d33c41fbf5bd48fe32d82174d8bd25d1651ee374.zip
s3:winbindd move reinit_after_fork() back out of winbindd_register_handlers
This particular init function needs to be done in a native Samba3 build, but it turns out to be difficult for s3compat, which has other code listening on the sockets. Andrew Bartlett
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/winbindd.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 1cb4e21659..fcd3145931 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1022,18 +1022,6 @@ bool winbindd_use_cache(void)
void winbindd_register_handlers(void)
{
struct tevent_timer *te;
- /* Don't use winbindd_reinit_after_fork here as
- * we're just starting up and haven't created any
- * winbindd-specific resources we must free yet. JRA.
- */
-
- if (!NT_STATUS_IS_OK(reinit_after_fork(winbind_messaging_context(),
- winbind_event_context(),
- false))) {
- DEBUG(0,("reinit_after_fork() failed\n"));
- exit(1);
- }
-
/* Setup signal handlers */
if (!winbindd_setup_sig_term_handler(true))
@@ -1298,6 +1286,18 @@ int main(int argc, char **argv, char **envp)
TimeInit();
+ /* Don't use winbindd_reinit_after_fork here as
+ * we're just starting up and haven't created any
+ * winbindd-specific resources we must free yet. JRA.
+ */
+
+ if (!NT_STATUS_IS_OK(reinit_after_fork(winbind_messaging_context(),
+ winbind_event_context(),
+ false))) {
+ DEBUG(0,("reinit_after_fork() failed\n"));
+ exit(1);
+ }
+
winbindd_register_handlers();
/* setup listen sockets */