From e26b546ee463cdbe2433367f6bcb9aec476fbee0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 20 Jun 2005 22:27:45 +0000
Subject: Add patches from Sebastien Estienne

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@131 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 avahi-daemon/Makefile.am        |  9 ++++++---
 avahi-daemon/avahi-dbus.conf.in | 24 ++++++++++++++++++++++++
 avahi-daemon/avahi.conf.example | 23 -----------------------
 3 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 avahi-daemon/avahi-dbus.conf.in
 delete mode 100644 avahi-daemon/avahi.conf.example

(limited to 'avahi-daemon')

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 1e9db4d..0682fba 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -19,14 +19,13 @@
 
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
+dbusservicedir=$(DBUS_SYS_DIR)
 
 AM_CFLAGS= \
 	-I$(top_srcdir) \
 	-D_GNU_SOURCE \
 	-DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \
-	-DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\" \
-	-DAVAHI_USER=\"avahi\" \
-	-DAVAHI_GROUP=\"avahi\"
+	-DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\"
 AM_LDADD=-lexpat
 
 # GLIB 2.0
@@ -66,6 +65,10 @@ pkgdata_DATA = \
 
 if ENABLE_DBUS
 avahi_SOURCES += dbus-protocol.c dbus-protocol.h
+
+dbusservice_DATA = avahi-dbus.conf
+
+EXTRA_DIST = $(dbusservice_DATA)
 endif
 
 avahi_CFLAGS = $(AM_CFLAGS)
diff --git a/avahi-daemon/avahi-dbus.conf.in b/avahi-daemon/avahi-dbus.conf.in
new file mode 100644
index 0000000..485c03e
--- /dev/null
+++ b/avahi-daemon/avahi-dbus.conf.in
@@ -0,0 +1,24 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- Only root or user @AVAHI_USER@ can own the Avahi service -->
+  <policy user="@AVAHI_USER@">
+    <allow own="org.freedesktop.Avahi"/>
+  </policy>
+  <policy user="root">
+    <allow own="org.freedesktop.Avahi"/>
+  </policy>
+
+  <!-- Allow anyone to invoke methods on the Manager and Device interfaces -->
+  <policy context="default">
+    <allow send_interface="org.freedesktop.Avahi"/>
+
+    <allow receive_interface="org.freedesktop.Avahi"
+           receive_sender="org.freedesktop.Avahi"/>
+  </policy>
+
+  <limit name="max_match_rules_per_connection">512</limit>
+
+</busconfig>
diff --git a/avahi-daemon/avahi.conf.example b/avahi-daemon/avahi.conf.example
deleted file mode 100644
index 39e9de9..0000000
--- a/avahi-daemon/avahi.conf.example
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <policy user="lathiat">
-    <allow own="org.freedesktop.Avahi"/>
-  </policy>
-  <policy user="root">
-    <allow own="org.freedesktop.Avahi"/>
-  </policy>
-
-  <!-- Allow anyone to invoke methods on the Manager and Device interfaces -->
-  <policy context="default">
-    <allow send_interface="org.freedesktop.Avahi"/>
-
-    <allow receive_interface="org.freedesktop.Avahi"
-           receive_sender="org.freedesktop.Avahi"/>
-  </policy>
-
-  <limit name="max_match_rules_per_connection">512</limit>
-
-</busconfig>
-- 
cgit