[Fedora-directory-commits] ldapserver/wrappers initscript.in, 1.6, 1.7

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29223/ldapserver/wrappers

Modified Files:
	initscript.in 
Log Message:
Resolves: bug 248169
Bug Description: init script modification needed for kerberos auth
Reviewed by: nhosoi (Thanks!)
Fix Description: I just took Simo's initial patch and ran with it.  The initconfigdir
parameter is the directory containing the config file for the init script.  configure will
first try to use $(sysconfdir)/sysconfig, then $(sysconfdir)/default (Solaris and Debian,
among others), then the package config directory (the default on HP-UX), for this
parameter.  The init script and startup script will look in the initconfigdir to find the
init config file to source.  For directory server, an instance specific file can be used,
named e.g. dirsrv-localhost which will apply to the slapd-localhost instance only.
A default init config file is provided for dirsrv and dirsrv-admin, with some examples of
how it could be used.
Platforms tested: RHEL5 x86_64
Flag Day: Yes - autotool file changes
Doc impact: Yes.  We will need to document how the user can supply environment to the
servers at startup time without having to edit the init scripts or the startup scripts.
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none 



Index: initscript.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- initscript.in	13 Aug 2007 15:35:36 -0000	1.6
+++ initscript.in	5 Oct 2007 23:45:50 -0000	1.7
@@ -86,6 +86,8 @@
 
 umask 077
 
+[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
+
 INSTANCES=""
 
 for FILE in `/bin/ls -d $instbase/slapd-* 2>/dev/null`; do
@@ -143,7 +145,12 @@
                 rm -f $pidfile
                 rm -f $startpidfile
                 fix_pid_dir_ownership $instbase/slapd-$instance
-                $exec -D $instbase/slapd-$instance -i $pidfile -w $startpidfile
+                # start the directory server in a subshell so that the instance specific
+                # init config environment will not apply to any other instance
+                (
+                    [ -f @initconfigdir@/@package_name@-$instance ] && .
@initconfigdir@/@package_name@-$instance
+                    $exec -D $instbase/slapd-$instance -i $pidfile -w $startpidfile
+                )
                 if [ $? -eq 0 ]; then
                     server_started=1 # well, perhaps not running, but started ok
                 else