From 7b820de508eeac0f7a38dc795dd224e7f283df52 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 12 Mar 2008 15:11:31 +0100
Subject: [PATCH] Add D-Bus configuration files for supplicant

---
 .gitignore                                         |    1 +
 configure.in                                       |    4 ++++
 scripts/Makefile.am                                |   12 ++++++++++--
 scripts/fi.epitest.hostap.WPASupplicant.conf       |   10 ++++++++++
 scripts/fi.epitest.hostap.WPASupplicant.service.in |    4 ++++
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 scripts/fi.epitest.hostap.WPASupplicant.conf
 create mode 100644 scripts/fi.epitest.hostap.WPASupplicant.service.in

diff --git a/.gitignore b/.gitignore
index 4fb1449..722951e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ src/connmand
 src/connman.service
 scripts/connman
 scripts/dhclient-script
+scripts/fi.epitest.hostap.WPASupplicant.service
diff --git a/configure.in b/configure.in
index ba478e1..9918d72 100644
--- a/configure.in
+++ b/configure.in
@@ -41,6 +41,8 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
 	fi
 ])
 
+AC_PATH_PROG(WPASUPPLICANT, [wpa_supplicant])
+
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0, dummy=yes,
 				AC_MSG_ERROR(gmodule is required))
 AC_SUBST(GMODULE_CFLAGS)
@@ -63,4 +65,6 @@ AC_SUBST(HAL_LIBS)
 
 AC_OUTPUT(Makefile include/Makefile src/Makefile doc/Makefile
 			test/Makefile plugins/Makefile scripts/Makefile
+			scripts/fi.epitest.hostap.WPASupplicant.service
 			scripts/connman src/connman.service connman.pc)
+			
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1247398..b860d5b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -3,7 +3,15 @@ initdir = $(sysconfdir)/init.d
 
 init_SCRIPTS = connman
 
-DISTCLEANFILES = $(init_SCRIPTS)
+dbusdir = $(sysconfdir)/dbus-1/system.d
+
+dbus_DATA = fi.epitest.hostap.WPASupplicant.conf
+
+servicedir = $(datadir)/dbus-1/system-services
+
+service_DATA = fi.epitest.hostap.WPASupplicant.service
+
+DISTCLEANFILES = $(init_SCRIPTS) $(service_DATA)
 
 scriptdir = $(libdir)/connman/scripts
 
@@ -15,6 +23,6 @@ dhclient_script_LDADD = @DBUS_LIBS@
 
 AM_CFLAGS = @DBUS_CFLAGS@
 
-EXTRA_DIST = $(script_DATA)
+EXTRA_DIST = $(script_DATA) $(dbus_DATA)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/scripts/fi.epitest.hostap.WPASupplicant.conf b/scripts/fi.epitest.hostap.WPASupplicant.conf
new file mode 100644
index 0000000..fa7afca
--- /dev/null
+++ b/scripts/fi.epitest.hostap.WPASupplicant.conf
@@ -0,0 +1,10 @@
+<!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="root">
+		<allow own="fi.epitest.hostap.WPASupplicant"/>
+		<allow send_destination="fi.epitest.hostap.WPASupplicant"/>
+		<allow send_interface="fi.epitest.hostap.WPASupplicant"/>
+	</policy>
+</busconfig>
diff --git a/scripts/fi.epitest.hostap.WPASupplicant.service.in b/scripts/fi.epitest.hostap.WPASupplicant.service.in
new file mode 100644
index 0000000..cdd2a03
--- /dev/null
+++ b/scripts/fi.epitest.hostap.WPASupplicant.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=fi.epitest.hostap.WPASupplicant
+Exec=@WPASUPPLICANT@ -u
+User=root
-- 
1.7.9.5