[Fedora-directory-commits] ldapserver Makefile.am, 1.48, 1.49 configure.ac, 1.33, 1.34 aclocal.m4, 1.40, 1.41 configure, 1.51, 1.52 missing, 1.30, 1.31 install-sh, 1.30, 1.31 depcomp, 1.30, 1.31 compile, 1.30, 1.31 config.sub, 1.29, 1.30 config.guess, 1.29, 1.30 Makefile.in, 1.57, 1.58

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Fri Jul 13 18:35:34 UTC 2007 

Author: rmeggins

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

Modified Files:
	Makefile.am configure.ac aclocal.m4 configure missing 
	install-sh depcomp compile config.sub config.guess Makefile.in 
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: The time has come.  We can finally get rid of the instance creation C code
once and for all.  I've created a DSCreate module that has all of the functionality of the old
create_instance.c code, along with a few items from ldap/admin/lib.  The way it works is
this: it first creates the dse.ldif file using template-dse.ldif and the suffix-db template to
create the initial db and suffix.  It then adds additional optional configuration depending
on what optional features have been enabled.  It creates other config files and copies in
the schema.  It then initializes the database.  It uses a template file based on the type of
entry implied by the suffix, then adds the default ACIs.  If the user chose to do so, it
will also create the ou=people, ou=groups, etc. entries.  The user can also supply an LDIF
file which will be used to populate the initial database, in which case none of the default
entries or ACIs will be used.  It then starts the server (if desired).
I had to create a function makePaths that works like mkdir -p except that it will chown,
chgrp, and chmod all paths created.
I had to change the other places where instance creation was called to use the new
calling semantics.  ds_create changed quite a bit, since it can just use an Inf to pass in the
information instead of calling ds_newinst as a CGI program.
I had to change FileConn to add support for namingContexts (i.e. entries with no parent),
and to have it write each change each time, and to return copies of entries when searching,
to avoid modifying the tree in place.  This makes it act much more like LDAP.
I found and fixed a few bugs in Migration along the way that were revealed while integrating
the new DSCreate code.
Platforms tested: RHEL4, FC6
Flag Day: Yes.  New instance creation code and autotool changes.
Doc impact: no



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile.am	4 Jul 2007 01:28:17 -0000	1.48
+++ Makefile.am	13 Jul 2007 18:35:32 -0000	1.49
@@ -98,13 +98,16 @@
 # this is how to add optional plugins
 if enable_pam_passthru
 LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
+enable_pam_passthru = 1
 endif
 if enable_dna
 LIBDNA_PLUGIN = libdna-plugin.la
+enable_dna = 1
 endif
 
 if enable_bitwise
 LIBBITWISE_PLUGIN = libbitwise-plugin.la
+enable_bitwise = 1
 endif
 
 serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \
@@ -145,6 +148,14 @@
 	ldap/ldif/template-pampta.ldif \
 	ldap/ldif/template-dnaplugin.ldif \
 	ldap/ldif/template-bitwise.ldif \
+	ldap/ldif/template-dse.ldif \
+	ldap/ldif/template-org.ldif \
+	ldap/ldif/template-domain.ldif \
+	ldap/ldif/template-state.ldif \
+	ldap/ldif/template-locality.ldif \
+	ldap/ldif/template-country.ldif \
+	ldap/ldif/template-orgunit.ldif \
+	ldap/ldif/template-baseacis.ldif \
 	$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
 	$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
 	$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits
@@ -201,7 +212,8 @@
 	ldap/admin/src/scripts/Setup.pm \
 	ldap/admin/src/scripts/Migration.pm \
 	ldap/admin/src/scripts/DSMigration.pm \
-	ldap/admin/src/scripts/FileConn.pm
+	ldap/admin/src/scripts/FileConn.pm \
+	ldap/admin/src/scripts/DSCreate.pm
 
 property_DATA = ldap/admin/src/scripts/setup-ds.res \
 	ldap/admin/src/scripts/migrate-ds.res
@@ -217,6 +229,7 @@
 	ldap/admin/src/scripts/template-saveconfig \
 	ldap/admin/src/scripts/template-start-slapd \
 	ldap/admin/src/scripts/template-stop-slapd \
+	ldap/admin/src/scripts/template-restart-slapd \
 	ldap/admin/src/scripts/template-suffix2instance \
 	ldap/admin/src/scripts/template-vlvindex \
 	ldap/admin/src/scripts/template-bak2db.pl \
@@ -236,7 +249,9 @@
 
 init_SCRIPTS = wrappers/$(PACKAGE_NAME)
 
-inf_DATA = ldap/admin/src/slapd.inf
+inf_DATA = ldap/admin/src/slapd.inf \
+	ldap/admin/src/scripts/dscreate.map \
+	ldap/admin/src/scripts/dsorgentries.map
 
 #////////////////////////////////////////////////////////////////
 #
@@ -938,6 +953,7 @@
 #------------------------
 if enable_ldapi
         GETSOCKETPEER=ldap/servers/slapd/getsocketpeer.c
+        enable_ldapi = 1
 endif
 
 ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
@@ -1034,20 +1050,29 @@
 	-e 's, at configdir\@,$(configdir),g' \
 	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 	-e 's, at localstatedir\@,$(localstatedir),g' \
+	-e 's, at infdir\@,$(infdir),g' \
+	-e 's, at templatedir\@,$(sampledatadir),g' \
 	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
 	-e 's, at instconfigdir\@,$(instconfigdir),g' \
+	-e 's, at enable_ldapi\@,$(enable_ldapi),g' \
+	-e 's, at enable_pam_passthru\@,$(enable_pam_passthru),g' \
+	-e 's, at enable_bitwise\@,$(enable_bitwise),g' \
+	-e 's, at enable_dna\@,$(enable_dna),g' \
+	-e 's, at enable_autobind\@,$(enable_autobind),g' \
 	-e 's, at ECHO_N\@,$(ECHO_N),g' \
 	-e 's, at ECHO_C\@,$(ECHO_C),g' \
 	-e 's, at brand\@,$(brand),g' \
 	-e 's, at capbrand\@,$(capbrand),g' \
 	-e 's, at vendor\@,$(vendor),g' \
+	-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 	-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 	-e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
 	-e 's, at BUILDNUM\@,$(BUILDNUM),g' \
 	-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
 	-e 's, at perldir\@,$(perldir),g' \
 	-e 's, at defaultuser\@,$(defaultuser),g' \
-	-e 's, at defaultgroup\@,$(defaultgroup),g'
+	-e 's, at defaultgroup\@,$(defaultgroup),g' \
+	-e 's, at with_fhs_opt\@, at with_fhs_opt@,g'
 else
 fixupcmd = sed \
 	-e 's, at bindir\@,$(bindir),g' \
@@ -1070,20 +1095,29 @@
 	-e 's, at configdir\@,$(configdir),g' \
 	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 	-e 's, at localstatedir\@,$(localstatedir),g' \
+	-e 's, at infdir\@,$(infdir),g' \
+	-e 's, at templatedir\@,$(sampledatadir),g' \
 	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
 	-e 's, at instconfigdir\@,$(instconfigdir),g' \
+	-e 's, at enable_ldapi\@,$(enable_ldapi),g' \
+	-e 's, at enable_pam_passthru\@,$(enable_pam_passthru),g' \
+	-e 's, at enable_bitwise\@,$(enable_bitwise),g' \
+	-e 's, at enable_dna\@,$(enable_dna),g' \
+	-e 's, at enable_autobind\@,$(enable_autobind),g' \
 	-e 's, at ECHO_N\@,$(ECHO_N),g' \
 	-e 's, at ECHO_C\@,$(ECHO_C),g' \
 	-e 's, at brand\@,$(brand),g' \
 	-e 's, at capbrand\@,$(capbrand),g' \
 	-e 's, at vendor\@,$(vendor),g' \
+	-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 	-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 	-e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
 	-e 's, at BUILDNUM\@,$(BUILDNUM),g' \
 	-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
 	-e 's, at perldir\@,$(perldir),g' \
 	-e 's, at defaultuser\@,$(defaultuser),g' \
-	-e 's, at defaultgroup\@,$(defaultgroup),g'
+	-e 's, at defaultgroup\@,$(defaultgroup),g' \
+	-e 's, at with_fhs_opt\@, at with_fhs_opt@,g'
 endif
 
 %: %.in


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure.ac	21 Jun 2007 21:57:22 -0000	1.33
+++ configure.ac	13 Jul 2007 18:35:32 -0000	1.34
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
 # This version is the version returned by ns-slapd -v
-AC_INIT([fedora-ds], [1.1.0a3], [http://bugzilla.redhat.com/])
+AC_INIT([fedora-ds], [1.1.0a4], [http://bugzilla.redhat.com/])
 # AC_CONFIG_HEADER must be called right after AC_INIT.
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])




Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- configure	4 Jul 2007 01:28:17 -0000	1.51
+++ configure	13 Jul 2007 18:35:32 -0000	1.52
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a3.
+# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a4.
 #
 # Report bugs to <http://bugzilla.redhat.com/>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='fedora-ds'
 PACKAGE_TARNAME='fedora-ds'
-PACKAGE_VERSION='1.1.0a3'
-PACKAGE_STRING='fedora-ds 1.1.0a3'
+PACKAGE_VERSION='1.1.0a4'
+PACKAGE_STRING='fedora-ds 1.1.0a4'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
 
 # Factoring default headers for most tests.
@@ -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 configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir 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 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 defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir 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 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.
@@ -954,7 +954,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures fedora-ds 1.1.0a3 to adapt to many kinds of systems.
+\`configure' configures fedora-ds 1.1.0a4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fedora-ds 1.1.0a3:";;
+     short | recursive ) echo "Configuration of fedora-ds 1.1.0a4:";;
    esac
   cat <<\_ACEOF
 
@@ -1201,7 +1201,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-fedora-ds configure 1.1.0a3
+fedora-ds configure 1.1.0a4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1215,7 +1215,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fedora-ds $as_me 1.1.0a3, which was
+It was created by fedora-ds $as_me 1.1.0a4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1861,7 +1861,7 @@
 
 # Define the identity of the package.
  PACKAGE='fedora-ds'
- VERSION='1.1.0a3'
+ VERSION='1.1.0a4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23119,6 +23119,7 @@
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
+
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
@@ -25680,7 +25681,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by fedora-ds $as_me 1.1.0a3, which was
+This file was extended by fedora-ds $as_me 1.1.0a4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25743,7 +25744,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-fedora-ds config.status 1.1.0a3
+fedora-ds config.status 1.1.0a4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -26022,6 +26023,7 @@
 s, at enable_ldapi_FALSE@,$enable_ldapi_FALSE,;t t
 s, at enable_bitwise_TRUE@,$enable_bitwise_TRUE,;t t
 s, at enable_bitwise_FALSE@,$enable_bitwise_FALSE,;t t
+s, at with_fhs_opt@,$with_fhs_opt,;t t
 s, at configdir@,$configdir,;t t
 s, at sampledatadir@,$sampledatadir,;t t
 s, at propertydir@,$propertydir,;t t














Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Makefile.in	4 Jul 2007 01:28:17 -0000	1.57
+++ Makefile.in	13 Jul 2007 18:35:32 -0000	1.58
@@ -986,6 +986,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 vendor = @vendor@
+with_fhs_opt = @with_fhs_opt@
 
 # look for included m4 files in the ./m4/ directory
 ACLOCAL_AMFLAGS = -I m4
@@ -1045,8 +1046,11 @@
 
 # this is how to add optional plugins
 @enable_pam_passthru_TRUE at LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
+ at enable_pam_passthru_TRUE@enable_pam_passthru = 1
 @enable_dna_TRUE at LIBDNA_PLUGIN = libdna-plugin.la
+ at enable_dna_TRUE@enable_dna = 1
 @enable_bitwise_TRUE at LIBBITWISE_PLUGIN = libbitwise-plugin.la
+ at enable_bitwise_TRUE@enable_bitwise = 1
 serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \
 	libback-ldbm.la libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la \
 	libdistrib-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
@@ -1082,6 +1086,14 @@
 	ldap/ldif/template-pampta.ldif \
 	ldap/ldif/template-dnaplugin.ldif \
 	ldap/ldif/template-bitwise.ldif \
+	ldap/ldif/template-dse.ldif \
+	ldap/ldif/template-org.ldif \
+	ldap/ldif/template-domain.ldif \
+	ldap/ldif/template-state.ldif \
+	ldap/ldif/template-locality.ldif \
+	ldap/ldif/template-country.ldif \
+	ldap/ldif/template-orgunit.ldif \
+	ldap/ldif/template-baseacis.ldif \
 	$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
 	$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
 	$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits
@@ -1138,7 +1150,8 @@
 	ldap/admin/src/scripts/Setup.pm \
 	ldap/admin/src/scripts/Migration.pm \
 	ldap/admin/src/scripts/DSMigration.pm \
-	ldap/admin/src/scripts/FileConn.pm
+	ldap/admin/src/scripts/FileConn.pm \
+	ldap/admin/src/scripts/DSCreate.pm
 
 property_DATA = ldap/admin/src/scripts/setup-ds.res \
 	ldap/admin/src/scripts/migrate-ds.res
@@ -1154,6 +1167,7 @@
 	ldap/admin/src/scripts/template-saveconfig \
 	ldap/admin/src/scripts/template-start-slapd \
 	ldap/admin/src/scripts/template-stop-slapd \
+	ldap/admin/src/scripts/template-restart-slapd \
 	ldap/admin/src/scripts/template-suffix2instance \
 	ldap/admin/src/scripts/template-vlvindex \
 	ldap/admin/src/scripts/template-bak2db.pl \
@@ -1172,7 +1186,10 @@
 	$(srcdir)/ldap/admin/src/scripts/template-migrateTo7
 
 init_SCRIPTS = wrappers/$(PACKAGE_NAME)
-inf_DATA = ldap/admin/src/slapd.inf
+inf_DATA = ldap/admin/src/slapd.inf \
+	ldap/admin/src/scripts/dscreate.map \
+	ldap/admin/src/scripts/dsorgentries.map
+
 
 #////////////////////////////////////////////////////////////////
 #
@@ -1847,6 +1864,7 @@
 # ns-slapd
 #------------------------
 @enable_ldapi_TRUE at GETSOCKETPEER = ldap/servers/slapd/getsocketpeer.c
+ at enable_ldapi_TRUE@enable_ldapi = 1
 ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
 	ldap/servers/slapd/auth.c \
 	ldap/servers/slapd/bind.c  \
@@ -1931,20 +1949,29 @@
 @BUNDLE_FALSE@	-e 's, at configdir\@,$(configdir),g' \
 @BUNDLE_FALSE@	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 @BUNDLE_FALSE@	-e 's, at localstatedir\@,$(localstatedir),g' \
+ at BUNDLE_FALSE@	-e 's, at infdir\@,$(infdir),g' \
+ at BUNDLE_FALSE@	-e 's, at templatedir\@,$(sampledatadir),g' \
 @BUNDLE_FALSE@	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
 @BUNDLE_FALSE@	-e 's, at instconfigdir\@,$(instconfigdir),g' \
+ at BUNDLE_FALSE@	-e 's, at enable_ldapi\@,$(enable_ldapi),g' \
+ at BUNDLE_FALSE@	-e 's, at enable_pam_passthru\@,$(enable_pam_passthru),g' \
+ at BUNDLE_FALSE@	-e 's, at enable_bitwise\@,$(enable_bitwise),g' \
+ at BUNDLE_FALSE@	-e 's, at enable_dna\@,$(enable_dna),g' \
+ at BUNDLE_FALSE@	-e 's, at enable_autobind\@,$(enable_autobind),g' \
 @BUNDLE_FALSE@	-e 's, at ECHO_N\@,$(ECHO_N),g' \
 @BUNDLE_FALSE@	-e 's, at ECHO_C\@,$(ECHO_C),g' \
 @BUNDLE_FALSE@	-e 's, at brand\@,$(brand),g' \
 @BUNDLE_FALSE@	-e 's, at capbrand\@,$(capbrand),g' \
 @BUNDLE_FALSE@	-e 's, at vendor\@,$(vendor),g' \
+ at BUNDLE_FALSE@	-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 @BUNDLE_FALSE@	-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 @BUNDLE_FALSE@	-e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
 @BUNDLE_FALSE@	-e 's, at BUILDNUM\@,$(BUILDNUM),g' \
 @BUNDLE_FALSE@	-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
 @BUNDLE_FALSE@	-e 's, at perldir\@,$(perldir),g' \
 @BUNDLE_FALSE@	-e 's, at defaultuser\@,$(defaultuser),g' \
- at BUNDLE_FALSE@	-e 's, at defaultgroup\@,$(defaultgroup),g'
+ at BUNDLE_FALSE@	-e 's, at defaultgroup\@,$(defaultgroup),g' \
+ at BUNDLE_FALSE@	-e 's, at with_fhs_opt\@, at with_fhs_opt@,g'
 
 
 # these are for the config files and scripts that we need to generate and replace
@@ -1974,20 +2001,29 @@
 @BUNDLE_TRUE@	-e 's, at configdir\@,$(configdir),g' \
 @BUNDLE_TRUE@	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 @BUNDLE_TRUE@	-e 's, at localstatedir\@,$(localstatedir),g' \
+ at BUNDLE_TRUE@	-e 's, at infdir\@,$(infdir),g' \
+ at BUNDLE_TRUE@	-e 's, at templatedir\@,$(sampledatadir),g' \
 @BUNDLE_TRUE@	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
 @BUNDLE_TRUE@	-e 's, at instconfigdir\@,$(instconfigdir),g' \
+ at BUNDLE_TRUE@	-e 's, at enable_ldapi\@,$(enable_ldapi),g' \
+ at BUNDLE_TRUE@	-e 's, at enable_pam_passthru\@,$(enable_pam_passthru),g' \
+ at BUNDLE_TRUE@	-e 's, at enable_bitwise\@,$(enable_bitwise),g' \
+ at BUNDLE_TRUE@	-e 's, at enable_dna\@,$(enable_dna),g' \
+ at BUNDLE_TRUE@	-e 's, at enable_autobind\@,$(enable_autobind),g' \
 @BUNDLE_TRUE@	-e 's, at ECHO_N\@,$(ECHO_N),g' \
 @BUNDLE_TRUE@	-e 's, at ECHO_C\@,$(ECHO_C),g' \
 @BUNDLE_TRUE@	-e 's, at brand\@,$(brand),g' \
 @BUNDLE_TRUE@	-e 's, at capbrand\@,$(capbrand),g' \
 @BUNDLE_TRUE@	-e 's, at vendor\@,$(vendor),g' \
+ at BUNDLE_TRUE@	-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 @BUNDLE_TRUE@	-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 @BUNDLE_TRUE@	-e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
 @BUNDLE_TRUE@	-e 's, at BUILDNUM\@,$(BUILDNUM),g' \
 @BUNDLE_TRUE@	-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
 @BUNDLE_TRUE@	-e 's, at perldir\@,$(perldir),g' \
 @BUNDLE_TRUE@	-e 's, at defaultuser\@,$(defaultuser),g' \
- at BUNDLE_TRUE@	-e 's, at defaultgroup\@,$(defaultgroup),g'
+ at BUNDLE_TRUE@	-e 's, at defaultgroup\@,$(defaultgroup),g' \
+ at BUNDLE_TRUE@	-e 's, at with_fhs_opt\@, at with_fhs_opt@,g'
 
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am

More information about the Fedora-directory-commits mailing list