core-util: move personality resetting into core-util

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 7a95195479be85cad229ea6b10131650b9700d9e..355b0d5caa06bb9b92a01be0ffba1316f0c7c56f 100644 (file)
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -65,10 +65,6 @@
 #include <dbus/dbus.h>
 #endif
 
-#ifdef __linux__
-#include <sys/personality.h>
-#endif
-
 #include <pulse/mainloop.h>
 #include <pulse/mainloop-signal.h>
 #include <pulse/timeval.h>
@@ -446,11 +442,7 @@ int main(int argc, char *argv[]) {
      * context we have been started. Let's cleanup our execution
      * context as good as possible */
 
-#ifdef __linux__
-    if (personality(PER_LINUX) < 0)
-        pa_log_warn("Uh, personality() failed: %s", pa_cstrerror(errno));
-#endif
-
+    pa_reset_personality();
     pa_drop_root();
     pa_close_all(passed_fd, -1);
     pa_reset_sigs(-1);

diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index d4baf6977be97cfd11f5c6e0959bdacc5bd7be38..6494244e229bab5322c91aa44bfaffab399225ba 100644 (file)
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -101,6 +101,10 @@
 #include "rtkit.h"
 #endif
 
+#ifdef __linux__
+#include <sys/personality.h>
+#endif
+
 #include <pulse/xmalloc.h>
 #include <pulse/util.h>
 #include <pulse/utf8.h>
@@ -2855,3 +2859,12 @@ size_t pa_pipe_buf(int fd) {
     return 4096;
 #endif
 }
+
+void pa_reset_personality(void) {
+
+#ifdef __linux__
+    if (personality(PER_LINUX) < 0)
+        pa_log_warn("Uh, personality() failed: %s", pa_cstrerror(errno));
+#endif
+
+}

diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index 6de4b7710c16511ec48106417b25db3bb4fc19d4..3d3aec714f0509477aa7d4819b3b6144dbf2153e 100644 (file)
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -241,4 +241,6 @@ char* pa_maybe_prefix_path(const char *path, const char *prefix);
 /* Returns size of the specified pipe or 4096 on failure */
 size_t pa_pipe_buf(int fd);
 
+void pa_reset_personality(void);
+
 #endif