From 4041c10a29196de197cafa6d99c0b6d772a0d08f Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Mar 28 2011 15:58:28 +0000
Subject: - add configuration to launch a session copy correctly


---

diff --git a/certmonger.spec b/certmonger.spec
index b792a5b..93d4526 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -95,6 +95,7 @@ exit 0
 %defattr(-,root,root,-)
 %doc README LICENSE STATUS doc/*.txt
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/*
+%config(noreplace) %{_datadir}/dbus-1/services/*
 %dir %{_sysconfdir}/certmonger
 %config(noreplace) %{_sysconfdir}/certmonger/certmonger.conf
 %if 0%{?fedora} <= 9 || 0%{?rhel} < 6
diff --git a/configure.ac b/configure.ac
index e9ef0b9..dc458e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,7 @@ mylibexecdir="$libexecdir/${PACKAGE_NAME}"
 mylibexecdir=`eval echo $mylibexecdir | sed "s,NONE,$prefix,g"`
 mylibexecdir=`eval echo $mylibexecdir | sed "s,NONE,$ac_default_prefix,g"`
 mylibexecdir=`eval echo $mylibexecdir | sed "s,NONE,,g"`
+AC_SUBST(mylibexecdir)
 AC_ARG_WITH(file-store-dir,
 AS_HELP_STRING([--with-file-store-dir=/var/lib/certmonger],[directory to use for storing data]),
 mylocalstatedir=$withval,
@@ -341,4 +342,4 @@ AC_SUBST(UUID_CFLAGS)
 AC_SUBST(UUID_LIBS)
 
 AC_CONFIG_COMMANDS(src_introspect_sh,[chmod +x src/introspect.sh])
-AC_OUTPUT(Makefile src/Makefile dbus/Makefile tests/Makefile tests/tools/Makefile dbus/certmonger.conf src/certmonger.init src/introspect.sh src/certmonger.8 src/getcert.1 src/getcert-request.1 src/getcert-list.1 src/getcert-list-cas.1 src/getcert-start-tracking.1 src/getcert-stop-tracking.1 src/selfsign-getcert.1 src/ipa-getcert.1 src/getcert-resubmit.1 src/certmonger-certmaster-submit.8 src/certmonger-ipa-submit.8 src/certmaster-getcert.1 src/certmonger.conf.5 po/Makefile.in src/certmonger.conf)
+AC_OUTPUT(Makefile src/Makefile dbus/Makefile tests/Makefile tests/tools/Makefile dbus/certmonger.conf dbus/certmonger.service src/certmonger.init src/certmonger-session src/introspect.sh src/certmonger.8 src/getcert.1 src/getcert-request.1 src/getcert-list.1 src/getcert-list-cas.1 src/getcert-start-tracking.1 src/getcert-stop-tracking.1 src/selfsign-getcert.1 src/ipa-getcert.1 src/getcert-resubmit.1 src/certmonger-certmaster-submit.8 src/certmonger-ipa-submit.8 src/certmaster-getcert.1 src/certmonger.conf.5 po/Makefile.in src/certmonger.conf)
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index b32142a..249f835 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -1,2 +1,4 @@
+servicedir = $(datadir)/dbus-1/services
+service_DATA = certmonger.service
 systemdbusdir = $(sysconfdir)/dbus-1/system.d
 systemdbus_DATA = certmonger.conf
diff --git a/dbus/certmonger.service.in b/dbus/certmonger.service.in
new file mode 100644
index 0000000..74a8c55
--- /dev/null
+++ b/dbus/certmonger.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=@CM_DBUS_NAME@
+Exec=@mylibexecdir@/certmonger-session
diff --git a/src/Makefile.am b/src/Makefile.am
index 6153d69..559123c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,6 +92,7 @@ libcm_o_a_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS) $(OPENSSL_CFLAGS)
 libcm_a_LIBADD = $(libcm_o_a_OBJECTS)
 bin_PROGRAMS = getcert
 pkglibexec_PROGRAMS =
+pkglibexec_SCRIPTS = certmonger-session
 pkglibexecdir = $(libexecdir)/$(PACKAGE)
 getcert_SOURCES = getcert.c
 getcert_LDADD = libcm.a $(GETCERT_LIBS) $(KRB5_LIBS)
diff --git a/src/certmonger-session.in b/src/certmonger-session.in
new file mode 100644
index 0000000..a64936b
--- /dev/null
+++ b/src/certmonger-session.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+CERTMONGER_CONFIG_DIR=$HOME/.config/certmonger
+export CERTMONGER_CONFIG_DIR
+CERTMONGER_REQUESTS_DIR=$HOME/.config/certmonger/requests
+export CERTMONGER_REQUESTS_DIR
+CERTMONGER_CAS_DIR=$HOME/.config/certmonger/cas
+export CERTMONGER_CAS_DIR
+exec @mysbindir@/certmonger -s -n