Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 1f54181c2df1fb92c3323a6dbf8273fb66b883b6 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= |
| 3 | <jeremie.galarneau@efficios.com> |
| 4 | Date: Sat, 17 Oct 2015 19:41:47 -0400 |
| 5 | Subject: [PATCH] Port: Don't use SIGUNUSED which is not defined on Solaris |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | Organization: O.S. Systems Software LTDA. |
| 10 | |
| 11 | Upstream-Status: Backport [2.8.0] |
| 12 | |
| 13 | Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> |
| 14 | --- |
| 15 | src/common/runas.c | 18 +++++------------- |
| 16 | 1 file changed, 5 insertions(+), 13 deletions(-) |
| 17 | |
| 18 | diff --git a/src/common/runas.c b/src/common/runas.c |
| 19 | index 57f7382..0825470 100644 |
| 20 | --- a/src/common/runas.c |
| 21 | +++ b/src/common/runas.c |
| 22 | @@ -530,21 +530,13 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid) |
| 23 | static |
| 24 | int reset_sighandler(void) |
| 25 | { |
| 26 | - int sig, ret = 0; |
| 27 | + int sig; |
| 28 | |
| 29 | - for (sig = SIGHUP; sig <= SIGUNUSED; sig++) { |
| 30 | - /* Skip unblockable signals. */ |
| 31 | - if (sig == SIGKILL || sig == SIGSTOP) { |
| 32 | - continue; |
| 33 | - } |
| 34 | - if (signal(sig, SIG_DFL) == SIG_ERR) { |
| 35 | - PERROR("reset signal %d", sig); |
| 36 | - ret = -1; |
| 37 | - goto end; |
| 38 | - } |
| 39 | + DBG("Resetting run_as worker signal handlers to default"); |
| 40 | + for (sig = 1; sig <= 31; sig++) { |
| 41 | + (void) signal(sig, SIG_DFL); |
| 42 | } |
| 43 | -end: |
| 44 | - return ret; |
| 45 | + return 0; |
| 46 | } |
| 47 | |
| 48 | static |
| 49 | -- |
| 50 | 2.6.2 |
| 51 | |