diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-06-20 22:27:45 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-06-20 22:27:45 +0000 |
| commit | e26b546ee463cdbe2433367f6bcb9aec476fbee0 (patch) | |
| tree | 5da6536e752b83f134b4038100b46565452469c0 /avahi-daemon | |
| parent | 78fb052e89e9063ab985c1ad3c3ce10e47d1621d (diff) | |
Add patches from Sebastien Estienne
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@131 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon')
| -rw-r--r-- | avahi-daemon/Makefile.am | 9 | ||||
| -rw-r--r-- | avahi-daemon/avahi-dbus.conf.in (renamed from avahi-daemon/avahi.conf.example) | 3 |
2 files changed, 8 insertions, 4 deletions
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.conf.example b/avahi-daemon/avahi-dbus.conf.in index 39e9de9..485c03e 100644 --- a/avahi-daemon/avahi.conf.example +++ b/avahi-daemon/avahi-dbus.conf.in @@ -3,7 +3,8 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> - <policy user="lathiat"> + <!-- Only root or user @AVAHI_USER@ can own the Avahi service --> + <policy user="@AVAHI_USER@"> <allow own="org.freedesktop.Avahi"/> </policy> <policy user="root"> |