[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-start-slapd.in, 1.7, 1.8

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory
cvs-int.fedora.redhat.com:/tmp/cvs-serv29223/ldapserver/ldap/admin/src/scripts

Modified Files:
	template-start-slapd.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: template-start-slapd.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- template-start-slapd.in	12 Feb 2007 19:55:10 -0000	1.7
+++ template-start-slapd.in	5 Oct 2007 23:45:50 -0000	1.8
@@ -6,6 +6,12 @@
 SHLIB_PATH=$prefix{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
 export SHLIB_PATH
 
+# source env. for all instances
+[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
+
+# source env. for this instance
+[ -f @initconfigdir@/@package_name@-{{SERV-ID}} ] && .
@initconfigdir@/@package_name@-{{SERV-ID}}
+
 # Script that starts the ns-slapd server.
 # Exit status can be:
 #       0: Server started successfully