Port: Don't use SIGUNUSED which is not defined on Solaris

[lttng-tools.git] / src / common / runas.c

diff --git a/src/common/runas.c b/src/common/runas.c
index 3826c61755ff29997beaac08310021a781abec1d..1105f207fb83d3b4ef1734159fbd7a7e0e0a3f04 100644 (file)
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -31,10 +31,12 @@
 #include <sched.h>
 #include <sys/signal.h>
 #include <assert.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"
@@ -322,12 +324,12 @@ 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);
-       if (ret) {
-               errno = ret;
-               ret = -1;
-               PERROR("pthread_setname_np");
-               return EXIT_FAILURE;
+       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;
        }
 
        sendret.ret = 0;
@@ -530,22 +532,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