[Fedora-directory-commits] ldapserver/l10n/dirserv/es ns-slapd.txt, 1.4, NONE ns-slapd.txt.iso8859, 1.4, NONE
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/l10n/dirserv/es
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/es
Removed Files:
ns-slapd.txt ns-slapd.txt.iso8859
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- ns-slapd.txt DELETED ---
--- ns-slapd.txt.iso8859 DELETED ---
16 years, 9 months
[Fedora-directory-commits] ldapserver/l10n/dirserv/en ns-slapd.txt, 1.4, NONE
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/l10n/dirserv/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/en
Removed Files:
ns-slapd.txt
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- ns-slapd.txt DELETED ---
16 years, 9 months
[Fedora-directory-commits] ldapserver/l10n/dirserv/de ns-slapd.txt, 1.4, NONE ns-slapd.txt.iso8859, 1.4, NONE
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/l10n/dirserv/de
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver/l10n/dirserv/de
Removed Files:
ns-slapd.txt ns-slapd.txt.iso8859
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
--- ns-slapd.txt DELETED ---
--- ns-slapd.txt.iso8859 DELETED ---
16 years, 9 months
[Fedora-directory-commits] ldapserver Makefile.am, 1.49, 1.50 aclocal.m4, 1.41, 1.42 configure, 1.52, 1.53 missing, 1.31, 1.32 install-sh, 1.31, 1.32 depcomp, 1.31, 1.32 compile, 1.31, 1.32 Makefile.in, 1.58, 1.59 config.sub, 1.30, 1.31 config.guess, 1.30, 1.31 bchecker.ini, 1.1.1.1, NONE nsarch, 1.7, NONE nsarch.bat, 1.4, NONE ntversion.pl, 1.5, NONE pumpkin.pl, 1.5, NONE
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444/ldapserver
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh depcomp
compile Makefile.in config.sub config.guess
Removed Files:
bchecker.ini nsarch nsarch.bat ntversion.pl pumpkin.pl
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code. I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile.am 13 Jul 2007 18:35:32 -0000 1.49
+++ Makefile.am 18 Jul 2007 20:37:07 -0000 1.50
@@ -90,10 +90,10 @@
#------------------------
sbin_PROGRAMS = ns-slapd
-bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \
+bin_PROGRAMS = dbscan-bin dsktune-bin infadd-bin ldap-agent-bin \
ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin
-server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
+server_LTLIBRARIES = libslapd.la libns-dshttpd.la
# this is how to add optional plugins
if enable_pam_passthru
@@ -178,17 +178,14 @@
$(srcdir)/ldap/schema/60pam-plugin.ldif \
$(srcdir)/ldap/schema/99user.ldif
-bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
+bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
wrappers/dbscan \
- wrappers/ds_newinst \
- ldap/admin/src/ds_newinst.pl \
wrappers/dsktune \
wrappers/infadd \
wrappers/ldap-agent \
wrappers/ldclt \
wrappers/ldif \
$(srcdir)/ldap/admin/src/logconv.pl \
- ldap/admin/src/migrateTo11 \
wrappers/migratecred \
wrappers/mmldif \
wrappers/pwdhash \
@@ -241,11 +238,7 @@
ldap/admin/src/scripts/template-ns-activate.pl \
ldap/admin/src/scripts/template-ns-inactivate.pl \
ldap/admin/src/scripts/template-ns-newpwpolicy.pl \
- ldap/admin/src/scripts/template-verify-db.pl \
- $(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrate6to7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrateTo7
+ ldap/admin/src/scripts/template-verify-db.pl
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
@@ -305,26 +298,6 @@
#////////////////////////////////////////////////////////////////
#------------------------
-# libds_admin
-#------------------------
-libds_admin_la_SOURCES = ldap/admin/lib/dsalib_conf.c \
- ldap/admin/lib/dsalib_confs.c \
- ldap/admin/lib/dsalib_db.c \
- ldap/admin/lib/dsalib_debug.c \
- ldap/admin/lib/dsalib_dn.c \
- ldap/admin/lib/dsalib_filename.c \
- ldap/admin/lib/dsalib_html.c \
- ldap/admin/lib/dsalib_ldif.c \
- ldap/admin/lib/dsalib_location.c \
- ldap/admin/lib/dsalib_pw.c \
- ldap/admin/lib/dsalib_tailf.c \
- ldap/admin/lib/dsalib_updown.c \
- ldap/admin/lib/dsalib_util.c
-
-libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
-
-#------------------------
# libns-dshttpd
#------------------------
libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \
@@ -865,17 +838,6 @@
dbscan_bin_LDADD = $(NSPR_LINK) $(DB_LINK)
#------------------------
-# ds_newinst
-#------------------------
-ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \
- ldap/admin/src/create_instance.c \
- ldap/admin/src/ds_newinst.c \
- ldap/admin/src/script-gen.c
-
-ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
-
-#------------------------
# dsktune
#------------------------
dsktune_bin_SOURCES = ldap/systools/idsktune.c \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Makefile.in 13 Jul 2007 18:35:32 -0000 1.58
+++ Makefile.in 18 Jul 2007 20:37:08 -0000 1.59
@@ -41,10 +41,9 @@
build_triplet = @build@
host_triplet = @host@
sbin_PROGRAMS = ns-slapd$(EXEEXT)
-bin_PROGRAMS = dbscan-bin$(EXEEXT) ds_newinst-bin$(EXEEXT) \
- dsktune-bin$(EXEEXT) infadd-bin$(EXEEXT) \
- ldap-agent-bin$(EXEEXT) ldclt-bin$(EXEEXT) ldif-bin$(EXEEXT) \
- migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) \
+bin_PROGRAMS = dbscan-bin$(EXEEXT) dsktune-bin$(EXEEXT) \
+ infadd-bin$(EXEEXT) ldap-agent-bin$(EXEEXT) ldclt-bin$(EXEEXT) \
+ ldif-bin$(EXEEXT) migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) \
pwdhash-bin$(EXEEXT) rsearch-bin$(EXEEXT)
noinst_PROGRAMS = makstrdb$(EXEEXT)
@SOLARIS_TRUE@am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c
@@ -246,24 +245,6 @@
ldap/servers/plugins/dna/libdna_plugin_la-dna.lo
libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS)
@enable_dna_TRUE@am_libdna_plugin_la_rpath = -rpath $(serverplugindir)
-libds_admin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
-am_libds_admin_la_OBJECTS = \
- ldap/admin/lib/libds_admin_la-dsalib_conf.lo \
- ldap/admin/lib/libds_admin_la-dsalib_confs.lo \
- ldap/admin/lib/libds_admin_la-dsalib_db.lo \
- ldap/admin/lib/libds_admin_la-dsalib_debug.lo \
- ldap/admin/lib/libds_admin_la-dsalib_dn.lo \
- ldap/admin/lib/libds_admin_la-dsalib_filename.lo \
- ldap/admin/lib/libds_admin_la-dsalib_html.lo \
- ldap/admin/lib/libds_admin_la-dsalib_ldif.lo \
- ldap/admin/lib/libds_admin_la-dsalib_location.lo \
- ldap/admin/lib/libds_admin_la-dsalib_pw.lo \
- ldap/admin/lib/libds_admin_la-dsalib_tailf.lo \
- ldap/admin/lib/libds_admin_la-dsalib_updown.lo \
- ldap/admin/lib/libds_admin_la-dsalib_util.lo
-libds_admin_la_OBJECTS = $(am_libds_admin_la_OBJECTS)
libhttp_client_plugin_la_LIBADD =
am_libhttp_client_plugin_la_OBJECTS = ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo \
ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo
@@ -562,16 +543,6 @@
ldap/servers/slapd/tools/dbscan_bin-dbscan.$(OBJEXT)
dbscan_bin_OBJECTS = $(am_dbscan_bin_OBJECTS)
dbscan_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_ds_newinst_bin_OBJECTS = \
- ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT) \
- ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT) \
- ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT) \
- ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT)
-ds_newinst_bin_OBJECTS = $(am_ds_newinst_bin_OBJECTS)
-ds_newinst_bin_DEPENDENCIES = libds_admin.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
am_dsktune_bin_OBJECTS = ldap/systools/idsktune.$(OBJEXT) \
ldap/systools/pio.$(OBJEXT)
dsktune_bin_OBJECTS = $(am_dsktune_bin_OBJECTS)
@@ -746,7 +717,7 @@
$(libchainingdb_plugin_la_SOURCES) \
$(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \
$(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \
- $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) \
+ $(libdna_plugin_la_SOURCES) \
$(libhttp_client_plugin_la_SOURCES) \
$(libns_dshttpd_la_SOURCES) \
$(libpam_passthru_plugin_la_SOURCES) \
@@ -758,10 +729,9 @@
$(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) \
$(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) \
$(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) \
- $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) \
- $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) \
- $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) \
- $(ldif_bin_SOURCES) $(makstrdb_SOURCES) \
+ $(dbscan_bin_SOURCES) $(dsktune_bin_SOURCES) \
+ $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) \
+ $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) \
$(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) \
$(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) \
$(rsearch_bin_SOURCES)
@@ -772,7 +742,7 @@
$(libchainingdb_plugin_la_SOURCES) \
$(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \
$(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \
- $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) \
+ $(libdna_plugin_la_SOURCES) \
$(libhttp_client_plugin_la_SOURCES) \
$(libns_dshttpd_la_SOURCES) \
$(libpam_passthru_plugin_la_SOURCES) \
@@ -784,13 +754,12 @@
$(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) \
$(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) \
$(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) \
- $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) \
- $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) \
- $(ldap_agent_bin_SOURCES) $(am__ldclt_bin_SOURCES_DIST) \
- $(ldif_bin_SOURCES) $(makstrdb_SOURCES) \
- $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) \
- $(am__ns_slapd_SOURCES_DIST) $(pwdhash_bin_SOURCES) \
- $(rsearch_bin_SOURCES)
+ $(dbscan_bin_SOURCES) $(dsktune_bin_SOURCES) \
+ $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) \
+ $(am__ldclt_bin_SOURCES_DIST) $(ldif_bin_SOURCES) \
+ $(makstrdb_SOURCES) $(migratecred_bin_SOURCES) \
+ $(mmldif_bin_SOURCES) $(am__ns_slapd_SOURCES_DIST) \
+ $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
configDATA_INSTALL = $(INSTALL_DATA)
infDATA_INSTALL = $(INSTALL_DATA)
nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
@@ -1042,7 +1011,7 @@
BUILT_SOURCES = dirver.h dberrstrs.h
CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties
taskdir = $(datadir)@scripttemplatedir@
-server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
+server_LTLIBRARIES = libslapd.la libns-dshttpd.la
# this is how to add optional plugins
@enable_pam_passthru_TRUE@LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
@@ -1116,17 +1085,14 @@
$(srcdir)/ldap/schema/60pam-plugin.ldif \
$(srcdir)/ldap/schema/99user.ldif
-bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
+bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
wrappers/dbscan \
- wrappers/ds_newinst \
- ldap/admin/src/ds_newinst.pl \
wrappers/dsktune \
wrappers/infadd \
wrappers/ldap-agent \
wrappers/ldclt \
wrappers/ldif \
$(srcdir)/ldap/admin/src/logconv.pl \
- ldap/admin/src/migrateTo11 \
wrappers/migratecred \
wrappers/mmldif \
wrappers/pwdhash \
@@ -1179,11 +1145,7 @@
ldap/admin/src/scripts/template-ns-activate.pl \
ldap/admin/src/scripts/template-ns-inactivate.pl \
ldap/admin/src/scripts/template-ns-newpwpolicy.pl \
- ldap/admin/src/scripts/template-verify-db.pl \
- $(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrate6to7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
- $(srcdir)/ldap/admin/src/scripts/template-migrateTo7
+ ldap/admin/src/scripts/template-verify-db.pl
init_SCRIPTS = wrappers/$(PACKAGE_NAME)
inf_DATA = ldap/admin/src/slapd.inf \
@@ -1234,26 +1196,6 @@
#////////////////////////////////////////////////////////////////
#------------------------
-# libds_admin
-#------------------------
-libds_admin_la_SOURCES = ldap/admin/lib/dsalib_conf.c \
- ldap/admin/lib/dsalib_confs.c \
- ldap/admin/lib/dsalib_db.c \
- ldap/admin/lib/dsalib_debug.c \
- ldap/admin/lib/dsalib_dn.c \
- ldap/admin/lib/dsalib_filename.c \
- ldap/admin/lib/dsalib_html.c \
- ldap/admin/lib/dsalib_ldif.c \
- ldap/admin/lib/dsalib_location.c \
- ldap/admin/lib/dsalib_pw.c \
- ldap/admin/lib/dsalib_tailf.c \
- ldap/admin/lib/dsalib_updown.c \
- ldap/admin/lib/dsalib_util.c
-
-libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
-
-#------------------------
# libns-dshttpd
#------------------------
libns_dshttpd_la_SOURCES = lib/libaccess/access_plhash.cpp \
@@ -1784,17 +1726,6 @@
dbscan_bin_LDADD = $(NSPR_LINK) $(DB_LINK)
#------------------------
-# ds_newinst
-#------------------------
-ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \
- ldap/admin/src/create_instance.c \
- ldap/admin/src/ds_newinst.c \
- ldap/admin/src/script-gen.c
-
-ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
-
-#------------------------
# dsktune
#------------------------
dsktune_bin_SOURCES = ldap/systools/idsktune.c \
@@ -2597,53 +2528,6 @@
ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp)
libdna-plugin.la: $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_DEPENDENCIES)
$(LINK) $(am_libdna_plugin_la_rpath) $(libdna_plugin_la_LDFLAGS) $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_LIBADD) $(LIBS)
-ldap/admin/lib/$(am__dirstamp):
- @$(mkdir_p) ldap/admin/lib
- @: > ldap/admin/lib/$(am__dirstamp)
-ldap/admin/lib/$(DEPDIR)/$(am__dirstamp):
- @$(mkdir_p) ldap/admin/lib/$(DEPDIR)
- @: > ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_conf.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_confs.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_db.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_debug.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_dn.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_filename.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_html.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_ldif.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_location.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_pw.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_tailf.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_updown.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/lib/libds_admin_la-dsalib_util.lo: \
- ldap/admin/lib/$(am__dirstamp) \
- ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
-libds_admin.la: $(libds_admin_la_OBJECTS) $(libds_admin_la_DEPENDENCIES)
- $(LINK) -rpath $(serverdir) $(libds_admin_la_LDFLAGS) $(libds_admin_la_OBJECTS) $(libds_admin_la_LIBADD) $(LIBS)
ldap/servers/plugins/http/$(am__dirstamp):
@$(mkdir_p) ldap/servers/plugins/http
@: > ldap/servers/plugins/http/$(am__dirstamp)
@@ -3557,27 +3441,6 @@
dbscan-bin$(EXEEXT): $(dbscan_bin_OBJECTS) $(dbscan_bin_DEPENDENCIES)
@rm -f dbscan-bin$(EXEEXT)
$(LINK) $(dbscan_bin_LDFLAGS) $(dbscan_bin_OBJECTS) $(dbscan_bin_LDADD) $(LIBS)
-ldap/admin/src/$(am__dirstamp):
- @$(mkdir_p) ldap/admin/src
- @: > ldap/admin/src/$(am__dirstamp)
-ldap/admin/src/$(DEPDIR)/$(am__dirstamp):
- @$(mkdir_p) ldap/admin/src/$(DEPDIR)
- @: > ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT): \
- ldap/admin/src/$(am__dirstamp) \
- ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT): \
- ldap/admin/src/$(am__dirstamp) \
- ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT): \
- ldap/admin/src/$(am__dirstamp) \
- ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT): \
- ldap/admin/src/$(am__dirstamp) \
- ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
-ds_newinst-bin$(EXEEXT): $(ds_newinst_bin_OBJECTS) $(ds_newinst_bin_DEPENDENCIES)
- @rm -f ds_newinst-bin$(EXEEXT)
- $(LINK) $(ds_newinst_bin_LDFLAGS) $(ds_newinst_bin_OBJECTS) $(ds_newinst_bin_LDADD) $(LIBS)
ldap/systools/$(am__dirstamp):
@$(mkdir_p) ldap/systools
@: > ldap/systools/$(am__dirstamp)
@@ -3904,36 +3767,6 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_conf.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_conf.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_confs.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_confs.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_db.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_db.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_debug.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_debug.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_dn.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_dn.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_filename.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_filename.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_html.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_html.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_ldif.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_ldif.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_location.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_location.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_pw.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_pw.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_tailf.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_tailf.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_updown.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_updown.lo
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_util.$(OBJEXT)
- -rm -f ldap/admin/lib/libds_admin_la-dsalib_util.lo
- -rm -f ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT)
- -rm -f ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT)
- -rm -f ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT)
- -rm -f ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT)
-rm -f ldap/libraries/libavl/avl.$(OBJEXT)
-rm -f ldap/libraries/libavl/libslapd_la-avl.$(OBJEXT)
-rm -f ldap/libraries/libavl/libslapd_la-avl.lo
@@ -4719,23 +4552,6 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libavl/$(DEPDIR)/avl.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libavl/$(DEPDIR)/libslapd_la-avl.Plo(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo(a)am__quote@
@@ -6071,97 +5887,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdna_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/dna/libdna_plugin_la-dna.lo `test -f 'ldap/servers/plugins/dna/dna.c' || echo '$(srcdir)/'`ldap/servers/plugins/dna/dna.c
-ldap/admin/lib/libds_admin_la-dsalib_conf.lo: ldap/admin/lib/dsalib_conf.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_conf.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_conf.lo `test -f 'ldap/admin/lib/dsalib_conf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_conf.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_conf.c' object='ldap/admin/lib/libds_admin_la-dsalib_conf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_conf.lo `test -f 'ldap/admin/lib/dsalib_conf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_conf.c
-
-ldap/admin/lib/libds_admin_la-dsalib_confs.lo: ldap/admin/lib/dsalib_confs.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_confs.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_confs.lo `test -f 'ldap/admin/lib/dsalib_confs.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_confs.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_confs.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_confs.c' object='ldap/admin/lib/libds_admin_la-dsalib_confs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_confs.lo `test -f 'ldap/admin/lib/dsalib_confs.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_confs.c
-
-ldap/admin/lib/libds_admin_la-dsalib_db.lo: ldap/admin/lib/dsalib_db.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_db.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_db.lo `test -f 'ldap/admin/lib/dsalib_db.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_db.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_db.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_db.c' object='ldap/admin/lib/libds_admin_la-dsalib_db.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_db.lo `test -f 'ldap/admin/lib/dsalib_db.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_db.c
-
-ldap/admin/lib/libds_admin_la-dsalib_debug.lo: ldap/admin/lib/dsalib_debug.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_debug.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_debug.lo `test -f 'ldap/admin/lib/dsalib_debug.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_debug.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_debug.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_debug.c' object='ldap/admin/lib/libds_admin_la-dsalib_debug.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_debug.lo `test -f 'ldap/admin/lib/dsalib_debug.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_debug.c
-
-ldap/admin/lib/libds_admin_la-dsalib_dn.lo: ldap/admin/lib/dsalib_dn.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_dn.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_dn.lo `test -f 'ldap/admin/lib/dsalib_dn.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_dn.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_dn.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_dn.c' object='ldap/admin/lib/libds_admin_la-dsalib_dn.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_dn.lo `test -f 'ldap/admin/lib/dsalib_dn.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_dn.c
-
-ldap/admin/lib/libds_admin_la-dsalib_filename.lo: ldap/admin/lib/dsalib_filename.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_filename.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_filename.lo `test -f 'ldap/admin/lib/dsalib_filename.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_filename.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_filename.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_filename.c' object='ldap/admin/lib/libds_admin_la-dsalib_filename.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_filename.lo `test -f 'ldap/admin/lib/dsalib_filename.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_filename.c
-
-ldap/admin/lib/libds_admin_la-dsalib_html.lo: ldap/admin/lib/dsalib_html.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_html.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_html.lo `test -f 'ldap/admin/lib/dsalib_html.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_html.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_html.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_html.c' object='ldap/admin/lib/libds_admin_la-dsalib_html.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_html.lo `test -f 'ldap/admin/lib/dsalib_html.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_html.c
-
-ldap/admin/lib/libds_admin_la-dsalib_ldif.lo: ldap/admin/lib/dsalib_ldif.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_ldif.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_ldif.lo `test -f 'ldap/admin/lib/dsalib_ldif.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_ldif.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_ldif.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_ldif.c' object='ldap/admin/lib/libds_admin_la-dsalib_ldif.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_ldif.lo `test -f 'ldap/admin/lib/dsalib_ldif.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_ldif.c
-
-ldap/admin/lib/libds_admin_la-dsalib_location.lo: ldap/admin/lib/dsalib_location.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_location.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_location.lo `test -f 'ldap/admin/lib/dsalib_location.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_location.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_location.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_location.c' object='ldap/admin/lib/libds_admin_la-dsalib_location.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_location.lo `test -f 'ldap/admin/lib/dsalib_location.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_location.c
-
-ldap/admin/lib/libds_admin_la-dsalib_pw.lo: ldap/admin/lib/dsalib_pw.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_pw.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_pw.lo `test -f 'ldap/admin/lib/dsalib_pw.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_pw.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_pw.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_pw.c' object='ldap/admin/lib/libds_admin_la-dsalib_pw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_pw.lo `test -f 'ldap/admin/lib/dsalib_pw.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_pw.c
-
-ldap/admin/lib/libds_admin_la-dsalib_tailf.lo: ldap/admin/lib/dsalib_tailf.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_tailf.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_tailf.lo `test -f 'ldap/admin/lib/dsalib_tailf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_tailf.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_tailf.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_tailf.c' object='ldap/admin/lib/libds_admin_la-dsalib_tailf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_tailf.lo `test -f 'ldap/admin/lib/dsalib_tailf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_tailf.c
-
-ldap/admin/lib/libds_admin_la-dsalib_updown.lo: ldap/admin/lib/dsalib_updown.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_updown.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_updown.lo `test -f 'ldap/admin/lib/dsalib_updown.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_updown.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_updown.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_updown.c' object='ldap/admin/lib/libds_admin_la-dsalib_updown.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_updown.lo `test -f 'ldap/admin/lib/dsalib_updown.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_updown.c
-
-ldap/admin/lib/libds_admin_la-dsalib_util.lo: ldap/admin/lib/dsalib_util.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_util.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_util.lo `test -f 'ldap/admin/lib/dsalib_util.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_util.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_util.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/lib/dsalib_util.c' object='ldap/admin/lib/libds_admin_la-dsalib_util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_util.lo `test -f 'ldap/admin/lib/dsalib_util.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_util.c
-
ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo: ldap/servers/plugins/http/http_client.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhttp_client_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo -MD -MP -MF "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo" -c -o ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo `test -f 'ldap/servers/plugins/http/http_client.c' || echo '$(srcdir)/'`ldap/servers/plugins/http/http_client.c; \
@am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo" "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Plo"; else rm -f "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo"; exit 1; fi
@@ -7611,62 +7336,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dbscan_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/tools/dbscan_bin-dbscan.obj `if test -f 'ldap/servers/slapd/tools/dbscan.c'; then $(CYGPATH_W) 'ldap/servers/slapd/tools/dbscan.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/tools/dbscan.c'; fi`
-ldap/admin/src/ds_newinst_bin-cfg_sspt.o: ldap/admin/src/cfg_sspt.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-cfg_sspt.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.o `test -f 'ldap/admin/src/cfg_sspt.c' || echo '$(srcdir)/'`ldap/admin/src/cfg_sspt.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/cfg_sspt.c' object='ldap/admin/src/ds_newinst_bin-cfg_sspt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.o `test -f 'ldap/admin/src/cfg_sspt.c' || echo '$(srcdir)/'`ldap/admin/src/cfg_sspt.c
-
-ldap/admin/src/ds_newinst_bin-cfg_sspt.obj: ldap/admin/src/cfg_sspt.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-cfg_sspt.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.obj `if test -f 'ldap/admin/src/cfg_sspt.c'; then $(CYGPATH_W) 'ldap/admin/src/cfg_sspt.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/cfg_sspt.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-cfg_sspt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/cfg_sspt.c' object='ldap/admin/src/ds_newinst_bin-cfg_sspt.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-cfg_sspt.obj `if test -f 'ldap/admin/src/cfg_sspt.c'; then $(CYGPATH_W) 'ldap/admin/src/cfg_sspt.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/cfg_sspt.c'; fi`
-
-ldap/admin/src/ds_newinst_bin-create_instance.o: ldap/admin/src/create_instance.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-create_instance.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" -c -o ldap/admin/src/ds_newinst_bin-create_instance.o `test -f 'ldap/admin/src/create_instance.c' || echo '$(srcdir)/'`ldap/admin/src/create_instance.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/create_instance.c' object='ldap/admin/src/ds_newinst_bin-create_instance.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-create_instance.o `test -f 'ldap/admin/src/create_instance.c' || echo '$(srcdir)/'`ldap/admin/src/create_instance.c
-
-ldap/admin/src/ds_newinst_bin-create_instance.obj: ldap/admin/src/create_instance.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-create_instance.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" -c -o ldap/admin/src/ds_newinst_bin-create_instance.obj `if test -f 'ldap/admin/src/create_instance.c'; then $(CYGPATH_W) 'ldap/admin/src/create_instance.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/create_instance.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-create_instance.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/create_instance.c' object='ldap/admin/src/ds_newinst_bin-create_instance.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-create_instance.obj `if test -f 'ldap/admin/src/create_instance.c'; then $(CYGPATH_W) 'ldap/admin/src/create_instance.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/create_instance.c'; fi`
-
-ldap/admin/src/ds_newinst_bin-ds_newinst.o: ldap/admin/src/ds_newinst.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-ds_newinst.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.o `test -f 'ldap/admin/src/ds_newinst.c' || echo '$(srcdir)/'`ldap/admin/src/ds_newinst.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/ds_newinst.c' object='ldap/admin/src/ds_newinst_bin-ds_newinst.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.o `test -f 'ldap/admin/src/ds_newinst.c' || echo '$(srcdir)/'`ldap/admin/src/ds_newinst.c
-
-ldap/admin/src/ds_newinst_bin-ds_newinst.obj: ldap/admin/src/ds_newinst.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-ds_newinst.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.obj `if test -f 'ldap/admin/src/ds_newinst.c'; then $(CYGPATH_W) 'ldap/admin/src/ds_newinst.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/ds_newinst.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-ds_newinst.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/ds_newinst.c' object='ldap/admin/src/ds_newinst_bin-ds_newinst.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-ds_newinst.obj `if test -f 'ldap/admin/src/ds_newinst.c'; then $(CYGPATH_W) 'ldap/admin/src/ds_newinst.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/ds_newinst.c'; fi`
-
-ldap/admin/src/ds_newinst_bin-script-gen.o: ldap/admin/src/script-gen.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-script-gen.o -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" -c -o ldap/admin/src/ds_newinst_bin-script-gen.o `test -f 'ldap/admin/src/script-gen.c' || echo '$(srcdir)/'`ldap/admin/src/script-gen.c; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/script-gen.c' object='ldap/admin/src/ds_newinst_bin-script-gen.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-script-gen.o `test -f 'ldap/admin/src/script-gen.c' || echo '$(srcdir)/'`ldap/admin/src/script-gen.c
-
-ldap/admin/src/ds_newinst_bin-script-gen.obj: ldap/admin/src/script-gen.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/src/ds_newinst_bin-script-gen.obj -MD -MP -MF "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" -c -o ldap/admin/src/ds_newinst_bin-script-gen.obj `if test -f 'ldap/admin/src/script-gen.c'; then $(CYGPATH_W) 'ldap/admin/src/script-gen.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/script-gen.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo" "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Po"; else rm -f "ldap/admin/src/$(DEPDIR)/ds_newinst_bin-script-gen.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/admin/src/script-gen.c' object='ldap/admin/src/ds_newinst_bin-script-gen.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_newinst_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/src/ds_newinst_bin-script-gen.obj `if test -f 'ldap/admin/src/script-gen.c'; then $(CYGPATH_W) 'ldap/admin/src/script-gen.c'; else $(CYGPATH_W) '$(srcdir)/ldap/admin/src/script-gen.c'; fi`
-
ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.o: ldap/servers/slapd/tools/rsearch/addthread.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(infadd_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.o -MD -MP -MF "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Tpo" -c -o ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.o `test -f 'ldap/servers/slapd/tools/rsearch/addthread.c' || echo '$(srcdir)/'`ldap/servers/slapd/tools/rsearch/addthread.c; \
@am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Tpo" "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Po"; else rm -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/infadd_bin-addthread.Tpo"; exit 1; fi
@@ -8844,7 +8513,6 @@
clean-libtool:
-rm -rf .libs _libs
- -rm -rf ldap/admin/lib/.libs ldap/admin/lib/_libs
-rm -rf ldap/libraries/libavl/.libs ldap/libraries/libavl/_libs
-rm -rf ldap/servers/plugins/acl/.libs ldap/servers/plugins/acl/_libs
-rm -rf ldap/servers/plugins/bitwise/.libs ldap/servers/plugins/bitwise/_libs
@@ -9188,10 +8856,6 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -rm -f ldap/admin/lib/$(DEPDIR)/$(am__dirstamp)
- -rm -f ldap/admin/lib/$(am__dirstamp)
- -rm -f ldap/admin/src/$(DEPDIR)/$(am__dirstamp)
- -rm -f ldap/admin/src/$(am__dirstamp)
-rm -f ldap/libraries/libavl/$(DEPDIR)/$(am__dirstamp)
-rm -f ldap/libraries/libavl/$(am__dirstamp)
-rm -f ldap/servers/plugins/acl/$(DEPDIR)/$(am__dirstamp)
@@ -9276,7 +8940,7 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/se!
rvers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR)
+ -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd!
/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -9310,7 +8974,7 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/se!
rvers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR)
+ -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd!
/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
--- bchecker.ini DELETED ---
--- nsarch DELETED ---
--- nsarch.bat DELETED ---
--- ntversion.pl DELETED ---
--- pumpkin.pl DELETED ---
16 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools/rsearch/scripts dbgen.pl.in, NONE, 1.1 dbgen.pl, 1.2, NONE
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17673
Added Files:
dbgen.pl.in
Removed Files:
dbgen.pl
Log Message:
Resolves: bug 248272
Description: CLU: dbgen.pl fails to load data files
Reviewed by: nhosoi (Thanks!)
Fix Description: dbgen.pl is hardcoded to look for data files in ../data. Instead, we should allow the user to provide the location to the data files e.g. -l /path/to/data, and we should also use share/brand-ds/data as the default directory.
--- NEW FILE dbgen.pl.in ---
#!/usr/bin/perl
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#------------------------------------------------------------------------
## NAME
## dbgen
##
## DESCRIPTION
## Random LDIF database creator, specially modified from DirectoryMark
## Original weibe done by David Boreham in C++.
##
## Fixed random seed generator for uniqueness
## Updated function MakeRandomName:
## Changed default RDN type to UID and
## added -c option to enable CN type naming
## Added personal_title and generationQualifier data
## Added function to create randon SSN's if needed
## Updated generation output to show total entries created regardless of -v option
## Changed userPassword to be the same as UID.
## Now, dc style namingcontext can be used.
#------------------------------------------------------------------------
sub PrintUsage {
print STDERR
"Usage: $0 [options] -o output_file -n number\n",
"\t Where options are:\n",
"\t -s suffix, default is 'dc=example,dc=com'\n",
"\t -c for CN naming style RDN's : default is UID\n",
"\t -O for organizationalPersons, default is inetOrgPerson\n",
"\t -p for piranha style aci's, default is barracuda\n",
"\t -r seed---seed number for random number generator\n",
"\t -g print extra entries for orgchart\n",
"\t -x suppress printing pre amble\n",
"\t -y suppress printing organizational units\n",
"\t -l location of directory containing data files, default is @templatedir@\n",
"\t -v verbose\n",
"\t -q quiet\n",
"\n";
exit;
}
&PrintUsage if ($#ARGV == -1);
@EmployeeTypes = ("Manager", "Normal", "Peon");
@personal_title = ("Mr",
"Mrs",
"Miss",
"Senior",
"Junior",
"III",
"Cool");
@generationQ = ("I",
"II",
"III",
"IV",
"V",
"VI",
"VII");
@title_ranks = ("Senior",
"Master",
"Associate",
"Junior",
"Chief",
"Supreme",
"Elite");
@positions =("Accountant",
"Admin",
"Architect",
"Assistant",
"Artist",
"Consultant",
"Czar",
"Dictator",
"Director",
"Diva",
"Dreamer",
"Evangelist",
"Engineer",
"Figurehead",
"Fellow",
"Grunt",
"Guru",
"Janitor",
"Madonna",
"Manager",
"Pinhead",
"President",
"Punk",
"Sales Rep",
"Stooge",
"Visionary",
"Vice President",
"Writer",
"Warrior",
"Yahoo");
@localities = ("Mountain View", "Redmond", "Redwood Shores", "Armonk",
"Cambridge", "Santa Clara", "Sunnyvale", "Alameda",
"Cupertino", "Menlo Park", "Palo Alto", "Orem",
"San Jose", "San Francisco", "Milpitas", "Hartford", "Windsor",
"Boston", "New York", "Detroit", "Dallas", "Denver");
@area_codes = ("303", "415", "408", "510", "804", "818",
"213", "206", "714");
my $mycert =
"usercertificate;binary:: MIIBvjCCASegAwIBAgIBAjANBgkqhkiG9w0BAQQFADAnMQ8wDQYD\n VQQDEwZjb25maWcxFDASBgNVBAMTC01NUiBDQSBDZXJ0MB4XDTAxMDQwNTE1NTEwNloXDTExMDcw\n NTE1NTEwNlowIzELMAkGA1UEChMCZnIxFDASBgNVBAMTC01NUiBTMSBDZXJ0MIGfMA0GCSqGSIb3\n DQEBAQUAA4GNADCBiQKBgQDNlmsKEaPD+o3mAUwmW4E40MPs7aiui1YhorST3KzVngMqe5PbObUH\n MeJN7CLbq9SjXvdB3y2AoVl/s5UkgGz8krmJ8ELfUCU95AQls321RwBdLRjioiQ3MGJiFjxwYRIV\n j1CUTuX1y8dC7BWvZ1/EB0yv0QDtp2oVMUeoK9/9sQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBADev\n hxY6QyDMK3Mnr7vLGe/HWEZCObF+qEo2zWScGH0Q+dAmhkCCkNeHJoqGN4NWjTdnBcGaAr5Y85k1\n o/vOAMBsZePbYx4SrywL0b/OkOmQX+mQwieC2IQzvaBRyaNMh309vrF4w5kExReKfjR/gXpHiWQz\n GSxC5LeQG4k3IP34\n";
%ceo =
(
"uid" => "ceo",
"givenname" => "John",
"sn" => "Budd",
"title" => "CEO",
"cn" => "",
"dn" => ""
);
%ep0 =
(
"uid" => "exec_president0",
"givenname" => "Paul",
"sn" => "Grant",
"title" => "Exective President",
"cn" => "",
"dn" => ""
);
%ep1 =
(
"uid" => "exec_president1",
"givenname" => "Jill",
"sn" => "Peterson",
"title" => "Exective President",
"cn" => "",
"dn" => ""
);
@exective_presidents = (\%ep0, \%ep1);
%p0 =
(
"uid" => "president0",
"givenname" => "Pete",
"sn" => "Dunne",
"title" => "President",
"cn" => "",
"dn" => ""
);
%p1 =
(
"uid" => "president1",
"givenname" => "Jannet",
"sn" => "Keys",
"title" => "President",
"cn" => "",
"dn" => ""
);
%p2 =
(
"uid" => "president2",
"givenname" => "Kathy",
"sn" => "Yang",
"title" => "President",
"cn" => "",
"dn" => ""
);
%p3 =
(
"uid" => "president3",
"givenname" => "Anne",
"sn" => "Meissner",
"title" => "President",
"cn" => "",
"dn" => ""
);
@presidents = (\%p0, \%p1, \%p2, \%p3);
%vp0 =
(
"uid" => "vice_president0",
"givenname" => "Jack",
"sn" => "Cho",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp1 =
(
"uid" => "vice_president1",
"givenname" => "Diane",
"sn" => "Smith",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp2 =
(
"uid" => "vice_president2",
"givenname" => "Alex",
"sn" => "Merrells",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp3 =
(
"uid" => "vice_president3",
"givenname" => "Yumi",
"sn" => "Mehta",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp4 =
(
"uid" => "vice_president4",
"givenname" => "Michael",
"sn" => "Natkovich",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
%vp5 =
(
"uid" => "vice_president5",
"givenname" => "Keith",
"sn" => "Lucus",
"title" => "Vice President",
"cn" => "",
"dn" => ""
);
@vice_presidents = (\%vp0, \%vp1, \%vp2, \%vp3, \%vp4, \%vp5);
%d0 =
(
"uid" => "director0",
"givenname" => "Chris",
"sn" => "Harrison",
"title" => "Director",
"cn" => "",
"dn" => ""
),
%d1 =
(
"uid" => "director1",
"givenname" => "Jane",
"sn" => "Baker",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d2 =
(
"uid" => "director2",
"givenname" => "Ed",
"sn" => "Becket",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d3 =
(
"uid" => "director3",
"givenname" => "Will",
"sn" => "Stevenson",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d4 =
(
"uid" => "director4",
"givenname" => "Kieran",
"sn" => "Beckham",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d5 =
(
"uid" => "director5",
"givenname" => "Greg",
"sn" => "Emerson",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d6 =
(
"uid" => "director6",
"givenname" => "Ian",
"sn" => "Parker",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d7 =
(
"uid" => "director7",
"givenname" => "Liem",
"sn" => "Olson",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d8 =
(
"uid" => "director8",
"givenname" => "George",
"sn" => "Cruise",
"title" => "Director",
"cn" => "",
"dn" => ""
);
%d9 =
(
"uid" => "director9",
"givenname" => "Yoshiko",
"sn" => "Tucker",
"title" => "Director",
"cn" => "",
"dn" => ""
);
@directors = (\%d0, \%d1, \%d2, \%d3, \%d4, \%d5, \%d6, \%d7, \%d8, \%d9);
%m0 =
(
"uid" => "manager0",
"givenname" => "Teresa",
"sn" => "Chan",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m1 =
(
"uid" => "manager1",
"givenname" => "Tom",
"sn" => "Anderson",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m2 =
(
"uid" => "manager2",
"givenname" => "Olga",
"sn" => "Young",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m3 =
(
"uid" => "manager3",
"givenname" => "Bill",
"sn" => "Graham",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m4 =
(
"uid" => "manager4",
"givenname" => "Todd",
"sn" => "Hoover",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m5 =
(
"uid" => "manager5",
"givenname" => "Ken",
"sn" => "Hamilton",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m6 =
(
"uid" => "manager6",
"givenname" => "Christine",
"sn" => "Jobs",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m7 =
(
"uid" => "manager7",
"givenname" => "Joanna",
"sn" => "Lake",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m8 =
(
"uid" => "manager8",
"givenname" => "Kim",
"sn" => "Remley",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m9 =
(
"uid" => "manager9",
"givenname" => "Nick",
"sn" => "Pennebaker",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m10 =
(
"uid" => "manager10",
"givenname" => "Ted",
"sn" => "Hardy",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m11 =
(
"uid" => "manager11",
"givenname" => "Tanya",
"sn" => "Nielsen",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m12 =
(
"uid" => "manager12",
"givenname" => "Sam",
"sn" => "Madams",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m13 =
(
"uid" => "manager13",
"givenname" => "Judy",
"sn" => "Stewart",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m14 =
(
"uid" => "manager14",
"givenname" => "Martha",
"sn" => "Kidman",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m15 =
(
"uid" => "manager15",
"givenname" => "Leo",
"sn" => "Knuth",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m16 =
(
"uid" => "manager16",
"givenname" => "Cecil",
"sn" => "Guibas",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
%m17 =
(
"uid" => "manager17",
"givenname" => "Jay",
"sn" => "Hows",
"title" => "Manager",
"cn" => "",
"dn" => ""
);
@managers = (\%m0, \%m1, \%m2, \%m3, \%m4, \%m5, \%m6, \%m7, \%m8, \%m9, \%m10, \%m11, \%m12, \%m13, \%m14, \%m15, \%m16, \%m17);
require "flush.pl";
require "getopts.pl";
&Getopts('n:o:s:r:cOvpqgxyl:');
$Number_To_Generate = $opt_n;
$Verbose = $opt_v;
$Quiet = $opt_q;
$Output_File_Name = $opt_o;
$Random_Seed = $opt_r || 0xdbdbdbdb;
$TargetServer = $opt_t;
$debug = $opt_d;
$Suffix = $opt_s || 'dc=example,dc=com';
$NamingType = "cn" if ($opt_c);
$NamingType = "uid" if (!$opt_c);
$inetOrgPerson = "objectClass: inetOrgPerson\n" if (!$opt_O);
$PrintOrgChartDat = $opt_g;
$DataDir = $opt_l || "@templatedir@";
$printpreamble = 1;
if ("" != $opt_x)
{
$printpreamble = 0;
}
$printorgunit = 1;
if ("" != $opt_y)
{
$printorgunit = 0;
}
if ($Suffix =~ /o=/) {
($Organization) = $Suffix =~ /o=([^,]+)/;
$objectvalue = "organization";
$line = "o: $Organization";
if ($Organization =~ /\s+/) {
($Organization) = $Organization =~ /([^\s]+)/;
$Organization .= ".com";
} elsif ($Organization !~ /\.com|\.net|\.org/) {
$Organization .= ".com";
}
} elsif ($Suffix =~ /dc=/) {
$Organization = $Suffix;
$Organization =~ s/,\s*dc=/./g;
($domain) = $Organization =~ /dc=([^\.]+)/;
$Organization =~ s/dc=//;
$objectvalue = "domain";
$line = "dc: $domain";
}
# Print help message if user doesn't know how many entries to make
# or no output file specified
if ( (!$Number_To_Generate) || (!$Output_File_Name)) {
&PrintUsage;
}
srand($Random_Seed);
print "Loading Name Data...\n" if $Verbose;
$GivenNamesFile = "$DataDir/dbgen-GivenNames";
$FamilyNamesFile = "$DataDir/dbgen-FamilyNames";
$OrgUnitsFile = "$DataDir/dbgen-OrgUnits";
&ReadGivenNames;
&ReadFamilyNames;
&ReadOrgUnits;
print "Done\n" if $Verbose;
if ($printpreamble)
{
if ($piranha) {
&PrintPreAmblePiranha($Output_File_Name);
}
else {
&PrintPreAmbleBarracuda($Output_File_Name);
}
}
open (OUTPUT_FILE, ">>$Output_File_Name") ||
die "Error---Can't open output file $Output_File_Name\n";
if ($printorgunit)
{
&PrintOrganizationalUnits;
}
if ($PrintOrgChartDat)
{
# CEO
&PrintManagers(\%ceo, "", $ceo{"dn"});
for (my $j = 0; $j < @exective_presidents; $j++)
{
&PrintManagers($exective_presidents[$j], &MakeRandomOrgUnit, $ceo{"dn"});
}
# Presidents
for (my $j = 0; $j < @presidents; $j++)
{
my $who = int rand @exective_presidents;
&PrintManagers($presidents[$j],
&MakeRandomOrgUnit, $exective_presidents[$who]{"dn"});
}
# Vice Presidents
for (my $j = 0; $j < @vice_presidents; $j++)
{
my $who = int rand @presidents;
&PrintManagers($vice_presidents[$j],
&MakeRandomOrgUnit, $presidents[$who]{"dn"});
}
# Directors
for (my $j = 0; $j < @directors; $j++)
{
my $who = int rand @vice_presidents;
&PrintManagers($directors[$j],
&MakeRandomOrgUnit, $vice_presidents[$who]{"dn"});
}
# Managers
for (my $j = 0; $j < @managers; $j++)
{
my $who = int rand @directors;
&PrintManagers($managers[$j],
&MakeRandomOrgUnit, $directors[$who]{"dn"});
}
}
print "Generating $Number_To_Generate entries, please wait\n";
print "Progress: ";
# We don't want people with duplicate names, so for each name generated,
# add it to "TheMap", which is an associative array with the
# name as the key. If there's a duplicate, throw the name out and
# try again.
$dups = 0;
# Generate Number_To_Generate distinct entries. If a duplicate
# is created, toss it out and try again.
# CHANGED: updated to allow for uid naming style or cn style. Check the RDN for uniqueness
for ($x= 0; $x < $Number_To_Generate; $x++) {
($givenName, $sn, $cn, $uid, $rdn,) = &MakeRandomName;
if (&AddAndCheck($rdn)) {
print "Duplicate: $rdn...\n" if $debug;
&flush(STDOUT);
$dups++;
$x--;
next;
}
$OrgUnit = &MakeRandomOrgUnit;
$facsimileTelephoneNumber = &MakeRandomTelephone;
$postalAddress = &MakeRandomPostalAddress (
int rand 1000,
int rand 1000,
$OrgUnit);
$postOfficeBox = int rand 10000;
$telephoneNumber = &MakeRandomTelephone;
$title = &MakeRandomTitle($OrgUnit);
# $userPassword = reverse ($cn);
# $userPassword =~ s/\s//g;
# $userPassword = substr($userPassword, 0, 10);
$locality = &MakeRandomLocality;
# $desc = "[0] This is $cn" . "'s description.";
$fourdigit = int rand 10000;
$desc = "2;$fourdigit;CN=Red Hat CS 71GA Demo,O=Red Hat CS 71GA Demo,C=US;CN=RHCS Agent - admin01,UID=admin01,O=redhat,C=US";
my $z = 1;
# for (; $z < 1024; $z++)
for (; $z < 2; $z++)
{
$desc = $desc . " [$z] This is $cn" . "'s description.";
}
$description = $desc;
$mail = &MakeMailAddress($givenName, $sn, $Organization);
if ($inetOrgPerson) {
$carLicense = "carLicense: " . &MakeRandomCarLicense . "\n";
$departmentNumber = "departmentNumber: " . (int rand 10000) . "\n";
$employeeType = "employeeType: " . &MakeRandomEmployeeType . "\n";
$homePhone = "homePhone: " . &MakeRandomTelephone . "\n";
$initials = "initials: " . &MakeInitials ($givenName, $sn) . "\n";
$mobile = "mobile: " . &MakeRandomTelephone . "\n";
$pager = "pager: " . &MakeRandomTelephone . "\n";
if ($PrintOrgChartDat) {
$managerCn = $managers[int rand @managers]{"dn"};
} else {
$managerCn = $managers[int rand @managers]{"givenname"} . " " .
$managers[int rand @managers]{"sn"};
}
($junk, $junk, $secretary_cn) = &MakeRandomName;
$manager = "manager: $managerCn " . "\n";
$secretary = "secretary: $secretary_cn" . "\n";
$roomNumber = "roomNumber: " . (int rand 10000) . "\n";
$userPassword = "$uid\n";
}
if ($PrintOrgChartDat) {
$dnstr = "dn: $NamingType=$rdn, ou=People, $Suffix\n",
} else {
$dnstr = "dn: $NamingType=$rdn, ou=$OrgUnit, $Suffix\n";
}
print OUTPUT_FILE
$dnstr,
"objectClass: top\n",
"objectClass: person\n",
"objectClass: organizationalPerson\n",
$inetOrgPerson,
"cn: $cn\n",
"sn: $sn\n",
"uid: $uid\n",
"givenName: $givenName\n",
"description: $description\n",
"userPassword: $userPassword",
$departmentNumber,
$employeeType,
$homePhone,
$initials,
"telephoneNumber: $telephoneNumber\n",
"facsimileTelephoneNumber: $facsimileTelephoneNumber\n",
$mobile,
$pager,
$manager,
$secretary,
$roomNumber,
$carLicense,
"l: $locality\n",
"ou: $OrgUnit\n",
"mail: $mail\n",
"postalAddress: $postalAddress\n",
"title: $title\n",
$mycert,
"\n";
if (!$Quiet) {
if ($x % 1000 == 0) {
print ".";
&flush(STDOUT);
}
}
}
print "\n";
print "Generated $x entries\n";
if ($Verbose) {
print "$dups duplicates skipped\n";
}
exit 0;
sub ReadOrgUnits {
open (ORG_UNITS, $OrgUnitsFile) ||
die "Bad news, failed to open Org Units, $OrgUnitsFile: $!\n";
while(<ORG_UNITS>) {
chop;
push (@OrganizationalUnits, $_);
}
close ORG_UNITS;
}
sub ReadGivenNames {
open (GIVEN_NAMES, $GivenNamesFile) ||
die "Bad News, failed to load given names. $GivenNamesFile\n";
$i = 0;
while (<GIVEN_NAMES>) {
chop;
$given_names[$i++] = $_;
}
close GIVEN_NAMES;
}
sub ReadFamilyNames {
open (FAMILY_NAMES, $FamilyNamesFile) ||
die "Bad News, failed to load Family Names. $FamilyNamesFile\n";
$i = 0;
while (<FAMILY_NAMES>) {
chop;
$family_names[$i++] = $_;
}
close FAMILY_NAMES;
}
sub PrintPreAmblePiranha {
local($output_file) = @_;
open (OUTPUT_FILE, ">$output_file") || die "Can't open $output_file for writing $!\n";
print OUTPUT_FILE<<End_Of_File
dn: $Suffix
objectClass: top
objectClass: $objectvalue
$line
subtreeaci: +(&(privilege=write)(target=ldap:///self))
subtreeaci: +(privilege=compare)
subtreeaci: +(|(privilege=search)(privilege=read))
End_Of_File
;
close (OUTPUT_FILE);
}
sub PrintPreAmbleBarracuda {
local($output_file) = @_;
open (OUTPUT_FILE, ">$output_file") || die "Can't open $output_file for writing $!\n";
print OUTPUT_FILE<<End_Of_File
dn: $Suffix
objectClass: top
objectClass: $objectvalue
$line
aci: (target=ldap:///$Suffix)(targetattr=*)(version 3.0; acl "acl1"; allow(write) userdn = "ldap:///self";)
aci: (target=ldap:///$Suffix)(targetattr=*)(version 3.0; acl "acl2"; allow(write) groupdn = "ldap:///cn=Directory Administrators, $Suffix";)
aci: (target=ldap:///$Suffix)(targetattr=*)(version 3.0; acl "acl3"; allow(read, search, compare) userdn = "ldap:///anyone";)
End_Of_File
;
close (OUTPUT_FILE);
}
sub PrintPreAmbleNoACI {
local($output_file) = @_;
open (OUTPUT_FILE, ">$output_file") || die "Can't open $output_file for writing $!\n";
print OUTPUT_FILE<<End_Of_File
dn: $Suffix
objectClass: top
objectClass: organization
o: $Organization
End_Of_File
;
close (OUTPUT_FILE);
}
sub PrintOrganizationalUnits {
foreach $ou (@OrganizationalUnits) {
print OUTPUT_FILE
"dn: ou=$ou, $Suffix\n",
"objectClass: top\n",
"objectClass: organizationalUnit\n",
"ou: $ou\n\n";
}
if ($PrintOrgChartDat) {
print OUTPUT_FILE
"dn: ou=People, $Suffix\n",
"objectClass: top\n",
"objectClass: organizationalUnit\n",
"ou: People\n\n";
}
}
sub PrintManagers {
my ($obj, $orgUnit, $managerCn) = @_;
my $rdn = $$obj{"$NamingType"};
my $uid = $$obj{"uid"};
my $givenName = $$obj{"givenname"};
my $sn = $$obj{"sn"};
my $title = $$obj{"title"};
$$obj{"cn"} = "$givenName $sn";
my $cn = $$obj{"cn"};
$facsimileTelephoneNumber = &MakeRandomTelephone;
$postalAddress = &MakeRandomPostalAddress (
int rand 1000,
int rand 1000,
$OrgUnit);
$postOfficeBox = int rand 10000;
$telephoneNumber = &MakeRandomTelephone;
$locality = &MakeRandomLocality;
$description = "This is $cn" . "'s description";
$mail = &MakeMailAddress($givenName, $sn, $Organization);
$$obj{"dn"} = "$NamingType=$rdn, ou=People, $Suffix";
if ($inetOrgPerson) {
$carLicense = "carLicense: " . &MakeRandomCarLicense . "\n";
$departmentNumber = "departmentNumber: " . (int rand 10000) . "\n";
$employeeType = "employeeType: " . $title . "\n";
$homePhone = "homePhone: " . &MakeRandomTelephone . "\n";
$initials = "initials: " . &MakeInitials ($givenName, $sn) . "\n";
$mobile = "mobile: " . &MakeRandomTelephone . "\n";
$pager = "pager: " . &MakeRandomTelephone . "\n";
($junk, $junk, $secretary_cn) = &MakeRandomName;
if ("" ne $managerCn) {
$manager = "manager: $managerCn\n";
}
$secretary = "secretary: $secretary_cn" . "\n";
$roomNumber = "roomNumber: " . (int rand 10000) . "\n";
$userPassword = "$uid\n";
}
$dnstr = "dn: $NamingType=$rdn, ou=People, $Suffix\n";
if ("" ne $orgUnit) {
$oustr = "ou: $orgUnit\n";
}
print OUTPUT_FILE
$dnstr,
"objectClass: top\n",
"objectClass: person\n",
"objectClass: organizationalPerson\n",
$inetOrgPerson,
"cn: $cn\n",
"sn: $sn\n",
"uid: $uid\n",
"givenName: $givenName\n",
"description: $description\n",
"userPassword: $userPassword",
$departmentNumber,
$employeeType,
$homePhone,
$initials,
"telephoneNumber: $telephoneNumber\n",
"facsimileTelephoneNumber: $facsimileTelephoneNumber\n",
$mobile,
$pager,
$manager,
$secretary,
$roomNumber,
$carLicense,
"l: $locality\n",
$oustr,
"mail: $mail\n",
"postalAddress: $postalAddress\n",
"title: $title\n",
$mycert,
"\n";
}
sub MakeRandomTitle {
local($org_unit) = @_;
return
"$title_ranks[rand @title_ranks] $org_unit $positions[rand @positions]";
}
sub MakeRandomLocality {
return $localities[rand @localities];
}
sub MakeRandomName {
local($Given_Name, $Surname, $Full_Name, $UID, $uniq, $first, $last, $RDN);
# Get the unique number depending if a seed was set or not.
$uniq = int rand($Random_Seed) if ($opt_r);
$uniq = $x if (!$opt_r);
$Given_Name = $given_names[rand @given_names];
$Surname = $family_names[rand @family_names];
$Full_Name = "$Given_Name $Surname";
# Create the uid based on the DN naming type defined
if ($NamingType eq "uid") {
$first = substr($Given_Name, 0,1);
$last = substr($Surname, 0,8);
$UID = $first . $last . "$uniq";
$RDN = $UID;
}
else
{
$first = substr($Given_Name, 0,1);
$last = substr($Surname, 0,8);
$UID = $first . $last . "$uniq";
$RDN = $Full_Name;
}
return ($Given_Name, $Surname, $Full_Name, $UID, $RDN);
}
sub MakeRandomOrgUnit {
return $OrganizationalUnits[rand @OrganizationalUnits];
}
sub MakeRandomTelephone {
local($prefix, $suffix, $Phone_Number);
$prefix = int rand(900) + 100;
$suffix = int rand(9000) + 1000;
return $Phone_Number = "+1 " . $area_codes[rand @area_codes] . " " .
"$prefix-$suffix";
}
sub MakeRandomSSN {
local($one, $two, $three, $SSN);
$one = int rand(900) +99;
$two = int rand(90) +9;
$three = int rand(9000) + 999;
return $SSN = "$one-$two-$three";
}
sub MakeRandomEmployeeType {
return $EmployeeTypes[rand @EmployeeTypes];
}
sub MakeRandomPersonalTitle {
return $personal_title[rand @personal_title];
}
sub MakeRandomCarLicense {
local ($rand_char_index, $ascii_value, $license);
for (1..7) {
$rand_char_index = int rand 36;
$ascii_value = ($rand_char_index > 9) ? $rand_char_index + 55 :
$rand_char_index + 48;
$license .= pack ("c", $ascii_value);
}
return $license;
}
# All entries are added to TheMap which checks to see
# if the name is already there
sub AddAndCheck {
local($RDN) = @_;
# now isn't this better than STL?
if ($TheMap{$RDN}) {
return 1;
}
else {
$TheMap{$RDN} = 1;
return 0;
}
}
sub MakeMailAddress {
local($given_name, $sur_name, $Organization) = @_;
return "$given_name". "_$sur_name\@$Organization";
}
sub MakeRandomPostalAddress {
local ($org, $departmentNumber,$roomNumber, $OrgUnit) = @_;
return "$org, $OrgUnit Dept \#$departmentNumber, Room\#$roomNumber";
}
sub MakeInitials {
local ($givenName, $sn) = @_;
local ($first, $last);
($first) = $givenName =~ /^(\w).*/;
($last) = $sn =~ /^(\w).*/;
return "$first" . ". " . "$last" . ".";
}
--- dbgen.pl DELETED ---
16 years, 9 months
[Fedora-directory-commits] adminserver/admserv/newinst/src ASDialogs.pm.in, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15803/adminserver/admserv/newinst/src
Modified Files:
ASDialogs.pm.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: 1) Inf needs to be able to read the .inf file from stdin. This is what ds_newinst.pl does currently.
2) getlogin seems not to work in all cases, so add a more robust replacement.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: ASDialogs.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ASDialogs.pm.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ASDialogs.pm.in 20 Jun 2007 16:35:02 -0000 1.4
+++ ASDialogs.pm.in 13 Jul 2007 19:53:17 -0000 1.5
@@ -138,7 +138,7 @@
}
}
if ($> != 0) { # if not root, the user must be our uid
- my $username = getlogin;
+ my $username = getLogin;
if ($strans ne $username) {
$self->{manager}->alert("dialog_assysuser_must_be_same", $username);
return $DialogManager::SAME;
@@ -170,7 +170,7 @@
if ($> == 0) { # if root, use the default user
$user = "@httpduser@";
} else { # if not root, use the user's uid
- $user = getlogin;
+ $user = getLogin;
}
}
return $user;
16 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.1, 1.2 Inf.pm, 1.3, 1.4 SetupDialogs.pm.in, 1.1, 1.2 Util.pm.in, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15733/ldapserver/ldap/admin/src/scripts
Modified Files:
DSCreate.pm.in Inf.pm SetupDialogs.pm.in Util.pm.in
Log Message:
Resolves: bug 248145
Bug Description: Replace ds_newinst binary with perl script
Reviewed by: nhosoi (Thanks!)
Fix Description: 1) Inf needs to be able to read the .inf file from stdin. This is what ds_newinst.pl does currently.
2) getlogin seems not to work in all cases, so add a more robust replacement.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: DSCreate.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DSCreate.pm.in 13 Jul 2007 18:35:32 -0000 1.1
+++ DSCreate.pm.in 13 Jul 2007 19:51:48 -0000 1.2
@@ -596,7 +596,7 @@
if (!$inf->{General}->{SuiteSpotUserID}) {
if ($> != 0) { # if not root, use the user's uid
- $inf->{General}->{SuiteSpotUserID} = getlogin;
+ $inf->{General}->{SuiteSpotUserID} = getLogin;
}
# otherwise, the uid must be specified
}
Index: Inf.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Inf.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Inf.pm 20 Jun 2007 14:40:24 -0000 1.3
+++ Inf.pm 13 Jul 2007 19:51:48 -0000 1.4
@@ -77,8 +77,14 @@
my $incontinuation = 0;
my $curkey;
- open INF, $filename or die "Error: could not open inf file $filename: $!";
- while (<INF>) {
+ my $inffh;
+ if ($filename eq "-") {
+ $inffh = \*STDIN;
+ } else {
+ open INF, $filename or die "Error: could not open inf file $filename: $!";
+ $inffh = \*INF;
+ }
+ while (<$inffh>) {
my $iscontinuation;
chop; # trim trailing newline
if (/^\s*$/) { # skip blank/empty lines
@@ -107,7 +113,9 @@
$incontinuation = 0;
}
}
- close INF;
+ if ($inffh ne \*STDIN) {
+ close $inffh;
+ }
}
sub section {
@@ -149,6 +157,8 @@
$filename = $self->{filename};
}
+ return if ($filename eq "-");
+
open INF, ">$filename" or die "Error: could not write inf file $filename: $!";
# write General section first
$self->writeSection('General', \*INF);
Index: SetupDialogs.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/SetupDialogs.pm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetupDialogs.pm.in 19 Jun 2007 18:24:57 -0000 1.1
+++ SetupDialogs.pm.in 13 Jul 2007 19:51:48 -0000 1.2
@@ -44,6 +44,7 @@
use Setup;
use Dialog;
use Net::Domain qw(hostfqdn);
+use Util;
my $welcome = new DialogYesNo (
$EXPRESS,
@@ -136,7 +137,7 @@
}
}
if ($> != 0) { # if not root, the user must be our uid
- my $username = getlogin;
+ my $username = getLogin;
if ($strans ne $username) {
$self->{manager}->alert("dialog_ssuser_must_be_same", $username);
return $DialogManager::SAME;
@@ -218,7 +219,7 @@
if ($> == 0) { # if root, use the default user
$username = "@defaultuser@";
} else { # if not root, use the user's uid
- $username = getlogin;
+ $username = getLogin;
}
}
return $username;
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Util.pm.in 13 Jul 2007 18:35:32 -0000 1.8
+++ Util.pm.in 13 Jul 2007 19:51:48 -0000 1.9
@@ -48,11 +48,11 @@
@EXPORT = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
getHashedPassword debug createInfFromConfig
- isValidServerID isValidUser makePaths);
+ isValidServerID isValidUser makePaths getLogin);
@EXPORT_OK = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
getHashedPassword debug createInfFromConfig
- isValidServerID isValidUser makePaths);
+ isValidServerID isValidUser makePaths getLogin);
use strict;
@@ -111,6 +111,10 @@
return $servid =~ /^[$validchars]+$/o;
}
+sub getLogin {
+ return getlogin || (getpwuid($>))[0] || $ENV{USER} || die "Error: could not determine the current user ID: $!";
+}
+
sub isValidUser {
my $user = shift;
# convert numeric uid to string
@@ -122,7 +126,7 @@
}
}
if ($> != 0) { # if not root, the user must be our uid
- my $username = getlogin;
+ my $username = getLogin;
if ($strans ne $username) {
return ("dialog_ssuser_must_be_same", $username);
}
@@ -799,8 +803,8 @@
print $outfh "start_server= 0\n";
my $suffix;
- my $ent = $conn->search("cn=ldbm database,cn=plugins,cn=config",
- "one", "(objectclass=*)");
+ $ent = $conn->search("cn=ldbm database,cn=plugins,cn=config",
+ "one", "(objectclass=*)");
if (!$ent) {
push @{$errs}, "error_opening_dseldif", $fname, $!;
close $outfh;
16 years, 9 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 config.c, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15349/adminserver/admserv/cgi-src40
Modified Files:
config.c
Log Message:
Resolves: bug 248184
Bug Description: adminserver: The config CGI program does not preserve Listen IP addr
Reviewed by: ???
Fix Description: Move the existing code into a new function. This function will set the Listen directive IP and port, preserving any existing values.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config.c 6 Jul 2007 18:06:19 -0000 1.12
+++ config.c 13 Jul 2007 19:47:15 -0000 1.13
@@ -99,6 +99,43 @@
static int change_server_uid(PsetHndl pset, char* newuname);
#endif
+static int
+update_port_addr(char *port, char *addr)
+{
+ char line[BIG_LINE];
+ char *val = read_conf("console.conf", "Listen");
+ char *ptr = NULL;
+ int err;
+
+ if (val) {
+ ptr = strchr(val, ':');
+ }
+
+ if (ptr) {
+ *ptr = '\0';
+ ++ptr; /* ptr points to the start of the port number in host:port */
+ } else if (val) {
+ ptr = val; /* Listen only specifies the port number */
+ val = "0.0.0.0"; /* default listen on all interfaces */
+ } else {
+ /* console.conf should always have Listen with the server port */
+ ptr = "80"; /* default httpd port? */
+ val = "0.0.0.0";
+ }
+ /*
+ If ip address is not defined, it means that server should
+ listen on all interfaces. This is dependant upon console
+ to always include the port string first.
+ */
+ PR_snprintf(line, sizeof(line), "%s:%s",
+ (addr && *addr) ? addr : val,
+ (port && *port) ? port : ptr);
+ err = update_conf("console.conf", "Listen", line);
+ PL_strfree(val);
+
+ return err;
+}
+
int main(int argc, char *argv[])
{
int _ai = ADMUTIL_Init();
@@ -451,7 +488,7 @@
}
if(err == 0) {
- err = update_conf("console.conf", "Listen", valptr);
+ err = update_port_addr(valptr, NULL); /* update port only */
}
if (err < 0)
@@ -495,34 +532,7 @@
rpt_err(APP_ERROR, error_info, NULL, NULL);
}
else {
- char line[BIG_LINE];
- char *val = read_conf("console.conf", "Listen");
- char *ptr = NULL;
-
- if (val) {
- ptr = strchr(val, ':');
- }
-
- if (ptr) {
- ++ptr; /* ptr points to the start of the port number in host:port */
- } else if (val) {
- ptr = val; /* Listen only specifies the port number */
- } else {
- /* console.conf should always have Listen with the server port */
- ptr = "80"; /* default httpd port? */
- }
- /*
- If ip address is not defined, it means that server should
- listen on all interfaces. This is dependant upon console
- to always include the port string first.
- */
- if (valptr && valptr[0] ) {
- PR_snprintf(line, sizeof(line), "%s:%s", valptr, ptr);
- } else {
- PR_snprintf(line, sizeof(line), "0.0.0.0:%s", ptr);
- }
- err = update_conf("console.conf", "Listen", line);
- PL_strfree(val);
+ err = update_port_addr(NULL, valptr); /* update address only */
}
}
16 years, 9 months
[Fedora-directory-commits] adminserver/admserv/newinst/src AdminServer.pm.in, 1.5, 1.6 AdminUtil.pm.in, 1.9, 1.10 migrate-ds-admin.pl.in, 1.3, 1.4 setup-ds-admin.pl.in, 1.7, 1.8 setup-ds-admin.res.in, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32691/adminserver/admserv/newinst/src
Modified Files:
AdminServer.pm.in AdminUtil.pm.in migrate-ds-admin.pl.in
setup-ds-admin.pl.in setup-ds-admin.res.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: AdminServer.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AdminServer.pm.in 4 Jul 2007 01:31:33 -0000 1.5
+++ AdminServer.pm.in 13 Jul 2007 18:39:15 -0000 1.6
@@ -126,18 +126,20 @@
$setup->msg('create_adminserver_filesdirs');
# these paths are owned exclusively by admin sever
+ my @errs;
for ($configdir, $securitydir, $logdir) {
- $! = 0; # clear errno
- if (! -d $_) {
- mkpath($_, 1, 0700);
- } else {
- chmod 0700, $_;
- }
- if (! -d $_) {
- $setup->msg($FATAL, 'error_creating_directory', $_, $!);
+ @errs = makePaths($_, 0700, $setup->{inf}->{admin}->{SysUser},
+ $setup->{inf}->{General}->{SuiteSpotGroup});
+ if (@errs) {
+ $setup->msg($FATAL, @errs);
return 0;
}
$! = 0; # clear errno
+ chmod 0700, $_;
+ if ($!) {
+ $setup->msg($FATAL, 'error_chmoding_directory', $_, $!);
+ return 0;
+ }
chown $uid, -1, $_;
if ($!) {
$setup->msg($FATAL, 'error_chowning_directory', $_,
@@ -147,17 +149,18 @@
}
# these paths are shared by SuiteSpotGroup members
- $! = 0; # clear errno
- if (! -d $rundir) {
- mkpath($rundir, 0, 0770);
- } else {
- chmod 0770, $rundir;
- }
- if (! -d $rundir) {
- $setup->msg($FATAL, 'error_creating_directory', $rundir, $!);
+ @errs = makePaths($rundir, 0770, $setup->{inf}->{admin}->{SysUser},
+ $setup->{inf}->{General}->{SuiteSpotGroup});
+ if (@errs) {
+ $setup->msg($FATAL, @errs);
return 0;
}
$! = 0; # clear errno
+ chmod 0770, $rundir;
+ if ($!) {
+ $setup->msg($FATAL, 'error_chmoding_directory', $rundir, $!);
+ return 0;
+ }
chown -1, $gid, $rundir;
if ($!) {
$setup->msg($FATAL, 'error_chgrping_directory', $rundir,
@@ -327,12 +330,16 @@
$cmd .= " configuration.nsServerAddress=\"$serverAddress\"";
}
- if (system($cmd)) {
+ $? = 0; # clear error
+ my $output = `$cmd 2>&1`;
+ if ($?) {
+ debug(0, $output);
$ENV{LD_LIBRARY_PATH} = $savepath;
$ENV{SHLIB_PATH} = $savepath;
return 0;
}
+ debug(1, $output);
$ENV{LD_LIBRARY_PATH} = $savepath;
$ENV{SHLIB_PATH} = $savepath;
return 1;
@@ -453,3 +460,12 @@
my $setup = shift;
return createAdminServer($setup, 1);
}
+
+1;
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AdminUtil.pm.in 11 Jul 2007 01:20:21 -0000 1.9
+++ AdminUtil.pm.in 13 Jul 2007 18:39:15 -0000 1.10
@@ -745,3 +745,12 @@
return @{$errs} ? 0 : 1;
}
+
+1;
+
+# emacs settings
+# Local Variables:
+# mode:perl
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
Index: migrate-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- migrate-ds-admin.pl.in 12 Jul 2007 14:00:10 -0000 1.3
+++ migrate-ds-admin.pl.in 13 Jul 2007 18:39:15 -0000 1.4
@@ -82,7 +82,9 @@
# next, migrate the admin server - this also registers the directory servers
$mig->msg('begin_as_migration', $mig->{oldsroot});
-migrateAdminServer($mig);
+if (!migrateAdminServer($mig)) {
+ exit 1;
+}
# next, register/update the new directory servers
# in the config ds
Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- setup-ds-admin.pl.in 4 Jul 2007 01:31:33 -0000 1.7
+++ setup-ds-admin.pl.in 13 Jul 2007 18:39:15 -0000 1.8
@@ -46,6 +46,7 @@
use Inf;
use Resource;
use DialogManager;
+use DSCreate;
use AdminUtil;
use AdminServer;
use Util;
@@ -145,16 +146,13 @@
$setup->msg('create_dirserver');
# create a directory server instance
-my @errs = ();
-my ($rc, $output) = createDSInstance($setup->{inf}, \@errs);
-if ($rc) {
- if (@errs) {
- $setup->msg(@errs);
- }
- $setup->msg($FATAL, 'error_creating_dsinstance', $rc, $output);
+my @errs = createDSInstance($setup->{inf});
+if (@errs) {
+ $setup->msg(@errs);
+ $setup->msg($FATAL, 'error_creating_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier});
exit 1;
} else {
- $setup->msg('created_dsinstance', $output);
+ $setup->msg('created_dsinstance', $setup->{inf}->{slapd}->{ServerIdentifier});
}
# setup directory server instance to be the configuration DS
Index: setup-ds-admin.res.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.res.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setup-ds-admin.res.in 20 Jun 2007 16:35:02 -0000 1.4
+++ setup-ds-admin.res.in 13 Jul 2007 18:39:15 -0000 1.5
@@ -92,11 +92,6 @@
error_create_dirserver = Failed to create directory server instance\n
error_create_configds = Failed to create the configuration directory server\n
error_create_adminserver = Failed to create and configure the admin server\n
-error_creating_directory = Could not create admin server directory '%s'. Error: %s\n
-error_chowning_directory = Could not change ownership of directory '%s' to userid '%s': Error: %s\n
-error_chowning_file = Could not change ownership of file '%s' to userid '%s': Error: %s\n
-error_chmoding_file = Could not change permissions of file '%s': Error: %s\n
-error_chgrping_directory = Could not change group of directory '%s' to group '%s': Error: %s\n
updating_admconf = Updating adm.conf . . .\n
error_updating_admconf = Could not update adm.conf. Error: %s\n
updating_admpw = Updating admpw . . .\n
16 years, 9 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 ds_create.in, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32691/adminserver/admserv/cgi-src40
Modified Files:
ds_create.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: ds_create.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds_create.in 11 Jul 2007 21:36:47 -0000 1.2
+++ ds_create.in 13 Jul 2007 18:39:15 -0000 1.3
@@ -46,6 +46,7 @@
use AdminUtil;
use Util;
use Resource;
+use DSCreate;
my $res = new Resource("@propertydir(a)/ds_create.res",
"@propertydir(a)/setup-ds-admin.res",
@@ -57,41 +58,11 @@
# save old start_server param
# set start_server=0
my $start_server = $query->param('start_server');
-$query->param('start_server', '0'); # create server but do not start
-# call ds_newinst as a GET (GET or POST works, GET is simpler)
-$ENV{REQUEST_METHOD} = "GET";
-$ENV{QUERY_STRING} = $query->query_string();
-
-# make sure the child exit code is reset before starting the fake
-# cgi program
-my $prog = "@bindir@/ds_newinst";
-if (! -x $prog) {
- $prog = "@dslibdir@/ds_newinst";
-}
-$? = 0;
-# run the CGI
-my $output = `$prog 2>&1`;
-my $status = $?;
-# check for and report errors
-if ($status) {
- print "Content-type: text/plain\n\n";
- print $output;
- exit $status;
-}
-
-# set up new DS to be managed by config DS - acis, pta config
-
-# new ds info, needed for registration (or get from new dse.ldif)
-# temp = ds_a_get_cgi_var("servport", NULL, NULL);
-# if (!(cf->servid = ds_a_get_cgi_var("servid", "Server Identifier",
-# "Please give your server a short identifier.")))
-# cf->rootdn = dn_normalize_convert(ds_a_get_cgi_var("rootdn", NULL, NULL));
-# if (!(cf->rootpw = ds_a_get_cgi_var("rootpw", NULL, NULL)))
-# cf->start_server = ds_a_get_cgi_var("start_server", NULL, NULL);
-my $inst = $query->param('servid');
-my @errs;
-my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
+# create inf from CGI parameters
+my $inf = createInfFromCGIParams($query);
+# create the instance
+my @errs = createDSInstance($inf);
if (@errs) {
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
@@ -99,6 +70,7 @@
exit 1;
}
+# set up new DS to be managed by config DS - acis, pta config
# add the parmeters necessary to configure this DS to be managed
# by the console and to be registered with the config DS - these
# are usually passed in via the CGI params, or use reasonable
@@ -119,11 +91,11 @@
}
my $servid = $query->param('servid');
-if ($start_server) {
- # ok to use here because not only will ds_newinst have validated that
+if (!defined($start_server) or $start_server) {
+ # ok to use here because not only will createDSInstance have validated that
# servid contains only good characters, but we test for the existence
# of this file first
- $prog = "@dslibdir@/slapd-$servid/start-slapd";
+ my $prog = "@dslibdir@/slapd-$servid/start-slapd";
if (-x $prog) {
$? = 0;
# run the CGI
@@ -144,12 +116,6 @@
}
# register the new server with the configuration ds
-# get config ds url from input or admconf
-# get admin id from input or admconf
-# must get admin password from input (PASSWORD_PIPE?)
-# get admin domain
-# config ds info
-
if (!registerDSWithConfigDS($servid, \@errs, $inf)) {
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
@@ -161,3 +127,20 @@
print "Content-type: text/plain\n\n";
print "NMC_Status: 0\n";
exit 0;
+
+
+sub createInfFromCGIParams {
+ my $query = shift;
+ my $inf = new Inf;
+ $inf->{General}->{FullMachineName} = $query->param('servname');
+ $inf->{General}->{SuiteSpotUserID} = $query->param('servuser');
+
+ $inf->{slapd}->{ServerPort} = $query->param('servport');
+ $inf->{slapd}->{RootDN} = $query->param('rootdn');
+ $inf->{slapd}->{RootDNPwd} = $query->param('rootpw');
+ $inf->{slapd}->{ServerIdentifier} = $query->param('servid');
+ $inf->{slapd}->{Suffix} = $query->param('suffix');
+ $inf->{slapd}->{start_server} = 0; # we will start it explicitly later
+
+ return $inf;
+}
16 years, 9 months