From 9c87a65ce91c38b60c19ae108a51a2e8ce46a85c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 19 Jul 2006 17:44:19 +0000
Subject: * add new --system command line parameter to the daemon for running
 PulseAudio as system-wide instance * add PA_ prefixes to all global #defines
 * modify auth-by-creds: define a new group "pulse-access" which is used for
 authentication * add proper privilige dropping when running in --system mode
 * create runtime directory once on startup and not by each module seperately

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1105 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/modules/module-match.c         |  6 +----
 src/modules/module-protocol-stub.c | 55 +++++++++++++++++++++++++-------------
 src/modules/module-tunnel.c        |  2 +-
 3 files changed, 38 insertions(+), 25 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index 28d6a08b..cd58a838 100644
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -52,11 +52,7 @@ PA_MODULE_VERSION(PACKAGE_VERSION)
 
 #define WHITESPACE "\n\r \t"
 
-#ifndef DEFAULT_CONFIG_DIR
-#define DEFAULT_CONFIG_DIR "/etc/pulse"
-#endif
-
-#define DEFAULT_MATCH_TABLE_FILE DEFAULT_CONFIG_DIR"/match.table"
+#define DEFAULT_MATCH_TABLE_FILE PA_DEFAULT_CONFIG_DIR"/match.table"
 #define DEFAULT_MATCH_TABLE_FILE_USER ".pulse/match.table"
 
 static const char* const valid_modargs[] = {
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index 20728766..fa21b737 100644
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -75,7 +75,14 @@
     #include "module-simple-protocol-unix-symdef.h"
   #endif
   PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION)
-  PA_MODULE_USAGE("rate=<sample rate> format=<sample format> channels=<number of channels> sink=<sink to connect to> source=<source to connect to> playback=<enable playback?> record=<enable record?> "SOCKET_USAGE)
+  PA_MODULE_USAGE("rate=<sample rate> "
+                  "format=<sample format> "
+                  "channels=<number of channels> "
+                  "sink=<sink to connect to> "
+                  "source=<source to connect to> "
+                  "playback=<enable playback?> "
+                  "record=<enable record?> "
+                  SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_CLI)
   #include <pulsecore/protocol-cli.h> 
   #define protocol_new pa_protocol_cli_new
@@ -129,7 +136,10 @@
   #endif
   
   PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION)
-  PA_MODULE_USAGE("auth-anonymous=<don't check for cookies?> cookie=<path to cookie file> "AUTH_USAGE SOCKET_USAGE)
+  PA_MODULE_USAGE("auth-anonymous=<don't check for cookies?> "
+                  "cookie=<path to cookie file> "
+                  AUTH_USAGE
+                  SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_ESOUND)
   #include <pulsecore/protocol-esound.h>
   #include <pulsecore/esound.h>
@@ -145,7 +155,11 @@
     #include "module-esound-protocol-unix-symdef.h"
   #endif
   PA_MODULE_DESCRIPTION("ESOUND protocol "SOCKET_DESCRIPTION)
-  PA_MODULE_USAGE("sink=<sink to connect to> source=<source to connect to> auth-anonymous=<don't check for cookies?> cookie=<path to cookie file> "SOCKET_USAGE)
+  PA_MODULE_USAGE("sink=<sink to connect to> "
+                  "source=<source to connect to> "
+                  "auth-anonymous=<don't verify cookies?> "
+                  "cookie=<path to cookie file> "
+                  SOCKET_USAGE)
 #else
   #error "Broken build system" 
 #endif
@@ -189,7 +203,6 @@ int pa__init(pa_core *c, pa_module*m) {
 #else
     pa_socket_server *s;
     int r;
-    const char *v;
     char tmp[PATH_MAX];
 #endif
 
@@ -241,15 +254,21 @@ int pa__init(pa_core *c, pa_module*m) {
         goto fail;
 
 #else
-    v = pa_modargs_get_value(ma, "socket", UNIX_SOCKET);
-    pa_runtime_path(v, tmp, sizeof(tmp));
+
+    pa_runtime_path(pa_modargs_get_value(ma, "socket", UNIX_SOCKET), tmp, sizeof(tmp));
     u->socket_path = pa_xstrdup(tmp);
 
-    if (pa_make_secure_parent_dir(tmp) < 0) {
-        pa_log(__FILE__": Failed to create secure socket directory.");
+#if defined(USE_PROTOCOL_ESOUND)
+
+    /* This socket doesn't reside in our own runtime dir but in
+     * /tmp/.esd/, hence we have to create the dir first */
+    
+    if (pa_make_secure_parent_dir(u->socket_path, c->is_system_instance ? 0755 : 0700, getuid(), getgid()) < 0) {
+        pa_log(__FILE__": Failed to create socket directory: %s\n", pa_cstrerror(errno));
         goto fail;
     }
-
+#endif
+    
     if ((r = pa_unix_socket_remove_stale(tmp)) < 0) {
         pa_log(__FILE__": Failed to remove stale UNIX socket '%s': %s", tmp, pa_cstrerror(errno));
         goto fail;
@@ -324,19 +343,17 @@ void pa__done(pa_core *c, pa_module*m) {
     if (u->protocol_unix)
         protocol_free(u->protocol_unix);
 
+#if defined(USE_PROTOCOL_ESOUND)
     if (u->socket_path) {
-        char *p;
-        
-        if ((p = pa_parent_dir(u->socket_path))) {
-            if (rmdir(p) < 0 && errno != ENOENT && errno != ENOTEMPTY)
-                pa_log(__FILE__": Failed to remove %s: %s.", u->socket_path, pa_cstrerror(errno));
-
-            pa_xfree(p);
-        }
-
-        pa_xfree(u->socket_path);
+        char *p = pa_parent_dir(u->socket_path);
+        rmdir(p);
+        pa_xfree(p);
     }
 #endif
+    
+    
+    pa_xfree(u->socket_path);
+#endif
 
     pa_xfree(u);
 }
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index bf2627a7..c018c520 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -611,7 +611,7 @@ static void pstream_die_callback(pa_pstream *p, void *userdata) {
 }
 
 
-static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const void*creds, void *userdata) {
+static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const struct ucred *creds, void *userdata) {
     struct userdata *u = userdata;
     assert(p && packet && u);
 
-- 
cgit