2006-05-19 Carlos Garnacho <carlosg@gnome.org>

        * system-tools-backends.conf.in: added, prototype file for DBus
        system.d dir.
        * .cvignore: updated.
        * Makefile.am: install, clean and package
        system-tools-backends.conf.in.
        * configure.in: small improvements, add --with-dbus-sys=<dir> and
        --with-stb-group=<group>

5 files changed, 83 insertions, 65 deletions

diff --git a/.cvsignore b/.cvsignore
index 70fa31a..b118f27 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,59 +2,13 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te*.cache
-boot-conf
-boot-grub.pl
-boot-lilo.pl
-boot-yaboot.pl
-boot.pl
 config.*
 configure
-debug.pl
-dhcpd-conf
-dhcpd.pl
-disks-conf
-display-conf
-file.pl
-filesys.pl
-font-conf
-font.pl
-general.pl
-gettext.pl
-hardware-conf
-internetsharing-conf
 intltool-*
-ishare.pl
 libtool
-media.pl
-memory-conf
-mouse-conf
-network-conf
-network.pl
-package-conf
-parse.pl
-partition.pl
-platform.pl
-print-conf
-print.pl
-removable-media.pl
-replace.pl
-report.pl
-rhprinterdb2gstxml.pl
-runlevel-conf
-service-list.pl
-service.pl
-services-conf
-share.pl
-shares-conf
-system-tools-backends.pc
-time-conf
-tokenizer.pl
-users-conf
-util.pl
-x.pl
-xml.pl
-Loader.pl
+SystemToolsBackends.pl
 ltmain.sh
 *.service
 *.pc
+*.conf
 stamp-h1
diff --git a/ChangeLog b/ChangeLog
index 6e1f520..b6ff02a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-2006-05-15  Carlos Garnacho <carlosg@gnome.org>
+2006-05-19  Carlos Garnacho  <carlosg@gnome.org>
+
+	* system-tools-backends.conf.in: added, prototype file for DBus
+	system.d dir.
+	* .cvignore: updated.
+	* Makefile.am: install, clean and package
+	system-tools-backends.conf.in.
+	* configure.in: small improvements, add --with-dbus-sys=<dir> and
+	--with-stb-group=<group>
+
+2006-05-15  Carlos Garnacho  <carlosg@gnome.org>
 
 	* Makefile.am, autogen.sh: do not intltoolize things, do not delete
 	.pm files in clean
diff --git a/Makefile.am b/Makefile.am
index 69475f6..d451124 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,8 @@ scripts_SCRIPTS = $(scripts)
 
 EXTRA_DIST = \
 	system-tools-backends-2.0.pc.in \
+	system-tools-backends.conf.in \
+	org.freedesktop.SystemToolsBackends.service.in \
 	README \
 	AUTHORS \
 	NEWS
@@ -23,6 +25,7 @@ EXTRA_DIST = \
 CLEANFILES = \
 	SystemToolsBackends.pl		\
 	system-tools-backends-2.0.pc	\
+	system-tools-backends.conf	\
 	org.freedesktop.SystemToolsBackends.service
 
 #DISTCLEANFILES =
@@ -34,3 +37,6 @@ pkgconfig_DATA = system-tools-backends-2.0.pc
 servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.SystemToolsBackends.service
 
+# DBus system.d file
+systemddir = $(DBUS_SYSTEMD_DIR)
+systemd_DATA = system-tools-backends.conf
\ No newline at end of file
diff --git a/configure.in b/configure.in
index 93f26c1..05ee768 100644
--- a/configure.in
+++ b/configure.in
@@ -8,27 +8,41 @@ AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_PROG_LIBTOOL
 
-dnl ==============================================================
-dnl Set SCRIPTS_DIR, FILES_DIR 
-dnl ==============================================================
-if test "x${prefix}" = "xNONE"; then
-  scriptsdir="${ac_default_prefix}/share/system-tools-backends-2.0/scripts"
-  filesdir="${ac_default_prefix}/share/system-tools-backends-2.0/files"
-else
-  scriptsdir="${prefix}/share/system-tools-backends-2.0/scripts"
-  filesdir="${prefix}/share/system-tools-backends-2.0/files"
-fi
 
+dnl scriptsdir & filesdir
+scriptsdir="${datadir}/system-tools-backends-2.0/scripts"
+filesdir="${datadir}/system-tools-backends-2.0/files"
 AC_SUBST(scriptsdir)
 AC_SUBST(filesdir)
 
-dnl ==============================================================
-dnl END: Set SCRIPTS_DIR, FILES_DIR
-dnl ==============================================================
-
+dnl DBus services dir
 DBUS_SERVICES_DIR="${prefix}/share/dbus-1/services"
 AC_SUBST(DBUS_SERVICES_DIR)
 
+
+dnl where is DBus system.d directory?
+AC_ARG_WITH(dbus_sys, [  --with-dbus-sys=<dir>   where D-BUS system.d directory is])
+
+if ! test -z "$with_dbus_sys" ; then
+    DBUS_SYSTEMD_DIR="$with_dbus_sys"
+else
+    DBUS_SYSTEMD_DIR="${sysconfdir}/dbus-1/system.d"
+fi
+AC_SUBST(DBUS_SYSTEMD_DIR)
+AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYSTEMD_DIR", [Where system.d dir for DBUS is])
+
+
+dnl system-tools-backends admin group
+AC_ARG_WITH(stb_group,[  --with-stb-group=<grp>  Group for system-tools-backends (stb-admin)])
+if test -z "$with_stb_group" ; then
+    STB_GROUP=stb-admin
+else
+    STB_GROUP=$with_stb_group
+fi
+AC_SUBST(STB_GROUP)
+AC_DEFINE_UNQUOTED(STB_GROUP,"STB_GROUP", [Group for system-tools-backends])
+
+
 AC_OUTPUT([
 Makefile
 m4macros/Makefile
@@ -42,12 +56,17 @@ Users/Makefile
 Utils/Makefile
 SystemToolsBackends.pl
 org.freedesktop.SystemToolsBackends.service
+system-tools-backends.conf
 ])
 
 echo "
 
 Configuration (BACKENDS):
 
-	The backends will be installed in : ${scriptsdir}
-	The files will be installed in    : ${filesdir}
+  Prefix                            : ${prefix}
+  The backends will be installed in : ${scriptsdir}
+  The files will be installed in    : ${filesdir}
+
+  DBus system.d directory           : ${DBUS_SYSTEMD_DIR}
+  System tools backends admin group : ${STB_GROUP}
 "
diff --git a/system-tools-backends.conf.in b/system-tools-backends.conf.in
new file mode 100644
index 0000000..665dba3
--- /dev/null
+++ b/system-tools-backends.conf.in
@@ -0,0 +1,29 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <policy context="default">
+    <!-- just for testing purposes, only root will
+         be able to actually change configuration -->
+    <allow own="org.freedesktop.SystemToolsBackends"/>
+    <deny send_interface="org.freedesktop.SystemToolsBackends"/>
+  </policy>
+
+  <!-- This will not work if pam_console support is not enabled -->
+  <policy at_console="true">
+    <allow send_interface="org.freedesktop.SystemToolsBackends"/>
+    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
+  </policy>
+
+  <policy user="0">
+    <allow send_interface="org.freedesktop.SystemToolsBackends"/>
+    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
+  </policy>
+
+  <policy user="@STB_GROUP@">
+    <allow send_interface="org.freedesktop.SystemToolsBackends"/>
+    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
+  </policy>
+
+</busconfig>