Make the whole stuff LGPL only

[pulseaudio] / polyp / main.c

diff --git a/polyp/main.c b/polyp/main.c
index dfbd1e4b150bf462bcdaf9c8924f912033e20b2a..941bf92394c3c8022a3378b55d8d69cd34b9d529 100644 (file)
--- a/polyp/main.c
+++ b/polyp/main.c
@@ -4,7 +4,7 @@
   This file is part of polypaudio.
  
   polypaudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
+  it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
@@ -13,7 +13,7 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with polypaudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
@@ -34,6 +34,11 @@
 #include <ltdl.h>
 #include <memblock.h>
 
+#ifdef HAVE_LIBWRAP
+#include <syslog.h>
+#include <tcpd.h>
+#endif
+
 #include "core.h"
 #include "mainloop.h"
 #include "module.h"
@@ -47,16 +52,14 @@
 #include "log.h"
 #include "daemon-conf.h"
 #include "dumpmodules.h"
+#include "caps.h"
+#include "cli-text.h"
 
-static struct pa_mainloop *mainloop;
-
-static void drop_root(void) {
-    if (getuid() != 0 && geteuid() == 0) {
-        pa_log(__FILE__": Started SUID root, dropping root rights.\n");
-        setuid(getuid());
-        seteuid(getuid());
-    }
-}
+#ifdef HAVE_LIBWRAP
+/* Only one instance of these variables */
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_WARNING;
+#endif
 
 static void signal_callback(struct pa_mainloop_api*m, struct pa_signal_event *e, int sig, void *userdata) {
     pa_log(__FILE__": Got signal %s.\n", pa_strsignal(sig));
@@ -69,7 +72,47 @@ static void signal_callback(struct pa_mainloop_api*m, struct pa_signal_event *e,
         case SIGUSR2:
             pa_module_load(userdata, "module-cli-protocol-unix", NULL);
             return;
-        
+
+        case SIGHUP: {
+            int i;
+
+            for (i = 0;; i++) {
+                char *c;
+                switch (i) {
+                    case 0: 
+                        c = pa_sink_list_to_string(userdata);
+                        break;
+                    case 1:
+                        c = pa_source_list_to_string(userdata);
+                        break;
+                    case 2:
+                        c = pa_sink_input_list_to_string(userdata);
+                        break;
+                    case 3:
+                        c = pa_source_output_list_to_string(userdata);
+                        break;
+                    case 4: 
+                        c = pa_client_list_to_string(userdata);
+                        break;
+                    case 5:
+                        c = pa_module_list_to_string(userdata);
+                        break;
+                    case 6:
+                        c = pa_scache_list_to_string(userdata);
+                        break;
+                    case 7:
+                        c = pa_autoload_list_to_string(userdata);
+                        break;
+                    default:
+                        return;
+                }
+                pa_log(c);
+                pa_xfree(c);
+            }
+
+            return;
+        }
+
         case SIGINT:
         case SIGTERM:
         default:
@@ -79,7 +122,8 @@ static void signal_callback(struct pa_mainloop_api*m, struct pa_signal_event *e,
     }
 }
 
-static void close_pipe(int p[2]) {
+
+            static void close_pipe(int p[2]) {
     if (p[0] != -1)
         close(p[0]);
     if (p[1] != -1)
@@ -91,20 +135,35 @@ int main(int argc, char *argv[]) {
     struct pa_core *c;
     struct pa_strbuf *buf = NULL;
     struct pa_daemon_conf *conf;
+    struct pa_mainloop *mainloop;
+
     char *s;
     int r, retval = 1, d = 0;
     int daemon_pipe[2] = { -1, -1 };
+    gid_t gid = (gid_t) -1;
+    int suid_root;
 
+    pa_limit_caps();
+
+    suid_root = getuid() != 0 && geteuid() == 0;
+    
+    if (suid_root && (pa_uid_in_group("realtime", &gid) <= 0 || gid >= 1000)) {
+        pa_log(__FILE__": WARNING: called SUID root, but not in group 'realtime'.\n");
+        pa_drop_root();
+    }
+    
+    LTDL_SET_PRELOADED_SYMBOLS();
+    
     r = lt_dlinit();
     assert(r == 0);
-    
-    pa_log_set_ident("polypaudio");
 
+    pa_log_set_ident("polypaudio");
+    
     conf = pa_daemon_conf_new();
-
+    
     if (pa_daemon_conf_load(conf, NULL) < 0)
         goto finish;
-
+    
     if (pa_daemon_conf_env(conf) < 0)
         goto finish;
     
@@ -112,13 +171,16 @@ int main(int argc, char *argv[]) {
         pa_log(__FILE__": failed to parse command line.\n");
         goto finish;
     }
-
+    
     pa_log_set_target(conf->auto_log_target ? PA_LOG_STDERR : conf->log_target, NULL);
 
     if (conf->high_priority && conf->cmd == PA_CMD_DAEMON)
         pa_raise_priority();
-    
-    drop_root();
+
+    pa_drop_caps();
+
+    if (suid_root)
+        pa_drop_root();
     
     if (conf->dl_search_path)
         lt_dlsetsearchpath(conf->dl_search_path);
@@ -193,12 +255,13 @@ int main(int argc, char *argv[]) {
             pa_log_set_target(PA_LOG_SYSLOG, NULL);
 
         setsid();
-        setpgrp();
+        setpgid(0,0);
         
         close(0);
         close(1);
     }
     
+    chdir("/");
 
     pa_log(__FILE__": sizeof(pa_usec_t) = %u\n", sizeof(pa_usec_t));
     
@@ -216,6 +279,7 @@ int main(int argc, char *argv[]) {
     
     pa_signal_new(SIGUSR1, signal_callback, c);
     pa_signal_new(SIGUSR2, signal_callback, c);
+    pa_signal_new(SIGHUP, signal_callback, c);
 
     r = pa_cpu_limit_init(pa_mainloop_get_api(mainloop));
     assert(r == 0);