From af184c18c92decaa31abfc0849b9209ac803c658 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Mar 28 2011 18:07:13 +0000
Subject: - nope, can't use the same binary - the init script will get confused


---

diff --git a/configure.ac b/configure.ac
index a863249..3d636e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,4 +345,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 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)
+AC_OUTPUT(Makefile src/Makefile dbus/Makefile tests/Makefile tests/tools/Makefile dbus/certmonger.conf dbus/certmonger.service 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)
diff --git a/src/Makefile.am b/src/Makefile.am
index 559123c..6153d69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,7 +92,6 @@ 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
deleted file mode 100644
index a64936b..0000000
--- a/src/certmonger-session.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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