X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=33cb5016348563911d9e8550818a91d286315526;hb=25c629438a161e3ae35fa50baf63339b031bd749;hp=fc30a5567774da58b0eb9f96bfda1d38338db9b5;hpb=8ce28af8cd87de4cbbe2ee2fe490b9abff807ab7;p=lttng-tools.git

diff --git a/src/common/runas.c b/src/common/runas.c
index fc30a5567..33cb50163 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -29,8 +29,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sched.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <assert.h>
+#include <sys/prctl.h>
 
 #include <common/common.h>
 #include <common/utils.h>
@@ -169,7 +170,7 @@ run_as_fct run_as_enum_to_fct(enum run_as_cmd cmd)
 	case RUN_AS_MKDIR_RECURSIVE:
 		return _mkdir_recursive;
 	default:
-		ERR("Unknown command %d", (int) cmd)
+		ERR("Unknown command %d", (int) cmd);
 		return NULL;
 	}
 }
@@ -322,12 +323,11 @@ 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 = pthread_setname_np(pthread_self(), DEFAULT_RUN_AS_WORKER_NAME);
+	ret = prctl(PR_SET_NAME, DEFAULT_RUN_AS_WORKER_NAME, 0, 0, 0);
 	if (ret) {
-		errno = ret;
-		ret = -1;
-		PERROR("pthread_setname_np");
-		return EXIT_FAILURE;
+		/* Don't fail as this is not essential. */
+		PERROR("prctl PR_SET_NAME");
+		ret = 0;
 	}
 
 	sendret.ret = 0;
@@ -528,23 +528,14 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
 }
 
 static
-int reset_sighandler(void)
+void reset_sighandler(void)
 {
-	int sig, ret = 0;
+	int sig;
 
-	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;
-		}
+	DBG("Resetting run_as worker signal handlers to default");
+	for (sig = 1; sig <= 31; sig++) {
+		(void) signal(sig, SIG_DFL);
 	}
-end:
-	return ret;
 }
 
 static