The Samba-Bugzilla – Attachment 5601 Details for
Bug 7317
problems with SIGCHLD handling in winbindd
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for v3-4
tmp.diff (text/plain), 4.28 KB, created by
Stefan Metzmacher
on 2010-04-06 09:11:05 UTC
(
hide
)
Description:
Patch for v3-4
Filename:
MIME Type:
Creator:
Stefan Metzmacher
Created:
2010-04-06 09:11:05 UTC
Size:
4.28 KB
patch
obsolete
>From d15258bee89949438f49e41129d6fdbb5284b5de Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Thu, 1 Apr 2010 16:23:06 +0200 >Subject: [PATCH 1/2] s3:winbindd: fix problems with SIGCHLD handling (bug #7317) > >The main problem is that we call CatchChild() within the >parent winbindd, which overwrites the signal handler >that was registered by winbindd_setup_sig_chld_handler(). > >That means winbindd_sig_chld_handler() and winbind_child_died() >are never triggered when a winbindd domain child dies. >As a result will get "broken pipe" for all requests to that domain. > >To reduce the risk of similar bugs in future we call >CatchChild() in winbindd_reinit_after_fork() now. > >We also use a full winbindd_reinit_after_fork() in the >cache validation child now instead instead of just resetting >the SIGCHLD handler by hand. This will also fix possible >tdb problems on systems without pread/pwrite and disabled mmap >as we now correctly reopen the tdb handle for the child. > >metze >(cherry picked from commit 73577205cf81644e7fe853eaf3e6459f7f443096) >--- > source3/winbindd/winbindd.c | 14 +++----------- > source3/winbindd/winbindd_cm.c | 3 --- > source3/winbindd/winbindd_dual.c | 6 +++--- > 3 files changed, 6 insertions(+), 17 deletions(-) > >diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c >index 033eea1..46af5c1 100644 >--- a/source3/winbindd/winbindd.c >+++ b/source3/winbindd/winbindd.c >@@ -378,7 +378,6 @@ static void winbind_msg_validate_cache(struct messaging_context *msg_ctx, > * so we don't block the main winbindd and the validation > * code can safely use fork/waitpid... > */ >- CatchChild(); > child_pid = sys_fork(); > > if (child_pid == -1) { >@@ -396,16 +395,9 @@ static void winbind_msg_validate_cache(struct messaging_context *msg_ctx, > > /* child */ > >- /* install default SIGCHLD handler: validation code uses fork/waitpid */ >- ZERO_STRUCT(act); >- act.sa_handler = SIG_DFL; >-#ifdef SA_RESTART >- /* We *want* SIGALRM to interrupt a system call. */ >- act.sa_flags = SA_RESTART; >-#endif >- sigemptyset(&act.sa_mask); >- sigaddset(&act.sa_mask,SIGCHLD); >- sigaction(SIGCHLD,&act,&oldact); >+ if (!winbindd_reinit_after_fork(NULL)) { >+ _exit(0); >+ } > > ret = (uint8)winbindd_validate_cache_nobackup(); > DEBUG(10, ("winbindd_msg_validata_cache: got return value %d\n", ret)); >diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c >index 5829718..670e494 100644 >--- a/source3/winbindd/winbindd_cm.c >+++ b/source3/winbindd/winbindd_cm.c >@@ -174,9 +174,6 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain) > pid_t parent_pid = sys_getpid(); > char *lfile = NULL; > >- /* Stop zombies */ >- CatchChild(); >- > if (domain->dc_probe_pid != (pid_t)-1) { > /* > * We might already have a DC probe >diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c >index ab4807b..72e5607 100644 >--- a/source3/winbindd/winbindd_dual.c >+++ b/source3/winbindd/winbindd_dual.c >@@ -1167,6 +1167,9 @@ bool winbindd_reinit_after_fork(const char *logfilename) > logfilename)) > return false; > >+ /* Stop zombies in children */ >+ CatchChild(); >+ > /* Don't handle the same messages as our parent. */ > messaging_deregister(winbind_messaging_context(), > MSG_SMB_CONF_UPDATED, NULL); >@@ -1282,9 +1285,6 @@ static bool fork_domain_child(struct winbindd_child *child) > > DEBUG(10, ("Child process %d\n", (int)sys_getpid())); > >- /* Stop zombies in children */ >- CatchChild(); >- > state.sock = fdpair[0]; > close(fdpair[1]); > >-- >1.6.3.3 > > >From 4375d980bd9ef0ea6992b6827a9fa22be8774ad5 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Thu, 1 Apr 2010 18:10:47 +0200 >Subject: [PATCH 2/2] s3:winbindd: remove unused variables > >metze >(cherry picked from commit e18ddb6036f5e0a2211e89a7c9b5514c30a653cf) >--- > source3/winbindd/winbindd.c | 2 -- > 1 files changed, 0 insertions(+), 2 deletions(-) > >diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c >index 46af5c1..7d4c996 100644 >--- a/source3/winbindd/winbindd.c >+++ b/source3/winbindd/winbindd.c >@@ -367,8 +367,6 @@ static void winbind_msg_validate_cache(struct messaging_context *msg_ctx, > { > uint8 ret; > pid_t child_pid; >- struct sigaction act; >- struct sigaction oldact; > > DEBUG(10, ("winbindd_msg_validate_cache: got validate-cache " > "message.\n")); >-- >1.6.3.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 7317
:
5586
|
5600
|
5601
|
5610
|
5611