X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=3d2abd4384a722fc0daecc6dfa23b7821336369f;hp=bc7356b6a6641b9d28a83d1171081a1d0b2ab7d9;hb=790c779e5d45e5ea024c221e60d3dd2277a7b7b9;hpb=b8090274814e5f6a22cff0dd656e14769cc7a7df

diff --git a/src/common/runas.c b/src/common/runas.c
index bc7356b6a..3d2abd438 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <errno.h>
 #include <limits.h>
@@ -31,11 +30,12 @@
 #include <sched.h>
 #include <sys/signal.h>
 #include <assert.h>
-#include <sys/prctl.h>
+#include <signal.h>
 
 #include <common/common.h>
 #include <common/utils.h>
 #include <common/compat/getenv.h>
+#include <common/compat/prctl.h>
 #include <common/sessiond-comm/unix.h>
 
 #include "runas.h"
@@ -323,8 +323,9 @@ int run_as_worker(struct run_as_worker *worker)
 	memset(worker->procname, 0, proc_orig_len);
 	strncpy(worker->procname, DEFAULT_RUN_AS_WORKER_NAME, proc_orig_len);
 
-	ret = prctl(PR_SET_NAME, DEFAULT_RUN_AS_WORKER_NAME, 0, 0, 0);
-	if (ret) {
+	ret = lttng_prctl(PR_SET_NAME,
+			(unsigned long) DEFAULT_RUN_AS_WORKER_NAME, 0, 0, 0);
+	if (ret && ret != -ENOSYS) {
 		/* Don't fail as this is not essential. */
 		PERROR("prctl PR_SET_NAME");
 		ret = 0;
@@ -530,22 +531,13 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
 static
 int reset_sighandler(void)
 {
-	int sig, ret = 0;
+	int sig;
 
 	DBG("Resetting run_as worker signal handlers to default");
-	for (sig = SIGHUP; sig <= SIGUNUSED; sig++) {
-		/* Skip unblockable signals. */
-		if (sig == SIGKILL || sig == SIGSTOP) {
-			continue;
-		}
-		if (signal(sig, SIG_DFL) == SIG_ERR) {
-			PERROR("reset signal %d", sig);
-			ret = -1;
-			goto end;
-		}
+	for (sig = 1; sig <= 31; sig++) {
+		(void) signal(sig, SIG_DFL);
 	}
-end:
-	return ret;
+	return 0;
 }
 
 static