From 07d82f79d2970a08628ebf71343441ec55faa6fa Mon Sep 17 00:00:00 2001
From: Pavel Březina <pbrezina@redhat.com>
Date: Mon, 24 Jun 2013 15:30:04 +0200
Subject: init script: source /etc/sysconfig/sssd

https://fedorahosted.org/sssd/ticket/1959
---
 src/conf_macros.m4               | 13 +++++++++++++
 src/sysv/sssd.in                 |  4 ++++
 src/sysv/systemd/sssd.service.in |  1 +
 3 files changed, 18 insertions(+)

(limited to 'src')

diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index 1dd29603..1834f3cb 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -152,6 +152,19 @@ AC_DEFUN([WITH_INITSCRIPT],
   AC_MSG_NOTICE([Will use init script type: $initscript])
   ])
 
+AC_DEFUN([WITH_ENVIRONMENT_FILE],
+  [ AC_ARG_WITH([environment_file],
+                [AC_HELP_STRING([--with-environment-file=PATH], [Path to environment file [/etc/sysconfig/sssd]])
+                ]
+               )
+
+    ENVIRONMENT_FILE_PATH="${sysconfdir}/sysconfig/sssd"
+    if test x"$with_environment_file" != x; then
+        ENVIRONMENT_FILE_PATH=$with_environment_file
+    fi
+    AC_SUBST(environment_file, [$ENVIRONMENT_FILE_PATH])
+  ])
+
 AC_DEFUN([WITH_INIT_DIR],
   [ AC_ARG_WITH([init-dir],
                 [AC_HELP_STRING([--with-init-dir=DIR],
diff --git a/src/sysv/sssd.in b/src/sysv/sssd.in
index 8a344be7..6155df97 100644
--- a/src/sysv/sssd.in
+++ b/src/sysv/sssd.in
@@ -31,6 +31,10 @@ prog="sssd"
 # Source function library.
 . /etc/init.d/functions
 
+if [ -f @environment_file@ ]; then
+    . @environment_file@
+fi
+
 SSSD=@sbindir@/sssd
 
 LOCK_FILE=@localstatedir@/lock/subsys/sssd
diff --git a/src/sysv/systemd/sssd.service.in b/src/sysv/systemd/sssd.service.in
index 30592afe..3c141097 100644
--- a/src/sysv/systemd/sssd.service.in
+++ b/src/sysv/systemd/sssd.service.in
@@ -4,6 +4,7 @@ Description=System Security Services Daemon
 After=syslog.target
 
 [Service]
+EnvironmentFile=-@environment_file@
 ExecStart=@sbindir@/sssd -D -f
 # These two should be used with traditional UNIX forking daemons
 # consult systemd.service(5) for more details
-- 
cgit