[Fedora-directory-commits] ldapserver Makefile.am, 1.60, 1.61 Makefile.in, 1.74, 1.75 configure, 1.69, 1.70 configure.ac, 1.39, 1.40
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27524
Modified Files:
Makefile.am Makefile.in configure configure.ac
Log Message:
Resolves: 325281
Summary: Install SNMP subagent mibs.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Makefile.am 5 Oct 2007 23:45:49 -0000 1.60
+++ Makefile.am 9 Oct 2007 18:30:38 -0000 1.61
@@ -82,6 +82,7 @@
instconfigdir = @instconfigdir@
perldir = $(libdir)@perldir@
infdir = $(datadir)@infdir@
+mibdir = $(datadir)@mibdir@
defaultuser=@defaultuser@
defaultgroup=@defaultgroup@
@@ -248,6 +249,14 @@
ldap/admin/src/scripts/dscreate.map \
ldap/admin/src/scripts/dsorgentries.map
+mib_DATA = ldap/servers/snmp/RFC-1215.txt \
+ ldap/servers/snmp/SNMPv2-TC.txt \
+ ldap/servers/snmp/redhat-directory.mib \
+ ldap/servers/snmp/SNMPv2-CONF.txt \
+ ldap/servers/snmp/NETWORK-SERVICES-MIB.txt \
+ ldap/servers/snmp/RFC1155-SMI.txt \
+ ldap/servers/snmp/SNMPv2-SMI.txt
+
#////////////////////////////////////////////////////////////////
#
# Server Strings
@@ -1020,6 +1029,7 @@
-e 's,@sysconfdir\@,$(sysconfdir),g' \
-e 's,@localstatedir\@,$(localstatedir),g' \
-e 's,@infdir\@,$(infdir),g' \
+ -e 's,@mibdir\@,$(mibdir),g' \
-e 's,@templatedir\@,$(sampledatadir),g' \
-e 's,@package_name\@,$(PACKAGE_NAME),g' \
-e 's,@instconfigdir\@,$(instconfigdir),g' \
@@ -1068,6 +1078,7 @@
-e 's,@sysconfdir\@,$(sysconfdir),g' \
-e 's,@localstatedir\@,$(localstatedir),g' \
-e 's,@infdir\@,$(infdir),g' \
+ -e 's,@mibdir\@,$(mibdir),g' \
-e 's,@templatedir\@,$(sampledatadir),g' \
-e 's,@package_name\@,$(PACKAGE_NAME),g' \
-e 's,@instconfigdir\@,$(instconfigdir),g' \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Makefile.in 5 Oct 2007 23:45:49 -0000 1.74
+++ Makefile.in 9 Oct 2007 18:30:38 -0000 1.75
@@ -96,9 +96,9 @@
"$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \
"$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" \
"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" \
- "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" \
- "$(DESTDIR)$(schemadir)"
+ "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" \
+ "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" \
+ "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"
serverLTLIBRARIES_INSTALL = $(INSTALL)
serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
@@ -768,11 +768,12 @@
$(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
configDATA_INSTALL = $(INSTALL_DATA)
infDATA_INSTALL = $(INSTALL_DATA)
+mibDATA_INSTALL = $(INSTALL_DATA)
nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
propertyDATA_INSTALL = $(INSTALL_DATA)
sampledataDATA_INSTALL = $(INSTALL_DATA)
schemaDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(config_DATA) $(inf_DATA) $(nodist_property_DATA) \
+DATA = $(config_DATA) $(inf_DATA) $(mib_DATA) $(nodist_property_DATA) \
$(property_DATA) $(sampledata_DATA) $(schema_DATA)
ETAGS = etags
CTAGS = ctags
@@ -931,6 +932,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mibdir = $(datadir)@mibdir@
mkdir_p = @mkdir_p@
netsnmp_inc = @netsnmp_inc@
netsnmp_lib = @netsnmp_lib@
@@ -1161,6 +1163,14 @@
ldap/admin/src/scripts/dscreate.map \
ldap/admin/src/scripts/dsorgentries.map
+mib_DATA = ldap/servers/snmp/RFC-1215.txt \
+ ldap/servers/snmp/SNMPv2-TC.txt \
+ ldap/servers/snmp/redhat-directory.mib \
+ ldap/servers/snmp/SNMPv2-CONF.txt \
+ ldap/servers/snmp/NETWORK-SERVICES-MIB.txt \
+ ldap/servers/snmp/RFC1155-SMI.txt \
+ ldap/servers/snmp/SNMPv2-SMI.txt
+
#////////////////////////////////////////////////////////////////
#
@@ -1892,6 +1902,7 @@
@BUNDLE_FALSE@ -e 's,@sysconfdir\@,$(sysconfdir),g' \
@BUNDLE_FALSE@ -e 's,@localstatedir\@,$(localstatedir),g' \
@BUNDLE_FALSE@ -e 's,@infdir\@,$(infdir),g' \
+@BUNDLE_FALSE@ -e 's,@mibdir\@,$(mibdir),g' \
@BUNDLE_FALSE@ -e 's,@templatedir\@,$(sampledatadir),g' \
@BUNDLE_FALSE@ -e 's,@package_name\@,$(PACKAGE_NAME),g' \
@BUNDLE_FALSE@ -e 's,@instconfigdir\@,$(instconfigdir),g' \
@@ -1950,6 +1961,7 @@
@BUNDLE_TRUE@ -e 's,@sysconfdir\@,$(sysconfdir),g' \
@BUNDLE_TRUE@ -e 's,@localstatedir\@,$(localstatedir),g' \
@BUNDLE_TRUE@ -e 's,@infdir\@,$(infdir),g' \
+@BUNDLE_TRUE@ -e 's,@mibdir\@,$(mibdir),g' \
@BUNDLE_TRUE@ -e 's,@templatedir\@,$(sampledatadir),g' \
@BUNDLE_TRUE@ -e 's,@package_name\@,$(PACKAGE_NAME),g' \
@BUNDLE_TRUE@ -e 's,@instconfigdir\@,$(instconfigdir),g' \
@@ -8651,6 +8663,23 @@
echo " rm -f '$(DESTDIR)$(infdir)/$$f'"; \
rm -f "$(DESTDIR)$(infdir)/$$f"; \
done
+install-mibDATA: $(mib_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(mibdir)" || $(mkdir_p) "$(DESTDIR)$(mibdir)"
+ @list='$(mib_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(mibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mibdir)/$$f'"; \
+ $(mibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mibdir)/$$f"; \
+ done
+
+uninstall-mibDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mib_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(mibdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mibdir)/$$f"; \
+ done
install-nodist_propertyDATA: $(nodist_property_DATA)
@$(NORMAL_INSTALL)
test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)"
@@ -8901,7 +8930,7 @@
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)$(initconfigdir)" "$(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)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -9026,7 +9055,7 @@
info-am:
install-data-am: install-configDATA install-infDATA \
- install-initSCRIPTS install-initconfigSCRIPTS \
+ install-initSCRIPTS install-initconfigSCRIPTS install-mibDATA \
install-nodist_propertyDATA install-perlSCRIPTS \
install-propertyDATA install-sampledataDATA install-schemaDATA \
install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
@@ -9064,11 +9093,12 @@
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-configDATA uninstall-infDATA uninstall-info-am \
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
+ uninstall-mibDATA 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 \
@@ -9083,9 +9113,10 @@
install-data install-data-am install-exec install-exec-am \
install-infDATA install-info install-info-am \
install-initSCRIPTS install-initconfigSCRIPTS install-man \
- install-nodist_propertyDATA install-perlSCRIPTS \
- install-propertyDATA install-sampledataDATA \
- install-sbinPROGRAMS install-sbinSCRIPTS install-schemaDATA \
+ install-mibDATA 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 \
@@ -9094,11 +9125,12 @@
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-configDATA uninstall-infDATA uninstall-info-am \
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
+ uninstall-mibDATA uninstall-nodist_propertyDATA \
+ uninstall-perlSCRIPTS uninstall-propertyDATA \
+ uninstall-sampledataDATA uninstall-sbinPROGRAMS \
+ uninstall-sbinSCRIPTS uninstall-schemaDATA \
+ uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
+ uninstall-taskSCRIPTS
dirver.h: Makefile
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- configure 5 Oct 2007 23:45:49 -0000 1.69
+++ configure 9 Oct 2007 18:30:39 -0000 1.70
@@ -465,7 +465,7 @@
#endif"
ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23160,6 +23160,8 @@
serverplugindir=/plugins
# relative to datadir
infdir=/inf
+ # relative to datadir
+ mibdir=/mibs
# location of property/resource files, relative to datadir
propertydir=/properties
# relative to libdir
@@ -23182,6 +23184,8 @@
serverplugindir=/$PACKAGE_NAME/plugins
# relative to datadir
infdir=/$PACKAGE_NAME/inf
+ # relative to datadir
+ mibdir=/$PACKAGE_NAME/mibs
# location of property/resource files, relative to datadir
propertydir=/$PACKAGE_NAME/properties
# relative to libdir
@@ -23211,6 +23215,7 @@
+
# check for --with-instconfigdir
echo "$as_me:$LINENO: checking for --with-instconfigdir" >&5
echo $ECHO_N "checking for --with-instconfigdir... $ECHO_C" >&6
@@ -26079,6 +26084,7 @@
s,@scripttemplatedir@,$scripttemplatedir,;t t
s,@perldir@,$perldir,;t t
s,@infdir@,$infdir,;t t
+s,@mibdir@,$mibdir,;t t
s,@defaultuser@,$defaultuser,;t t
s,@defaultgroup@,$defaultgroup,;t t
s,@instconfigdir@,$instconfigdir,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- configure.ac 5 Oct 2007 23:45:49 -0000 1.39
+++ configure.ac 9 Oct 2007 18:30:39 -0000 1.40
@@ -165,6 +165,8 @@
serverplugindir=/plugins
# relative to datadir
infdir=/inf
+ # relative to datadir
+ mibdir=/mibs
# location of property/resource files, relative to datadir
propertydir=/properties
# relative to libdir
@@ -189,6 +191,8 @@
serverplugindir=/$PACKAGE_NAME/plugins
# relative to datadir
infdir=/$PACKAGE_NAME/inf
+ # relative to datadir
+ mibdir=/$PACKAGE_NAME/mibs
# location of property/resource files, relative to datadir
propertydir=/$PACKAGE_NAME/properties
# relative to libdir
@@ -214,6 +218,7 @@
AC_SUBST(scripttemplatedir)
AC_SUBST(perldir)
AC_SUBST(infdir)
+AC_SUBST(mibdir)
AC_SUBST(defaultuser)
AC_SUBST(defaultgroup)
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd pw.c, 1.15, 1.16
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18910
Modified Files:
pw.c
Log Message:
Resolves: bug 305121
Bug Description: Server hangs when adding a group with two password entries
Reviewed by: nhosoi (Thanks!)
Files: see diff
Branch: HEAD
Fix Description: The pw_encodevals() was not encoding each value, only the first one, then setting each new value to the same encoded value. The solution is to move char *enc into the loop so that it is allocated anew each time.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
Index: pw.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pw.c 5 Dec 2006 21:22:09 -0000 1.15
+++ pw.c 9 Oct 2007 17:51:14 -0000 1.16
@@ -319,7 +319,6 @@
pw_encodevals( Slapi_Value **vals )
{
int i;
- char *enc = NULL;
slapdFrontendConfig_t * slapdFrontendConfig = getFrontendConfig();
@@ -330,6 +329,7 @@
for ( i = 0; vals[ i ] != NULL; ++i ) {
struct pw_scheme *pwsp;
+ char *enc = NULL;
if ( (pwsp=pw_val2scheme( (char*)slapi_value_get_string(vals[ i ]), NULL, 0)) != NULL ) { /* JCM Innards */
/* If the value already specifies clear storage, call the
* clear storage plug-in */
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/admin/src initconfig.in, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18806
Modified Files:
initconfig.in
Log Message:
Resolves: bug 190220
Bug Description: Link DS with libumem on Solaris 9 and later
Reviewed by: nkinder (Thanks!)
Fix Description: See if libumem.so exists, and set the appropriate LD_PRELOAD env. var. if so.
Platforms tested: Solaris 9 64-bit
Flag Day: no
Doc impact: no
Index: initconfig.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/initconfig.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- initconfig.in 5 Oct 2007 23:45:50 -0000 1.1
+++ initconfig.in 9 Oct 2007 17:49:09 -0000 1.2
@@ -20,3 +20,14 @@
# KRB5_KTNAME=@instconfigdir@/slapd-instance/keytab ; export KRB5_KTNAME
# other environment settings can be added here too
+OS=`uname -s`
+# use the new mt slab memory allocator on Solaris
+# this requires Solaris 9 update 3 or later
+if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
+ LD_PRELOAD=/usr/lib/libumem.so
+ export LD_PRELOAD
+fi
+if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
+ LD_PRELOAD_64=/usr/lib/64/libumem.so
+ export LD_PRELOAD_64
+fi
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/passthru ptpreop.c, 1.6, 1.7
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1354
Modified Files:
ptpreop.c
Log Message:
Resolves: 176302
Summary: Avoid double free of controls in passthrough plugin.
Index: ptpreop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptpreop.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ptpreop.c 10 Nov 2006 23:45:04 -0000 1.6
+++ ptpreop.c 8 Oct 2007 20:49:16 -0000 1.7
@@ -148,7 +148,7 @@
static int
passthru_bindpreop( Slapi_PBlock *pb )
{
- int rc, method;
+ int rc, method, freeresctrls=1;
char *normbinddn, *matcheddn;
char *libldap_errmsg, *pr_errmsg, *errmsg;
PassThruConfig *cfg;
@@ -259,6 +259,7 @@
*/
if ( resctrls != NULL ) {
(void)slapi_pblock_set( pb, SLAPI_RESCONTROLS, resctrls );
+ freeresctrls=0;
}
slapi_send_ldap_result( pb, rc, matcheddn, errmsg, 0, urls );
}
@@ -275,7 +276,7 @@
if ( pr_errmsg != NULL ) {
PR_smprintf_free( pr_errmsg );
}
- if ( resctrls != NULL ) {
+ if ( freeresctrls && (resctrls != NULL) ) {
ldap_controls_free( resctrls );
}
if ( matcheddn != NULL ) {
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm archive.c, 1.13, 1.14
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9399
Modified Files:
archive.c
Log Message:
Resolves: 316281
Summary: Initialize backup directory name properly for all cases.
Index: archive.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/archive.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- archive.c 3 Oct 2007 19:14:58 -0000 1.13
+++ archive.c 8 Oct 2007 18:45:00 -0000 1.14
@@ -296,9 +296,11 @@
}
}
- if (stat(rawdirectory, &sbuf) == 0) {
+ /* Initialize directory */
+ directory = rel2abspath(rawdirectory);
+
+ if (stat(directory, &sbuf) == 0) {
int baklen = 0;
- directory = rel2abspath(rawdirectory);
if (slapd_comp_path(directory, li->li_directory) == 0) {
LDAPDebug(LDAP_DEBUG_ANY,
16 years, 6 months
[Fedora-directory-commits] adminserver/wrappers initscript.in, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29995
Modified Files:
initscript.in
Log Message:
since we use the start script to start admin, we source the
init config file there, not here in the initscript
Index: initscript.in
===================================================================
RCS file: /cvs/dirsec/adminserver/wrappers/initscript.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- initscript.in 5 Oct 2007 23:48:02 -0000 1.2
+++ initscript.in 8 Oct 2007 14:37:29 -0000 1.3
@@ -92,7 +92,11 @@
umask 077
-[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
+# since we use the start script to start admin, we source the
+# init config file there, not here
+# if we ever get rid of the start script, we'll have to uncomment
+# the following line
+#[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
start() {
if [ ! -f $start_script ]; then
16 years, 6 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff initconfig.in, NONE, 1.1 start-ds-admin.in, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29402/adminserver/admserv/cfgstuff
Modified Files:
start-ds-admin.in
Added Files:
initconfig.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
--- NEW FILE initconfig.in ---
# This file is sourced by @package_name@ upon startup to set
# the default environment for the admin server.
# In order to make more file descriptors available
# to the server, first make sure the system
# hard limits are raised, then use ulimit - uncomment
# out the following line and change the value to the
# desired value
# ulimit -n 8192
# In order to use SASL/GSSAPI the
# server needs to know where to find its keytab
# file - uncomment the following line and set
# the path and filename appropriately
# KRB5_KTNAME=@instconfigdir@/admin-serv/keytab ; export KRB5_KTNAME
# other environment settings can be added here too
Index: start-ds-admin.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-ds-admin.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- start-ds-admin.in 1 Aug 2007 18:14:53 -0000 1.3
+++ start-ds-admin.in 5 Oct 2007 23:48:02 -0000 1.4
@@ -56,4 +56,7 @@
OMIT_DEFLATE="-DOmitDeflate"
fi
+# source env. for admin server
+[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
+
$HTTPD $OMIT_DEFLATE -k start -f @configdir(a)/httpd.conf "$@"
16 years, 6 months
[Fedora-directory-commits] adminserver/wrappers initscript.in, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29402/adminserver/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/adminserver/wrappers/initscript.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- initscript.in 15 Jun 2007 17:13:02 -0000 1.1
+++ initscript.in 5 Oct 2007 23:48:02 -0000 1.2
@@ -92,6 +92,8 @@
umask 077
+[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
+
start() {
if [ ! -f $start_script ]; then
echo_n "*** Error: $start_script does not exist"
@@ -99,7 +101,6 @@
exit 1
fi
echo "Starting $prog: "
- # Start every slapd instance that isn't already running
# the server creates pidfile and writes the pid to it when it is fully
# started and available to serve clients
16 years, 6 months
[Fedora-directory-commits] adminserver Makefile.am, 1.33, 1.34 configure.ac, 1.21, 1.22 aclocal.m4, 1.32, 1.33 configure, 1.36, 1.37 missing, 1.22, 1.23 install-sh, 1.22, 1.23 depcomp, 1.22, 1.23 compile, 1.21, 1.22 Makefile.in, 1.39, 1.40 config.sub, 1.22, 1.23 config.guess, 1.22, 1.23
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29402/adminserver
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh depcomp compile Makefile.in config.sub config.guess
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: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile.am 5 Sep 2007 16:45:58 -0000 1.33
+++ Makefile.am 5 Oct 2007 23:48:01 -0000 1.34
@@ -68,6 +68,7 @@
manualdir = $(datadir)@manualdir@
helpdir = $(manualdir)/help
initdir = $(sysconfdir)@initdir@
+initconfigdir = $(sysconfdir)@initconfigdir@
instconfigdir = @instconfigdir@
instancename = @instancename@
configdir = $(instconfigdir)/$(instancename)
@@ -146,6 +147,8 @@
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
+initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
+
ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
admserv/schema/ldif/01nsroot.ldif.tmpl \
admserv/schema/ldif/02globalpreferences.ldif.tmpl \
@@ -490,7 +493,8 @@
-e 's,@infdir\@,$(infdir),g' \
-e 's,@dslibdir\@,$(dslibdir),g' \
-e 's,@ldifdir\@,$(ldifdir),g' \
- -e 's,@adminutilpath\@,$(adminutilpath),g'
+ -e 's,@adminutilpath\@,$(adminutilpath),g' \
+ -e 's,@initconfigdir\@,$(initconfigdir),g'
else
fixupcmd = sed \
-e 's,@ECHO_C\@,$(ECHO_C),g' \
@@ -540,7 +544,8 @@
-e 's,@infdir\@,$(infdir),g' \
-e 's,@dslibdir\@,$(dslibdir),g' \
-e 's,@ldifdir\@,$(ldifdir),g' \
- -e 's,@adminutilpath\@,$(adminutilpath),g'
+ -e 's,@adminutilpath\@,$(adminutilpath),g' \
+ -e 's,@initconfigdir\@,$(initconfigdir),g'
endif
# because the source may be either httpd.conf.in or httpd-2.2.conf.in
@@ -555,3 +560,7 @@
%/$(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) $^ > $@
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.ac 27 Sep 2007 16:57:08 -0000 1.21
+++ configure.ac 5 Oct 2007 23:48:01 -0000 1.22
@@ -141,6 +141,7 @@
CXXLINK_REQUIRED=1
httpdgroup=nogroup
platform="hpux"
+ initconfigdir="/$PACKAGE_NAME/config"
;;
hppa*-hp-hpux*)
AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -157,6 +158,7 @@
# assume 64 bit
perlexec='/opt/perl_64/bin/perl'
platform="hpux"
+ initconfigdir="/$PACKAGE_NAME/config"
;;
sparc-sun-solaris*)
AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -194,6 +196,19 @@
AM_CONDITIONAL([HPUX],test "$platform" = "hpux")
AM_CONDITIONAL([SOLARIS],test "$platform" = "solaris")
+# set default initconfigdir if not already set
+# value will be set so as to be relative to $(sysconfdir)
+if test -z "$initconfigdir" ; then
+ if test -d /etc/sysconfig ; then
+ initconfigdir=/sysconfig
+ elif test -d /etc/default ; then
+ initconfigdir=/default
+ else
+ initconfigdir="/$PACKAGE_NAME/config"
+ fi
+fi
+AC_SUBST(initconfigdir)
+
# Check for fortitude
m4_include(m4/fortitude.m4)
# Check for web server
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- configure 27 Sep 2007 16:57:08 -0000 1.36
+++ configure 5 Oct 2007 23:48:01 -0000 1.37
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/dirsrv
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup admlogdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE initconfigdir HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup admlogdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23117,6 +23117,7 @@
CXXLINK_REQUIRED=1
httpdgroup=nogroup
platform="hpux"
+ initconfigdir="/$PACKAGE_NAME/config"
;;
hppa*-hp-hpux*)
@@ -23169,6 +23170,7 @@
# assume 64 bit
perlexec='/opt/perl_64/bin/perl'
platform="hpux"
+ initconfigdir="/$PACKAGE_NAME/config"
;;
sparc-sun-solaris*)
@@ -23275,6 +23277,19 @@
fi
+# set default initconfigdir if not already set
+# value will be set so as to be relative to $(sysconfdir)
+if test -z "$initconfigdir" ; then
+ if test -d /etc/sysconfig ; then
+ initconfigdir=/sysconfig
+ elif test -d /etc/default ; then
+ initconfigdir=/default
+ else
+ initconfigdir="/$PACKAGE_NAME/config"
+ fi
+fi
+
+
# Check for fortitude
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2007 Red Hat, Inc.
@@ -25940,6 +25955,7 @@
s,@HPUX_FALSE@,$HPUX_FALSE,;t t
s,@SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
s,@SOLARIS_FALSE@,$SOLARIS_FALSE,;t t
+s,@initconfigdir@,$initconfigdir,;t t
s,@HTTPD@,$HTTPD,;t t
s,@APXS@,$APXS,;t t
s,@APR_CONFIG@,$APR_CONFIG,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.in 27 Sep 2007 16:57:08 -0000 1.39
+++ Makefile.in 5 Oct 2007 23:48:02 -0000 1.40
@@ -100,12 +100,12 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \
"$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \
- "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \
- "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" \
- "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" \
- "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" \
- "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
- "$(DESTDIR)$(propertydir)"
+ "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \
+ "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \
+ "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \
+ "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \
+ "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \
+ "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libds_admin_serv_la_LIBADD =
@@ -241,10 +241,11 @@
cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+initconfigSCRIPT_INSTALL = $(INSTALL_SCRIPT)
nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
perlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) $(init_SCRIPTS) \
- $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
+ $(initconfig_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -461,6 +462,7 @@
includedir = @includedir@
infdir = $(datadir)@infdir@
infodir = @infodir@
+initconfigdir = $(sysconfdir)@initconfigdir@
initdir = $(sysconfdir)@initdir@
install_sh = @install_sh@
instancename = @instancename@
@@ -585,6 +587,7 @@
@CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK)
@CXXLINK_REQUIRED_TRUE@MYLINK = $(CXXLINK)
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
+initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
admserv/schema/ldif/01nsroot.ldif.tmpl \
admserv/schema/ldif/02globalpreferences.ldif.tmpl \
@@ -875,7 +878,8 @@
@BUNDLE_FALSE@ -e 's,@infdir\@,$(infdir),g' \
@BUNDLE_FALSE@ -e 's,@dslibdir\@,$(dslibdir),g' \
@BUNDLE_FALSE@ -e 's,@ldifdir\@,$(ldifdir),g' \
-@BUNDLE_FALSE@ -e 's,@adminutilpath\@,$(adminutilpath),g'
+@BUNDLE_FALSE@ -e 's,@adminutilpath\@,$(adminutilpath),g' \
+@BUNDLE_FALSE@ -e 's,@initconfigdir\@,$(initconfigdir),g'
# these are for the config files and scripts that we need to generate and replace
@@ -934,7 +938,8 @@
@BUNDLE_TRUE@ -e 's,@infdir\@,$(infdir),g' \
@BUNDLE_TRUE@ -e 's,@dslibdir\@,$(dslibdir),g' \
@BUNDLE_TRUE@ -e 's,@ldifdir\@,$(ldifdir),g' \
-@BUNDLE_TRUE@ -e 's,@adminutilpath\@,$(adminutilpath),g'
+@BUNDLE_TRUE@ -e 's,@adminutilpath\@,$(adminutilpath),g' \
+@BUNDLE_TRUE@ -e 's,@initconfigdir\@,$(initconfigdir),g'
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1429,6 +1434,25 @@
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-nodist_cmdbinSCRIPTS: $(nodist_cmdbin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(cmdbindir)" || $(mkdir_p) "$(DESTDIR)$(cmdbindir)"
@@ -2621,7 +2645,7 @@
$(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -2686,7 +2710,7 @@
install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \
install-cmdbinSCRIPTS install-dist_helpDATA \
install-dist_htmlDATA install-dist_iconDATA install-infDATA \
- install-initSCRIPTS install-ldifDATA \
+ install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \
install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
install-nodist_propertyDATA install-perlSCRIPTS \
install-propertyDATA
@@ -2725,10 +2749,10 @@
uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
- uninstall-ldifDATA uninstall-libLTLIBRARIES \
- uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
- uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
- uninstall-propertyDATA
+ uninstall-initconfigSCRIPTS uninstall-ldifDATA \
+ uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
+ uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
+ uninstall-perlSCRIPTS uninstall-propertyDATA
uninstall-info: uninstall-info-recursive
@@ -2745,23 +2769,24 @@
install-data-am install-data-hook install-dist_helpDATA \
install-dist_htmlDATA install-dist_iconDATA install-exec \
install-exec-am install-infDATA install-info install-info-am \
- install-initSCRIPTS install-ldifDATA install-libLTLIBRARIES \
- install-man install-nodist_cmdbinSCRIPTS \
- install-nodist_configDATA install-nodist_propertyDATA \
- install-perlSCRIPTS install-propertyDATA install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \
+ install-libLTLIBRARIES install-man \
+ install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
+ install-nodist_propertyDATA install-perlSCRIPTS \
+ install-propertyDATA install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
- uninstall-ldifDATA uninstall-libLTLIBRARIES \
- uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
- uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
- uninstall-propertyDATA
+ uninstall-initconfigSCRIPTS uninstall-ldifDATA \
+ uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
+ uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
+ uninstall-perlSCRIPTS uninstall-propertyDATA
define NL
\\n
@@ -2806,6 +2831,10 @@
%/$(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.
.NOEXPORT:
16 years, 6 months
[Fedora-directory-commits] ldapserver/wrappers initscript.in, 1.6, 1.7
by 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
16 years, 6 months