Attachment 6744 Details for Bug 7462 – Patch for 3.5.x.

[patch] Patch for 3.5.x.

look (text/plain), 1.54 KB, created by Jeremy Allison on 2011-08-01 18:35:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-08-01 18:35:04 UTC

Size: 1.54 KB

patch

obsolete

>diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h
>index 79583ad..497f559 100644
>--- a/lib/replace/system/wait.h
>+++ b/lib/replace/system/wait.h
>@@ -44,10 +44,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 f9aca91..41f7345 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 45f65cf..2e9f20a 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

Flags:

metze: review+

Actions: View

Attachments on bug 7462: 5753 | 5986 | 6744 | 6747