Merge Pierre's changes

[pulseaudio] / polyp / caps.c

diff --git a/polyp/caps.c b/polyp/caps.c
index 34d97eb56ddb9d5af8171f1c5e2a5d064b1f50d7..4ecb5848df174738280345e633a27328de892963 100644 (file)
--- a/polyp/caps.c
+++ b/polyp/caps.c
@@ -35,21 +35,34 @@
 #include "log.h"
 #include "caps.h"
 
+#ifdef HAVE_GETUID
+
 /* Drop root rights when called SUID root */
 void pa_drop_root(void) {
     uid_t uid = getuid();
     
     if (uid == 0 || geteuid() != 0)
         return;
-    
-/*     pa_log(__FILE__": dropping root rights.\n"); */
-    
+
+    pa_log_info(__FILE__": dropping root rights.\n");
+
+#if defined(HAVE_SETRESUID)
+    setresuid(uid, uid, uid);
+#elif defined(HAVE_SETREUID)
     setreuid(uid, uid);
+#else
+    setuid(uid);
+    seteuid(uid);
+#endif
+}
+
+#else
 
-/*    setuid(uid);
-    seteuid(uid);*/
+void pa_drop_root(void) {
 }
 
+#endif
+
 #ifdef HAVE_SYS_CAPABILITY_H
 
 /* Limit capabilities set to CAPSYS_NICE */
@@ -69,7 +82,7 @@ int pa_limit_caps(void) {
     if (cap_set_proc(caps) < 0)
         goto fail;
 
-/*     pa_log(__FILE__": dropped capabilities successfully.\n"); */
+    pa_log_info(__FILE__": dropped capabilities successfully.\n"); 
     
     r = 0;