From 64e2d7635ed6e4ed741bd29465d938ff9afe26eb Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 4 Sep 2013 19:56:49 +0200
Subject: [PATCH] dbus-service: allow to define user to run as at configure
 time

---
 configure.ac                             |  8 ++++++++
 data/Makefile.am                         |  8 +-------
 data/org.freedesktop.GeoClue2.conf       | 15 ---------------
 data/org.freedesktop.GeoClue2.conf.in    | 15 +++++++++++++++
 data/org.freedesktop.GeoClue2.service.in |  2 +-
 5 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 data/org.freedesktop.GeoClue2.conf
 create mode 100644 data/org.freedesktop.GeoClue2.conf.in

diff --git a/configure.ac b/configure.ac
index 695b478..be6540f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,12 +120,20 @@ else
 fi
 AC_SUBST(DBUS_SYS_DIR)
 
+AC_ARG_WITH(dbus-service-user,
+	    AS_HELP_STRING([--with-dbus-service-user=USER], [The USER (existing) as which the service will run (default: root)]),
+	    DBUS_SRV_USER="$with_dbus_service_user",
+	    DBUS_SRV_USER="root")
+AC_SUBST(DBUS_SRV_USER)
+
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
   src/geoclue-2.0.pc
   src/geoip-server/Makefile
   po/Makefile.in
+  data/org.freedesktop.GeoClue2.conf
+  data/org.freedesktop.GeoClue2.service
   data/Makefile
   demo/Makefile
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index 348ca42..1fd3731 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,14 +1,8 @@
 servicedir       = $(datadir)/dbus-1/system-services
-service_in_files = org.freedesktop.GeoClue2.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+service_DATA     = org.freedesktop.GeoClue2.service
 
 # DBus Service policy file
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = org.freedesktop.GeoClue2.conf
 
-EXTRA_DIST = $(service_in_files) \
-    	     $(dbusservice_DATA)
 DISTCLEANFILES = $(service_DATA)
diff --git a/data/org.freedesktop.GeoClue2.conf b/data/org.freedesktop.GeoClue2.conf
deleted file mode 100644
index 3b3292f..0000000
--- a/data/org.freedesktop.GeoClue2.conf
+++ /dev/null
@@ -1,15 +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 context="default">
-    <!-- Allow everyone to talk to main service. We'll later add an agent to
-         only share the location if user allows it. -->
-    <allow send_destination="org.freedesktop.GeoClue2"/>
-  </policy>
-
-  <policy user="root">
-    <!-- Only allow root to own the name on the bus -->
-    <allow own="org.freedesktop.GeoClue2"/>
-  </policy>
-</busconfig>
diff --git a/data/org.freedesktop.GeoClue2.conf.in b/data/org.freedesktop.GeoClue2.conf.in
new file mode 100644
index 0000000..aba4791
--- /dev/null
+++ b/data/org.freedesktop.GeoClue2.conf.in
@@ -0,0 +1,15 @@
+<!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">
+    <!-- Allow everyone to talk to main service. We'll later add an agent to
+         only share the location if user allows it. -->
+    <allow send_destination="org.freedesktop.GeoClue2"/>
+  </policy>
+
+  <policy user="@DBUS_SRV_USER@">
+    <!-- Only allow @DBUS_SRV_USER@ to own the name on the bus -->
+    <allow own="org.freedesktop.GeoClue2"/>
+  </policy>
+</busconfig>
diff --git a/data/org.freedesktop.GeoClue2.service.in b/data/org.freedesktop.GeoClue2.service.in
index 948c644..b220e8a 100644
--- a/data/org.freedesktop.GeoClue2.service.in
+++ b/data/org.freedesktop.GeoClue2.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.GeoClue2
 Exec=@libexecdir@/geoclue -t 5
-User=root
+User=@DBUS_SRV_USER@
-- 
1.8.3.4