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

1 files changed, 59 insertions, 29 deletions

diff --git a/Makefile.in b/Makefile.in
index 139e8a24..d8c291fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,11 +93,12 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(serverdir)" \
 	"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(perldir)" \
-	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" \
-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" \
-	"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" \
-	"$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"
+	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \
+	"$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" \
+	"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \
+	"$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" \
+	"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" \
+	"$(DESTDIR)$(schemadir)"
 serverLTLIBRARIES_INSTALL = $(INSTALL)
 serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
@@ -690,11 +691,12 @@ rsearch_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+initconfigSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 perlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 taskSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS) $(init_SCRIPTS) $(perl_SCRIPTS) \
-	$(sbin_SCRIPTS) $(task_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(init_SCRIPTS) $(initconfig_SCRIPTS) \
+	$(perl_SCRIPTS) $(sbin_SCRIPTS) $(task_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -917,6 +919,7 @@ icu_lib = @icu_lib@
 includedir = @includedir@
 infdir = $(datadir)@infdir@
 infodir = @infodir@
+initconfigdir = $(sysconfdir)@initconfigdir@
 initdir = $(sysconfdir)@initdir@
 install_sh = @install_sh@
 instconfigdir = @instconfigdir@
@@ -1153,6 +1156,7 @@ task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
 	ldap/admin/src/scripts/template-dbverify
 
 init_SCRIPTS = wrappers/$(PACKAGE_NAME)
+initconfig_SCRIPTS = ldap/admin/src/$(PACKAGE_NAME)
 inf_DATA = ldap/admin/src/slapd.inf \
 	ldap/admin/src/scripts/dscreate.map \
 	ldap/admin/src/scripts/dsorgentries.map
@@ -1910,7 +1914,8 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
 @BUNDLE_FALSE@	-e 's,@defaultuser\@,$(defaultuser),g' \
 @BUNDLE_FALSE@	-e 's,@defaultgroup\@,$(defaultgroup),g' \
 @BUNDLE_FALSE@	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
-@BUNDLE_FALSE@	-e 's,@perlexec\@,@perlexec@,g'
+@BUNDLE_FALSE@	-e 's,@perlexec\@,@perlexec@,g' \
+@BUNDLE_FALSE@	-e 's,@initconfigdir\@,$(initconfigdir),g'
 
 
 # these are for the config files and scripts that we need to generate and replace
@@ -1967,7 +1972,8 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
 @BUNDLE_TRUE@	-e 's,@defaultuser\@,$(defaultuser),g' \
 @BUNDLE_TRUE@	-e 's,@defaultgroup\@,$(defaultgroup),g' \
 @BUNDLE_TRUE@	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
-@BUNDLE_TRUE@	-e 's,@perlexec\@,@perlexec@,g'
+@BUNDLE_TRUE@	-e 's,@perlexec\@,@perlexec@,g' \
+@BUNDLE_TRUE@	-e 's,@initconfigdir\@,$(initconfigdir),g'
 
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -3742,6 +3748,25 @@ uninstall-initSCRIPTS:
 	  echo " rm -f '$(DESTDIR)$(initdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(initdir)/$$f"; \
 	done
+install-initconfigSCRIPTS: $(initconfig_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(initconfigdir)" || $(mkdir_p) "$(DESTDIR)$(initconfigdir)"
+	@list='$(initconfig_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(initconfigSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(initconfigdir)/$$f'"; \
+	    $(initconfigSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(initconfigdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-initconfigSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(initconfig_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(initconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(initconfigdir)/$$f"; \
+	done
 install-perlSCRIPTS: $(perl_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(perldir)" || $(mkdir_p) "$(DESTDIR)$(perldir)"
@@ -8876,7 +8901,7 @@ check: $(BUILT_SOURCES)
 all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
 		$(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
+	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -9001,9 +9026,9 @@ info: info-am
 info-am:
 
 install-data-am: install-configDATA install-infDATA \
-	install-initSCRIPTS install-nodist_propertyDATA \
-	install-perlSCRIPTS install-propertyDATA \
-	install-sampledataDATA install-schemaDATA \
+	install-initSCRIPTS install-initconfigSCRIPTS \
+	install-nodist_propertyDATA install-perlSCRIPTS \
+	install-propertyDATA install-sampledataDATA install-schemaDATA \
 	install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
 	install-taskSCRIPTS
 
@@ -9038,12 +9063,12 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-configDATA uninstall-infDATA uninstall-info-am \
-	uninstall-initSCRIPTS uninstall-nodist_propertyDATA \
-	uninstall-perlSCRIPTS uninstall-propertyDATA \
-	uninstall-sampledataDATA uninstall-sbinPROGRAMS \
-	uninstall-sbinSCRIPTS uninstall-schemaDATA \
-	uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
-	uninstall-taskSCRIPTS
+	uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \
+	uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+	uninstall-propertyDATA uninstall-sampledataDATA \
+	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \
+	uninstall-schemaDATA uninstall-serverLTLIBRARIES \
+	uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic clean-libtool \
@@ -9057,10 +9082,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	install-binPROGRAMS install-binSCRIPTS install-configDATA \
 	install-data install-data-am install-exec install-exec-am \
 	install-infDATA install-info install-info-am \
-	install-initSCRIPTS install-man install-nodist_propertyDATA \
-	install-perlSCRIPTS install-propertyDATA \
-	install-sampledataDATA install-sbinPROGRAMS \
-	install-sbinSCRIPTS install-schemaDATA \
+	install-initSCRIPTS install-initconfigSCRIPTS install-man \
+	install-nodist_propertyDATA install-perlSCRIPTS \
+	install-propertyDATA install-sampledataDATA \
+	install-sbinPROGRAMS install-sbinSCRIPTS install-schemaDATA \
 	install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
 	install-strip install-taskSCRIPTS installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
@@ -9068,12 +9093,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-configDATA uninstall-infDATA uninstall-info-am \
-	uninstall-initSCRIPTS uninstall-nodist_propertyDATA \
-	uninstall-perlSCRIPTS uninstall-propertyDATA \
-	uninstall-sampledataDATA uninstall-sbinPROGRAMS \
-	uninstall-sbinSCRIPTS uninstall-schemaDATA \
-	uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
-	uninstall-taskSCRIPTS
+	uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \
+	uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+	uninstall-propertyDATA uninstall-sampledataDATA \
+	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \
+	uninstall-schemaDATA uninstall-serverLTLIBRARIES \
+	uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
 
 
 dirver.h: Makefile
@@ -9093,6 +9118,11 @@ ns-slapd.properties: makstrdb
 	$(fixupcmd) $^ > $@
 
 %/$(PACKAGE_NAME): %/initscript.in
+	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+	$(fixupcmd) $^ > $@
+
+%/$(PACKAGE_NAME): %/initconfig.in
+	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
 	$(fixupcmd) $^ > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.