diff options
| author | Bo Yang <boyang@samba.org> | 2010-02-09 17:02:20 +0800 |
|---|---|---|
| committer | Bo Yang <boyang@samba.org> | 2010-02-09 17:05:58 +0800 |
| commit | 8c8bb51de1ac2baa46ac0736fae12c034288e5d4 (patch) | |
| tree | 7a37d822aaa418e21e95ec1187cdc68df3e1e3d7 /lib/tevent/tevent_signal.c | |
| parent | 2aff1d6bcaba6d1bcc9bace064dd4b70c38a4bf6 (diff) | |
| download | samba-8c8bb51de1ac2baa46ac0736fae12c034288e5d4.tar.gz samba-8c8bb51de1ac2baa46ac0736fae12c034288e5d4.tar.bz2 samba-8c8bb51de1ac2baa46ac0736fae12c034288e5d4.zip | |
s3: signals are processed twice in child.
Signed-off-by: Bo Yang <boyang@samba.org>
Diffstat (limited to 'lib/tevent/tevent_signal.c')
| -rw-r--r-- | lib/tevent/tevent_signal.c | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c index 0f3d83e877..45f65cf6dd 100644 --- a/lib/tevent/tevent_signal.c +++ b/lib/tevent/tevent_signal.c @@ -133,7 +133,9 @@ static void tevent_common_signal_handler_info(int signum, siginfo_t *info, static int tevent_common_signal_list_destructor(struct tevent_common_signal_list *sl) { - DLIST_REMOVE(sig_state->sig_handlers[sl->se->signum], sl); + if (sig_state->sig_handlers[sl->se->signum]) { + DLIST_REMOVE(sig_state->sig_handlers[sl->se->signum], sl); + } return 0; } @@ -154,12 +156,16 @@ static int tevent_signal_destructor(struct tevent_signal *se) if (sig_state->sig_handlers[se->signum] == NULL) { /* restore old handler, if any */ - sigaction(se->signum, sig_state->oldact[se->signum], NULL); - sig_state->oldact[se->signum] = NULL; + if (sig_state->oldact[se->signum]) { + sigaction(se->signum, sig_state->oldact[se->signum], NULL); + sig_state->oldact[se->signum] = NULL; + } #ifdef SA_SIGINFO if (se->sa_flags & SA_SIGINFO) { - talloc_free(sig_state->sig_info[se->signum]); - sig_state->sig_info[se->signum] = NULL; + if (sig_state->sig_info[se->signum]) { + talloc_free(sig_state->sig_info[se->signum]); + sig_state->sig_info[se->signum] = NULL; + } } #endif } @@ -398,3 +404,20 @@ int tevent_common_check_signal(struct tevent_context *ev) return 1; } + +void tevent_cleanup_pending_signal_handlers(struct tevent_signal *se) +{ + struct tevent_common_signal_list *sl; + sl = talloc_get_type(se->additional_data, + struct tevent_common_signal_list); + + tevent_common_signal_list_destructor(sl); + + if (sig_state->sig_handlers[se->signum] == NULL) { + if (sig_state->oldact[se->signum]) { + sigaction(se->signum, sig_state->oldact[se->signum], NULL); + sig_state->oldact[se->signum] = NULL; + } + } + return; +} |