The Samba-Bugzilla – Attachment 6747 Details for
Bug 7462
Non-standard SA_RESETHAND is used in ...lib/tevent/tevent_signal.c
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
git-am fix for 3.6.0.
0001-Fix-bug-7462-Non-standard-SA_RESETHAND-is-used-in-.l.patch (text/plain), 2.18 KB, created by
Jeremy Allison
on 2011-08-02 17:08:19 UTC
(
hide
)
Description:
git-am fix for 3.6.0.
Filename:
MIME Type:
Creator:
Jeremy Allison
Created:
2011-08-02 17:08:19 UTC
Size:
2.18 KB
patch
obsolete
>From 975f956c6e3538e5118336c95bfb730c8ce294f0 Mon Sep 17 00:00:00 2001 >From: Jeremy Allison <jra@samba.org> >Date: Mon, 1 Aug 2011 11:49:10 -0700 >Subject: [PATCH] Fix bug 7462 - Non-standard SA_RESETHAND is used in ...lib/tevent/tevent_signal.c > >Make SA_RESETHAND conditional on its existance. > >Autobuild-User: Jeremy Allison <jra@samba.org> >Autobuild-Date: Mon Aug 1 22:03:45 CEST 2011 on sn-devel-104 >(cherry picked from commit 0c67efdd68b9808542c090b9fd9920e4e37d85d0) >--- > lib/replace/system/wait.h | 4 ---- > lib/tevent/testsuite.c | 2 ++ > lib/tevent/tevent_signal.c | 4 ++++ > 3 files changed, 6 insertions(+), 4 deletions(-) > >diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h >index 41db180..f0c3bdc 100644 >--- a/lib/replace/system/wait.h >+++ b/lib/replace/system/wait.h >@@ -40,10 +40,6 @@ > #include <setjmp.h> > #endif > >-#ifndef SA_RESETHAND >-#define SA_RESETHAND SA_ONESHOT >-#endif >- > #if !defined(HAVE_SIG_ATOMIC_T_TYPE) > typedef int sig_atomic_t; > #endif >diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c >index 991e161..1e2f25a 100644 >--- a/lib/tevent/testsuite.c >+++ b/lib/tevent/testsuite.c >@@ -101,7 +101,9 @@ static bool test_event_context(struct torture_context *test, > #ifdef SA_RESTART > se1 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESTART, count_handler, &alarm_count); > #endif >+#ifdef SA_RESETHAND > se2 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESETHAND, count_handler, &alarm_count); >+#endif > #ifdef SA_SIGINFO > se3 = event_add_signal(ev_ctx, ev_ctx, SIGUSR1, SA_SIGINFO, count_handler, &info_count); > #endif >diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c >index dbab8a8..b790859 100644 >--- a/lib/tevent/tevent_signal.c >+++ b/lib/tevent/tevent_signal.c >@@ -355,16 +355,20 @@ int tevent_common_check_signal(struct tevent_context *ev) > (void*)&sig_state->sig_info[i][ofs], > se->private_data); > } >+#ifdef SA_RESETHAND > if (se->sa_flags & SA_RESETHAND) { > talloc_free(se); > } >+#endif > continue; > } > #endif > se->handler(ev, se, i, count, NULL, se->private_data); >+#ifdef SA_RESETHAND > if (se->sa_flags & SA_RESETHAND) { > talloc_free(se); > } >+#endif > } > > #ifdef SA_SIGINFO >-- >1.7.3.1 >
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
Flags:
metze
:
review+
Actions:
View
Attachments on
bug 7462
:
5753
|
5986
|
6744
| 6747