[Fedora-directory-commits] adminserver Makefile.am, 1.34, 1.35 aclocal.m4, 1.33, 1.34 configure, 1.37, 1.38 missing, 1.23, 1.24 install-sh, 1.23, 1.24 Makefile.in, 1.40, 1.41 depcomp, 1.23, 1.24 config.sub, 1.23, 1.24 config.guess, 1.23, 1.24 compile, 1.22, 1.23
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5290/adminserver
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh
Makefile.in depcomp config.sub config.guess compile
Log Message:
Resolves: bug 186280
Bug Description: Close potential security vulnerabilities in CGI code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is for the CGIs moved into adminserver from ds. There is quite a bit of code here that we don't use anymore. We can also get rid of Import.java and Export.java in the ds console code. This addresses the security issues because, even though the console doesn't ever call the tasks that invoke the CGIs for db2ldif, ldif2db, etc. a malicious user could still attempt to invoke a task remotely and pass in bogus file and directory names.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.am 5 Oct 2007 23:48:01 -0000 1.34
+++ Makefile.am 14 Nov 2007 17:51:55 -0000 1.35
@@ -176,8 +176,7 @@
cgibin_PROGRAMS = admpw security ugdsconfig ReadLog start_config_ds \
config statpingserv viewdata dsconfig monreplication restartsrv \
statusping viewlog htmladmin sec-activate stopsrv download help \
- ds_start ds_restart ds_shutdown ds_ldif2db ds_db2ldif ds_bak2db \
- ds_db2bak ds_listdb ds_rmdb ds_snmpctrl ds_vlvindex ds_addindex
+ ds_start ds_restart ds_shutdown ds_listdb ds_snmpctrl
cgibin_SCRIPTS = admserv/cgi-src40/ds_create \
admserv/cgi-src40/ds_remove \
@@ -206,15 +205,11 @@
libdsa_a_SOURCES = lib/libdsa/dsalib_conf.c \
lib/libdsa/dsalib_debug.c \
- lib/libdsa/dsalib_ldif.c \
lib/libdsa/dsalib_tailf.c \
lib/libdsa/dsalib_confs.c \
- lib/libdsa/dsalib_dn.c \
lib/libdsa/dsalib_location.c \
lib/libdsa/dsalib_updown.c \
lib/libdsa/dsalib_db.c \
- lib/libdsa/dsalib_filename.c \
- lib/libdsa/dsalib_pw.c \
lib/libdsa/dsalib_util.c
libdsa_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include/libdsa @ldapsdk_inc@ @nss_inc@ @nspr_inc@
@@ -292,51 +287,16 @@
ds_shutdown_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_shutdown_LINK = $(MYLINK)
-ds_ldif2db_SOURCES = admserv/cgi-ds/ds_ldif2db.c admserv/cgi-ds/init_ds_env.c
-ds_ldif2db_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_ldif2db_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_ldif2db_LINK = $(MYLINK)
-
-ds_db2ldif_SOURCES = admserv/cgi-ds/ds_db2ldif.c admserv/cgi-ds/init_ds_env.c
-ds_db2ldif_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_db2ldif_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_db2ldif_LINK = $(MYLINK)
-
-ds_bak2db_SOURCES = admserv/cgi-ds/ds_bak2db.c admserv/cgi-ds/init_ds_env.c
-ds_bak2db_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_bak2db_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_bak2db_LINK = $(MYLINK)
-
-ds_db2bak_SOURCES = admserv/cgi-ds/ds_db2bak.c admserv/cgi-ds/init_ds_env.c
-ds_db2bak_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_db2bak_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_db2bak_LINK = $(MYLINK)
-
ds_listdb_SOURCES = admserv/cgi-ds/ds_listdb.c admserv/cgi-ds/init_ds_env.c
ds_listdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_listdb_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_listdb_LINK = $(MYLINK)
-ds_rmdb_SOURCES = admserv/cgi-ds/ds_rmdb.c admserv/cgi-ds/init_ds_env.c
-ds_rmdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_rmdb_LINK = $(MYLINK)
-
ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c
ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_snmpctrl_LINK = $(MYLINK)
-ds_vlvindex_SOURCES = admserv/cgi-ds/vlvindex.c admserv/cgi-ds/init_ds_env.c
-ds_vlvindex_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_vlvindex_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_vlvindex_LINK = $(MYLINK)
-
-ds_addindex_SOURCES = admserv/cgi-ds/addindex.c admserv/cgi-ds/init_ds_env.c
-ds_addindex_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_addindex_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_addindex_LINK = $(MYLINK)
-
############## Data Files ################
HTMLDIR = admserv/html
dist_html_DATA = $(HTMLDIR)/htmladmin.html $(HTMLDIR)/monreplication.html $(HTMLDIR)/viewdata.html $(HTMLDIR)/viewlog.html $(HTMLDIR)/admserv.html
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.in 5 Oct 2007 23:48:02 -0000 1.40
+++ Makefile.in 14 Nov 2007 17:51:55 -0000 1.41
@@ -49,10 +49,7 @@
statusping$(EXEEXT) viewlog$(EXEEXT) htmladmin$(EXEEXT) \
sec-activate$(EXEEXT) stopsrv$(EXEEXT) download$(EXEEXT) \
help$(EXEEXT) ds_start$(EXEEXT) ds_restart$(EXEEXT) \
- ds_shutdown$(EXEEXT) ds_ldif2db$(EXEEXT) ds_db2ldif$(EXEEXT) \
- ds_bak2db$(EXEEXT) ds_db2bak$(EXEEXT) ds_listdb$(EXEEXT) \
- ds_rmdb$(EXEEXT) ds_snmpctrl$(EXEEXT) ds_vlvindex$(EXEEXT) \
- ds_addindex$(EXEEXT)
+ ds_shutdown$(EXEEXT) ds_listdb$(EXEEXT) ds_snmpctrl$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(dist_help_DATA) \
$(dist_html_DATA) $(dist_icon_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -81,15 +78,11 @@
am__dirstamp = $(am__leading_dot)dirstamp
am_libdsa_a_OBJECTS = lib/libdsa/libdsa_a-dsalib_conf.$(OBJEXT) \
lib/libdsa/libdsa_a-dsalib_debug.$(OBJEXT) \
- lib/libdsa/libdsa_a-dsalib_ldif.$(OBJEXT) \
lib/libdsa/libdsa_a-dsalib_tailf.$(OBJEXT) \
lib/libdsa/libdsa_a-dsalib_confs.$(OBJEXT) \
- lib/libdsa/libdsa_a-dsalib_dn.$(OBJEXT) \
lib/libdsa/libdsa_a-dsalib_location.$(OBJEXT) \
lib/libdsa/libdsa_a-dsalib_updown.$(OBJEXT) \
lib/libdsa/libdsa_a-dsalib_db.$(OBJEXT) \
- lib/libdsa/libdsa_a-dsalib_filename.$(OBJEXT) \
- lib/libdsa/libdsa_a-dsalib_pw.$(OBJEXT) \
lib/libdsa/libdsa_a-dsalib_util.$(OBJEXT)
libdsa_a_OBJECTS = $(am_libdsa_a_OBJECTS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -140,29 +133,6 @@
am_download_OBJECTS = admserv/cgi-src40/download.$(OBJEXT)
download_OBJECTS = $(am_download_OBJECTS)
download_LDADD = $(LDADD)
-am_ds_addindex_OBJECTS = \
- admserv/cgi-ds/ds_addindex-addindex.$(OBJEXT) \
- admserv/cgi-ds/ds_addindex-init_ds_env.$(OBJEXT)
-ds_addindex_OBJECTS = $(am_ds_addindex_OBJECTS)
-ds_addindex_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
-am_ds_bak2db_OBJECTS = admserv/cgi-ds/ds_bak2db-ds_bak2db.$(OBJEXT) \
- admserv/cgi-ds/ds_bak2db-init_ds_env.$(OBJEXT)
-ds_bak2db_OBJECTS = $(am_ds_bak2db_OBJECTS)
-ds_bak2db_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
-am_ds_db2bak_OBJECTS = admserv/cgi-ds/ds_db2bak-ds_db2bak.$(OBJEXT) \
- admserv/cgi-ds/ds_db2bak-init_ds_env.$(OBJEXT)
-ds_db2bak_OBJECTS = $(am_ds_db2bak_OBJECTS)
-ds_db2bak_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
-am_ds_db2ldif_OBJECTS = \
- admserv/cgi-ds/ds_db2ldif-ds_db2ldif.$(OBJEXT) \
- admserv/cgi-ds/ds_db2ldif-init_ds_env.$(OBJEXT)
-ds_db2ldif_OBJECTS = $(am_ds_db2ldif_OBJECTS)
-ds_db2ldif_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
-am_ds_ldif2db_OBJECTS = \
- admserv/cgi-ds/ds_ldif2db-ds_ldif2db.$(OBJEXT) \
- admserv/cgi-ds/ds_ldif2db-init_ds_env.$(OBJEXT)
-ds_ldif2db_OBJECTS = $(am_ds_ldif2db_OBJECTS)
-ds_ldif2db_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
am_ds_listdb_OBJECTS = admserv/cgi-ds/ds_listdb-ds_listdb.$(OBJEXT) \
admserv/cgi-ds/ds_listdb-init_ds_env.$(OBJEXT)
ds_listdb_OBJECTS = $(am_ds_listdb_OBJECTS)
@@ -171,10 +141,6 @@
admserv/cgi-ds/ds_restart-init_ds_env.$(OBJEXT)
ds_restart_OBJECTS = $(am_ds_restart_OBJECTS)
ds_restart_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
-am_ds_rmdb_OBJECTS = admserv/cgi-ds/ds_rmdb-ds_rmdb.$(OBJEXT) \
- admserv/cgi-ds/ds_rmdb-init_ds_env.$(OBJEXT)
-ds_rmdb_OBJECTS = $(am_ds_rmdb_OBJECTS)
-ds_rmdb_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
am_ds_shutdown_OBJECTS = \
admserv/cgi-ds/ds_shutdown-shutdown.$(OBJEXT) \
admserv/cgi-ds/ds_shutdown-init_ds_env.$(OBJEXT)
@@ -189,11 +155,6 @@
admserv/cgi-ds/ds_start-init_ds_env.$(OBJEXT)
ds_start_OBJECTS = $(am_ds_start_OBJECTS)
ds_start_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
-am_ds_vlvindex_OBJECTS = \
- admserv/cgi-ds/ds_vlvindex-vlvindex.$(OBJEXT) \
- admserv/cgi-ds/ds_vlvindex-init_ds_env.$(OBJEXT)
-ds_vlvindex_OBJECTS = $(am_ds_vlvindex_OBJECTS)
-ds_vlvindex_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2)
am_dsconfig_OBJECTS = admserv/cgi-src40/dsconfig.$(OBJEXT)
dsconfig_OBJECTS = $(am_dsconfig_OBJECTS)
dsconfig_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -267,13 +228,10 @@
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libdsa_a_SOURCES) $(libds_admin_serv_la_SOURCES) \
$(ReadLog_SOURCES) $(admpw_SOURCES) $(config_SOURCES) \
- $(download_SOURCES) $(ds_addindex_SOURCES) \
- $(ds_bak2db_SOURCES) $(ds_db2bak_SOURCES) \
- $(ds_db2ldif_SOURCES) $(ds_ldif2db_SOURCES) \
- $(ds_listdb_SOURCES) $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
+ $(download_SOURCES) $(ds_listdb_SOURCES) $(ds_restart_SOURCES) \
$(ds_shutdown_SOURCES) $(ds_snmpctrl_SOURCES) \
- $(ds_start_SOURCES) $(ds_vlvindex_SOURCES) $(dsconfig_SOURCES) \
- $(help_SOURCES) $(htmladmin_SOURCES) $(monreplication_SOURCES) \
+ $(ds_start_SOURCES) $(dsconfig_SOURCES) $(help_SOURCES) \
+ $(htmladmin_SOURCES) $(monreplication_SOURCES) \
$(restartsrv_SOURCES) $(sec_activate_SOURCES) \
$(security_SOURCES) $(start_config_ds_SOURCES) \
$(statpingserv_SOURCES) $(statusping_SOURCES) \
@@ -281,13 +239,10 @@
$(viewlog_SOURCES)
DIST_SOURCES = $(libdsa_a_SOURCES) $(libds_admin_serv_la_SOURCES) \
$(ReadLog_SOURCES) $(admpw_SOURCES) $(config_SOURCES) \
- $(download_SOURCES) $(ds_addindex_SOURCES) \
- $(ds_bak2db_SOURCES) $(ds_db2bak_SOURCES) \
- $(ds_db2ldif_SOURCES) $(ds_ldif2db_SOURCES) \
- $(ds_listdb_SOURCES) $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \
+ $(download_SOURCES) $(ds_listdb_SOURCES) $(ds_restart_SOURCES) \
$(ds_shutdown_SOURCES) $(ds_snmpctrl_SOURCES) \
- $(ds_start_SOURCES) $(ds_vlvindex_SOURCES) $(dsconfig_SOURCES) \
- $(help_SOURCES) $(htmladmin_SOURCES) $(monreplication_SOURCES) \
+ $(ds_start_SOURCES) $(dsconfig_SOURCES) $(help_SOURCES) \
+ $(htmladmin_SOURCES) $(monreplication_SOURCES) \
$(restartsrv_SOURCES) $(sec_activate_SOURCES) \
$(security_SOURCES) $(start_config_ds_SOURCES) \
$(statpingserv_SOURCES) $(statusping_SOURCES) \
@@ -638,15 +593,11 @@
libds_admin_serv_la_LINK = $(MYLINK)
libdsa_a_SOURCES = lib/libdsa/dsalib_conf.c \
lib/libdsa/dsalib_debug.c \
- lib/libdsa/dsalib_ldif.c \
lib/libdsa/dsalib_tailf.c \
lib/libdsa/dsalib_confs.c \
- lib/libdsa/dsalib_dn.c \
lib/libdsa/dsalib_location.c \
lib/libdsa/dsalib_updown.c \
lib/libdsa/dsalib_db.c \
- lib/libdsa/dsalib_filename.c \
- lib/libdsa/dsalib_pw.c \
lib/libdsa/dsalib_util.c
libdsa_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include/libdsa @ldapsdk_inc@ @nss_inc@ @nspr_inc@
@@ -719,42 +670,14 @@
ds_shutdown_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_shutdown_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_shutdown_LINK = $(MYLINK)
-ds_ldif2db_SOURCES = admserv/cgi-ds/ds_ldif2db.c admserv/cgi-ds/init_ds_env.c
-ds_ldif2db_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_ldif2db_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_ldif2db_LINK = $(MYLINK)
-ds_db2ldif_SOURCES = admserv/cgi-ds/ds_db2ldif.c admserv/cgi-ds/init_ds_env.c
-ds_db2ldif_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_db2ldif_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_db2ldif_LINK = $(MYLINK)
-ds_bak2db_SOURCES = admserv/cgi-ds/ds_bak2db.c admserv/cgi-ds/init_ds_env.c
-ds_bak2db_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_bak2db_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_bak2db_LINK = $(MYLINK)
-ds_db2bak_SOURCES = admserv/cgi-ds/ds_db2bak.c admserv/cgi-ds/init_ds_env.c
-ds_db2bak_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_db2bak_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_db2bak_LINK = $(MYLINK)
ds_listdb_SOURCES = admserv/cgi-ds/ds_listdb.c admserv/cgi-ds/init_ds_env.c
ds_listdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_listdb_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_listdb_LINK = $(MYLINK)
-ds_rmdb_SOURCES = admserv/cgi-ds/ds_rmdb.c admserv/cgi-ds/init_ds_env.c
-ds_rmdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_rmdb_LINK = $(MYLINK)
ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c
ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS)
ds_snmpctrl_LINK = $(MYLINK)
-ds_vlvindex_SOURCES = admserv/cgi-ds/vlvindex.c admserv/cgi-ds/init_ds_env.c
-ds_vlvindex_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_vlvindex_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_vlvindex_LINK = $(MYLINK)
-ds_addindex_SOURCES = admserv/cgi-ds/addindex.c admserv/cgi-ds/init_ds_env.c
-ds_addindex_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS)
-ds_addindex_LDADD = libdsa.a $(DEFAULT_LIBS)
-ds_addindex_LINK = $(MYLINK)
############## Data Files ################
HTMLDIR = admserv/html
@@ -1010,16 +933,12 @@
lib/libdsa/libdsa_a-dsalib_debug.$(OBJEXT): \
lib/libdsa/$(am__dirstamp) \
lib/libdsa/$(DEPDIR)/$(am__dirstamp)
-lib/libdsa/libdsa_a-dsalib_ldif.$(OBJEXT): lib/libdsa/$(am__dirstamp) \
- lib/libdsa/$(DEPDIR)/$(am__dirstamp)
lib/libdsa/libdsa_a-dsalib_tailf.$(OBJEXT): \
lib/libdsa/$(am__dirstamp) \
lib/libdsa/$(DEPDIR)/$(am__dirstamp)
lib/libdsa/libdsa_a-dsalib_confs.$(OBJEXT): \
lib/libdsa/$(am__dirstamp) \
lib/libdsa/$(DEPDIR)/$(am__dirstamp)
-lib/libdsa/libdsa_a-dsalib_dn.$(OBJEXT): lib/libdsa/$(am__dirstamp) \
- lib/libdsa/$(DEPDIR)/$(am__dirstamp)
lib/libdsa/libdsa_a-dsalib_location.$(OBJEXT): \
lib/libdsa/$(am__dirstamp) \
lib/libdsa/$(DEPDIR)/$(am__dirstamp)
@@ -1028,11 +947,6 @@
lib/libdsa/$(DEPDIR)/$(am__dirstamp)
lib/libdsa/libdsa_a-dsalib_db.$(OBJEXT): lib/libdsa/$(am__dirstamp) \
lib/libdsa/$(DEPDIR)/$(am__dirstamp)
-lib/libdsa/libdsa_a-dsalib_filename.$(OBJEXT): \
- lib/libdsa/$(am__dirstamp) \
- lib/libdsa/$(DEPDIR)/$(am__dirstamp)
-lib/libdsa/libdsa_a-dsalib_pw.$(OBJEXT): lib/libdsa/$(am__dirstamp) \
- lib/libdsa/$(DEPDIR)/$(am__dirstamp)
lib/libdsa/libdsa_a-dsalib_util.$(OBJEXT): lib/libdsa/$(am__dirstamp) \
lib/libdsa/$(DEPDIR)/$(am__dirstamp)
libdsa.a: $(libdsa_a_OBJECTS) $(libdsa_a_DEPENDENCIES)
@@ -1186,51 +1100,6 @@
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) admserv/cgi-ds/$(DEPDIR)
@: > admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_addindex-addindex.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_addindex-init_ds_env.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-ds_addindex$(EXEEXT): $(ds_addindex_OBJECTS) $(ds_addindex_DEPENDENCIES)
- @rm -f ds_addindex$(EXEEXT)
- $(ds_addindex_LINK) $(ds_addindex_LDFLAGS) $(ds_addindex_OBJECTS) $(ds_addindex_LDADD) $(LIBS)
-admserv/cgi-ds/ds_bak2db-ds_bak2db.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_bak2db-init_ds_env.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-ds_bak2db$(EXEEXT): $(ds_bak2db_OBJECTS) $(ds_bak2db_DEPENDENCIES)
- @rm -f ds_bak2db$(EXEEXT)
- $(ds_bak2db_LINK) $(ds_bak2db_LDFLAGS) $(ds_bak2db_OBJECTS) $(ds_bak2db_LDADD) $(LIBS)
-admserv/cgi-ds/ds_db2bak-ds_db2bak.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_db2bak-init_ds_env.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-ds_db2bak$(EXEEXT): $(ds_db2bak_OBJECTS) $(ds_db2bak_DEPENDENCIES)
- @rm -f ds_db2bak$(EXEEXT)
- $(ds_db2bak_LINK) $(ds_db2bak_LDFLAGS) $(ds_db2bak_OBJECTS) $(ds_db2bak_LDADD) $(LIBS)
-admserv/cgi-ds/ds_db2ldif-ds_db2ldif.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_db2ldif-init_ds_env.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-ds_db2ldif$(EXEEXT): $(ds_db2ldif_OBJECTS) $(ds_db2ldif_DEPENDENCIES)
- @rm -f ds_db2ldif$(EXEEXT)
- $(ds_db2ldif_LINK) $(ds_db2ldif_LDFLAGS) $(ds_db2ldif_OBJECTS) $(ds_db2ldif_LDADD) $(LIBS)
-admserv/cgi-ds/ds_ldif2db-ds_ldif2db.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_ldif2db-init_ds_env.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-ds_ldif2db$(EXEEXT): $(ds_ldif2db_OBJECTS) $(ds_ldif2db_DEPENDENCIES)
- @rm -f ds_ldif2db$(EXEEXT)
- $(ds_ldif2db_LINK) $(ds_ldif2db_LDFLAGS) $(ds_ldif2db_OBJECTS) $(ds_ldif2db_LDADD) $(LIBS)
admserv/cgi-ds/ds_listdb-ds_listdb.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1249,15 +1118,6 @@
ds_restart$(EXEEXT): $(ds_restart_OBJECTS) $(ds_restart_DEPENDENCIES)
@rm -f ds_restart$(EXEEXT)
$(ds_restart_LINK) $(ds_restart_LDFLAGS) $(ds_restart_OBJECTS) $(ds_restart_LDADD) $(LIBS)
-admserv/cgi-ds/ds_rmdb-ds_rmdb.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_rmdb-init_ds_env.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-ds_rmdb$(EXEEXT): $(ds_rmdb_OBJECTS) $(ds_rmdb_DEPENDENCIES)
- @rm -f ds_rmdb$(EXEEXT)
- $(ds_rmdb_LINK) $(ds_rmdb_LDFLAGS) $(ds_rmdb_OBJECTS) $(ds_rmdb_LDADD) $(LIBS)
admserv/cgi-ds/ds_shutdown-shutdown.$(OBJEXT): \
admserv/cgi-ds/$(am__dirstamp) \
admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
@@ -1285,15 +1145,6 @@
ds_start$(EXEEXT): $(ds_start_OBJECTS) $(ds_start_DEPENDENCIES)
@rm -f ds_start$(EXEEXT)
$(ds_start_LINK) $(ds_start_LDFLAGS) $(ds_start_OBJECTS) $(ds_start_LDADD) $(LIBS)
-admserv/cgi-ds/ds_vlvindex-vlvindex.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-admserv/cgi-ds/ds_vlvindex-init_ds_env.$(OBJEXT): \
- admserv/cgi-ds/$(am__dirstamp) \
- admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp)
-ds_vlvindex$(EXEEXT): $(ds_vlvindex_OBJECTS) $(ds_vlvindex_DEPENDENCIES)
- @rm -f ds_vlvindex$(EXEEXT)
- $(ds_vlvindex_LINK) $(ds_vlvindex_LDFLAGS) $(ds_vlvindex_OBJECTS) $(ds_vlvindex_LDADD) $(LIBS)
admserv/cgi-src40/dsconfig.$(OBJEXT): \
admserv/cgi-src40/$(am__dirstamp) \
admserv/cgi-src40/$(DEPDIR)/$(am__dirstamp)
@@ -1494,30 +1345,16 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_addindex-addindex.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_addindex-init_ds_env.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_bak2db-ds_bak2db.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_bak2db-init_ds_env.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_db2bak-ds_db2bak.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_db2bak-init_ds_env.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_db2ldif-ds_db2ldif.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_db2ldif-init_ds_env.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_ldif2db-ds_ldif2db.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_ldif2db-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_listdb-ds_listdb.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_listdb-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_restart-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_restart-restart.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_rmdb-ds_rmdb.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_rmdb-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_shutdown-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_shutdown-shutdown.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_snmpctrl-ds_snmpctrl.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_snmpctrl-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_start-init_ds_env.$(OBJEXT)
-rm -f admserv/cgi-ds/ds_start-start.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_vlvindex-init_ds_env.$(OBJEXT)
- -rm -f admserv/cgi-ds/ds_vlvindex-vlvindex.$(OBJEXT)
-rm -f admserv/cgi-src40/ReadLog.$(OBJEXT)
-rm -f admserv/cgi-src40/admpw.$(OBJEXT)
-rm -f admserv/cgi-src40/config.$(OBJEXT)
@@ -1566,11 +1403,7 @@
-rm -f lib/libdsa/libdsa_a-dsalib_confs.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_db.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_debug.$(OBJEXT)
- -rm -f lib/libdsa/libdsa_a-dsalib_dn.$(OBJEXT)
- -rm -f lib/libdsa/libdsa_a-dsalib_filename.$(OBJEXT)
- -rm -f lib/libdsa/libdsa_a-dsalib_ldif.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_location.$(OBJEXT)
- -rm -f lib/libdsa/libdsa_a-dsalib_pw.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_tailf.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_updown.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_util.$(OBJEXT)
@@ -1590,30 +1423,16 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_addindex-addindex.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_addindex-init_ds_env.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_bak2db-ds_bak2db.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_bak2db-init_ds_env.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_db2bak-ds_db2bak.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_db2bak-init_ds_env.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-ds_db2ldif.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-init_ds_env.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-ds_ldif2db.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_listdb-ds_listdb.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_listdb-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_restart-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_rmdb-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_shutdown-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_shutdown-shutdown.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_snmpctrl-ds_snmpctrl.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_snmpctrl-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_start-init_ds_env.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_start-start.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-init_ds_env.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-vlvindex.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-src40/$(DEPDIR)/ReadLog.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-src40/$(DEPDIR)/admpw.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-src40/$(DEPDIR)/config.Po(a)am__quote@
@@ -1649,11 +1468,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_confs.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_db.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_debug.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_dn.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_filename.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_ldif.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_location.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_pw.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_tailf.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_updown.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_util.Po(a)am__quote@
@@ -1716,20 +1531,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_debug.obj `if test -f 'lib/libdsa/dsalib_debug.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_debug.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_debug.c'; fi`
-lib/libdsa/libdsa_a-dsalib_ldif.o: lib/libdsa/dsalib_ldif.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_ldif.o -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_ldif.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_ldif.o `test -f 'lib/libdsa/dsalib_ldif.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_ldif.c; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_ldif.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_ldif.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_ldif.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libdsa/dsalib_ldif.c' object='lib/libdsa/libdsa_a-dsalib_ldif.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_ldif.o `test -f 'lib/libdsa/dsalib_ldif.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_ldif.c
-
-lib/libdsa/libdsa_a-dsalib_ldif.obj: lib/libdsa/dsalib_ldif.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_ldif.obj -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_ldif.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_ldif.obj `if test -f 'lib/libdsa/dsalib_ldif.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_ldif.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_ldif.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_ldif.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_ldif.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_ldif.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libdsa/dsalib_ldif.c' object='lib/libdsa/libdsa_a-dsalib_ldif.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_ldif.obj `if test -f 'lib/libdsa/dsalib_ldif.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_ldif.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_ldif.c'; fi`
-
lib/libdsa/libdsa_a-dsalib_tailf.o: lib/libdsa/dsalib_tailf.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_tailf.o -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_tailf.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_tailf.o `test -f 'lib/libdsa/dsalib_tailf.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_tailf.c; \
@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_tailf.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_tailf.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_tailf.Tpo"; exit 1; fi
@@ -1758,20 +1559,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_confs.obj `if test -f 'lib/libdsa/dsalib_confs.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_confs.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_confs.c'; fi`
-lib/libdsa/libdsa_a-dsalib_dn.o: lib/libdsa/dsalib_dn.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_dn.o -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_dn.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_dn.o `test -f 'lib/libdsa/dsalib_dn.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_dn.c; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_dn.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_dn.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_dn.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libdsa/dsalib_dn.c' object='lib/libdsa/libdsa_a-dsalib_dn.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_dn.o `test -f 'lib/libdsa/dsalib_dn.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_dn.c
-
-lib/libdsa/libdsa_a-dsalib_dn.obj: lib/libdsa/dsalib_dn.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_dn.obj -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_dn.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_dn.obj `if test -f 'lib/libdsa/dsalib_dn.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_dn.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_dn.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_dn.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_dn.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_dn.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libdsa/dsalib_dn.c' object='lib/libdsa/libdsa_a-dsalib_dn.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_dn.obj `if test -f 'lib/libdsa/dsalib_dn.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_dn.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_dn.c'; fi`
-
lib/libdsa/libdsa_a-dsalib_location.o: lib/libdsa/dsalib_location.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_location.o -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_location.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_location.o `test -f 'lib/libdsa/dsalib_location.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_location.c; \
@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_location.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_location.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_location.Tpo"; exit 1; fi
@@ -1814,34 +1601,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_db.obj `if test -f 'lib/libdsa/dsalib_db.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_db.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_db.c'; fi`
-lib/libdsa/libdsa_a-dsalib_filename.o: lib/libdsa/dsalib_filename.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_filename.o -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_filename.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_filename.o `test -f 'lib/libdsa/dsalib_filename.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_filename.c; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_filename.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_filename.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_filename.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libdsa/dsalib_filename.c' object='lib/libdsa/libdsa_a-dsalib_filename.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_filename.o `test -f 'lib/libdsa/dsalib_filename.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_filename.c
-
-lib/libdsa/libdsa_a-dsalib_filename.obj: lib/libdsa/dsalib_filename.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_filename.obj -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_filename.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_filename.obj `if test -f 'lib/libdsa/dsalib_filename.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_filename.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_filename.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_filename.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_filename.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_filename.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libdsa/dsalib_filename.c' object='lib/libdsa/libdsa_a-dsalib_filename.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_filename.obj `if test -f 'lib/libdsa/dsalib_filename.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_filename.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_filename.c'; fi`
-
-lib/libdsa/libdsa_a-dsalib_pw.o: lib/libdsa/dsalib_pw.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_pw.o -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_pw.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_pw.o `test -f 'lib/libdsa/dsalib_pw.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_pw.c; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_pw.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_pw.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_pw.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libdsa/dsalib_pw.c' object='lib/libdsa/libdsa_a-dsalib_pw.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_pw.o `test -f 'lib/libdsa/dsalib_pw.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_pw.c
-
-lib/libdsa/libdsa_a-dsalib_pw.obj: lib/libdsa/dsalib_pw.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_pw.obj -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_pw.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_pw.obj `if test -f 'lib/libdsa/dsalib_pw.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_pw.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_pw.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_pw.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_pw.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_pw.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib/libdsa/dsalib_pw.c' object='lib/libdsa/libdsa_a-dsalib_pw.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_pw.obj `if test -f 'lib/libdsa/dsalib_pw.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_pw.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_pw.c'; fi`
-
lib/libdsa/libdsa_a-dsalib_util.o: lib/libdsa/dsalib_util.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libdsa/libdsa_a-dsalib_util.o -MD -MP -MF "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_util.Tpo" -c -o lib/libdsa/libdsa_a-dsalib_util.o `test -f 'lib/libdsa/dsalib_util.c' || echo '$(srcdir)/'`lib/libdsa/dsalib_util.c; \
@am__fastdepCC_TRUE@ then mv -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_util.Tpo" "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_util.Po"; else rm -f "lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_util.Tpo"; exit 1; fi
@@ -1856,146 +1615,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsa_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libdsa/libdsa_a-dsalib_util.obj `if test -f 'lib/libdsa/dsalib_util.c'; then $(CYGPATH_W) 'lib/libdsa/dsalib_util.c'; else $(CYGPATH_W) '$(srcdir)/lib/libdsa/dsalib_util.c'; fi`
-admserv/cgi-ds/ds_addindex-addindex.o: admserv/cgi-ds/addindex.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_addindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_addindex-addindex.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_addindex-addindex.Tpo" -c -o admserv/cgi-ds/ds_addindex-addindex.o `test -f 'admserv/cgi-ds/addindex.c' || echo '$(srcdir)/'`admserv/cgi-ds/addindex.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_addindex-addindex.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_addindex-addindex.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_addindex-addindex.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/addindex.c' object='admserv/cgi-ds/ds_addindex-addindex.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_addindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_addindex-addindex.o `test -f 'admserv/cgi-ds/addindex.c' || echo '$(srcdir)/'`admserv/cgi-ds/addindex.c
-
-admserv/cgi-ds/ds_addindex-addindex.obj: admserv/cgi-ds/addindex.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_addindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_addindex-addindex.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_addindex-addindex.Tpo" -c -o admserv/cgi-ds/ds_addindex-addindex.obj `if test -f 'admserv/cgi-ds/addindex.c'; then $(CYGPATH_W) 'admserv/cgi-ds/addindex.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/addindex.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_addindex-addindex.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_addindex-addindex.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_addindex-addindex.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/addindex.c' object='admserv/cgi-ds/ds_addindex-addindex.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_addindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_addindex-addindex.obj `if test -f 'admserv/cgi-ds/addindex.c'; then $(CYGPATH_W) 'admserv/cgi-ds/addindex.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/addindex.c'; fi`
-
-admserv/cgi-ds/ds_addindex-init_ds_env.o: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_addindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_addindex-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_addindex-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_addindex-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_addindex-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_addindex-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_addindex-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_addindex-init_ds_env.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_addindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_addindex-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c
-
-admserv/cgi-ds/ds_addindex-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_addindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_addindex-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_addindex-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_addindex-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_addindex-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_addindex-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_addindex-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_addindex-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_addindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_addindex-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-
-admserv/cgi-ds/ds_bak2db-ds_bak2db.o: admserv/cgi-ds/ds_bak2db.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_bak2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_bak2db-ds_bak2db.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-ds_bak2db.Tpo" -c -o admserv/cgi-ds/ds_bak2db-ds_bak2db.o `test -f 'admserv/cgi-ds/ds_bak2db.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_bak2db.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-ds_bak2db.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-ds_bak2db.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-ds_bak2db.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_bak2db.c' object='admserv/cgi-ds/ds_bak2db-ds_bak2db.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_bak2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_bak2db-ds_bak2db.o `test -f 'admserv/cgi-ds/ds_bak2db.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_bak2db.c
-
-admserv/cgi-ds/ds_bak2db-ds_bak2db.obj: admserv/cgi-ds/ds_bak2db.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_bak2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_bak2db-ds_bak2db.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-ds_bak2db.Tpo" -c -o admserv/cgi-ds/ds_bak2db-ds_bak2db.obj `if test -f 'admserv/cgi-ds/ds_bak2db.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_bak2db.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_bak2db.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-ds_bak2db.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-ds_bak2db.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-ds_bak2db.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_bak2db.c' object='admserv/cgi-ds/ds_bak2db-ds_bak2db.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_bak2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_bak2db-ds_bak2db.obj `if test -f 'admserv/cgi-ds/ds_bak2db.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_bak2db.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_bak2db.c'; fi`
-
-admserv/cgi-ds/ds_bak2db-init_ds_env.o: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_bak2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_bak2db-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_bak2db-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_bak2db-init_ds_env.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_bak2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_bak2db-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c
-
-admserv/cgi-ds/ds_bak2db-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_bak2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_bak2db-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_bak2db-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_bak2db-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_bak2db-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_bak2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_bak2db-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-
-admserv/cgi-ds/ds_db2bak-ds_db2bak.o: admserv/cgi-ds/ds_db2bak.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2bak_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_db2bak-ds_db2bak.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-ds_db2bak.Tpo" -c -o admserv/cgi-ds/ds_db2bak-ds_db2bak.o `test -f 'admserv/cgi-ds/ds_db2bak.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_db2bak.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-ds_db2bak.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-ds_db2bak.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-ds_db2bak.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_db2bak.c' object='admserv/cgi-ds/ds_db2bak-ds_db2bak.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2bak_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_db2bak-ds_db2bak.o `test -f 'admserv/cgi-ds/ds_db2bak.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_db2bak.c
-
-admserv/cgi-ds/ds_db2bak-ds_db2bak.obj: admserv/cgi-ds/ds_db2bak.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2bak_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_db2bak-ds_db2bak.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-ds_db2bak.Tpo" -c -o admserv/cgi-ds/ds_db2bak-ds_db2bak.obj `if test -f 'admserv/cgi-ds/ds_db2bak.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_db2bak.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_db2bak.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-ds_db2bak.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-ds_db2bak.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-ds_db2bak.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_db2bak.c' object='admserv/cgi-ds/ds_db2bak-ds_db2bak.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2bak_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_db2bak-ds_db2bak.obj `if test -f 'admserv/cgi-ds/ds_db2bak.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_db2bak.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_db2bak.c'; fi`
-
-admserv/cgi-ds/ds_db2bak-init_ds_env.o: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2bak_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_db2bak-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_db2bak-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_db2bak-init_ds_env.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2bak_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_db2bak-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c
-
-admserv/cgi-ds/ds_db2bak-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2bak_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_db2bak-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_db2bak-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_db2bak-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_db2bak-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2bak_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_db2bak-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-
-admserv/cgi-ds/ds_db2ldif-ds_db2ldif.o: admserv/cgi-ds/ds_db2ldif.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2ldif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_db2ldif-ds_db2ldif.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-ds_db2ldif.Tpo" -c -o admserv/cgi-ds/ds_db2ldif-ds_db2ldif.o `test -f 'admserv/cgi-ds/ds_db2ldif.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_db2ldif.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-ds_db2ldif.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-ds_db2ldif.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-ds_db2ldif.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_db2ldif.c' object='admserv/cgi-ds/ds_db2ldif-ds_db2ldif.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2ldif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_db2ldif-ds_db2ldif.o `test -f 'admserv/cgi-ds/ds_db2ldif.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_db2ldif.c
-
-admserv/cgi-ds/ds_db2ldif-ds_db2ldif.obj: admserv/cgi-ds/ds_db2ldif.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2ldif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_db2ldif-ds_db2ldif.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-ds_db2ldif.Tpo" -c -o admserv/cgi-ds/ds_db2ldif-ds_db2ldif.obj `if test -f 'admserv/cgi-ds/ds_db2ldif.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_db2ldif.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_db2ldif.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-ds_db2ldif.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-ds_db2ldif.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-ds_db2ldif.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_db2ldif.c' object='admserv/cgi-ds/ds_db2ldif-ds_db2ldif.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2ldif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_db2ldif-ds_db2ldif.obj `if test -f 'admserv/cgi-ds/ds_db2ldif.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_db2ldif.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_db2ldif.c'; fi`
-
-admserv/cgi-ds/ds_db2ldif-init_ds_env.o: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2ldif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_db2ldif-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_db2ldif-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_db2ldif-init_ds_env.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2ldif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_db2ldif-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c
-
-admserv/cgi-ds/ds_db2ldif-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2ldif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_db2ldif-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_db2ldif-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_db2ldif-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_db2ldif-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_db2ldif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_db2ldif-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-
-admserv/cgi-ds/ds_ldif2db-ds_ldif2db.o: admserv/cgi-ds/ds_ldif2db.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_ldif2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_ldif2db-ds_ldif2db.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-ds_ldif2db.Tpo" -c -o admserv/cgi-ds/ds_ldif2db-ds_ldif2db.o `test -f 'admserv/cgi-ds/ds_ldif2db.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_ldif2db.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-ds_ldif2db.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-ds_ldif2db.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-ds_ldif2db.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_ldif2db.c' object='admserv/cgi-ds/ds_ldif2db-ds_ldif2db.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_ldif2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_ldif2db-ds_ldif2db.o `test -f 'admserv/cgi-ds/ds_ldif2db.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_ldif2db.c
-
-admserv/cgi-ds/ds_ldif2db-ds_ldif2db.obj: admserv/cgi-ds/ds_ldif2db.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_ldif2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_ldif2db-ds_ldif2db.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-ds_ldif2db.Tpo" -c -o admserv/cgi-ds/ds_ldif2db-ds_ldif2db.obj `if test -f 'admserv/cgi-ds/ds_ldif2db.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_ldif2db.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_ldif2db.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-ds_ldif2db.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-ds_ldif2db.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-ds_ldif2db.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_ldif2db.c' object='admserv/cgi-ds/ds_ldif2db-ds_ldif2db.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_ldif2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_ldif2db-ds_ldif2db.obj `if test -f 'admserv/cgi-ds/ds_ldif2db.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_ldif2db.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_ldif2db.c'; fi`
-
-admserv/cgi-ds/ds_ldif2db-init_ds_env.o: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_ldif2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_ldif2db-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_ldif2db-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_ldif2db-init_ds_env.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_ldif2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_ldif2db-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c
-
-admserv/cgi-ds/ds_ldif2db-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_ldif2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_ldif2db-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_ldif2db-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_ldif2db-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_ldif2db_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_ldif2db-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-
admserv/cgi-ds/ds_listdb-ds_listdb.o: admserv/cgi-ds/ds_listdb.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_listdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_listdb-ds_listdb.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_listdb-ds_listdb.Tpo" -c -o admserv/cgi-ds/ds_listdb-ds_listdb.o `test -f 'admserv/cgi-ds/ds_listdb.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_listdb.c; \
@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_listdb-ds_listdb.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_listdb-ds_listdb.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_listdb-ds_listdb.Tpo"; exit 1; fi
@@ -2052,34 +1671,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_restart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_restart-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-admserv/cgi-ds/ds_rmdb-ds_rmdb.o: admserv/cgi-ds/ds_rmdb.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_rmdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_rmdb-ds_rmdb.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Tpo" -c -o admserv/cgi-ds/ds_rmdb-ds_rmdb.o `test -f 'admserv/cgi-ds/ds_rmdb.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_rmdb.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_rmdb.c' object='admserv/cgi-ds/ds_rmdb-ds_rmdb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_rmdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_rmdb-ds_rmdb.o `test -f 'admserv/cgi-ds/ds_rmdb.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_rmdb.c
-
-admserv/cgi-ds/ds_rmdb-ds_rmdb.obj: admserv/cgi-ds/ds_rmdb.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_rmdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_rmdb-ds_rmdb.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Tpo" -c -o admserv/cgi-ds/ds_rmdb-ds_rmdb.obj `if test -f 'admserv/cgi-ds/ds_rmdb.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_rmdb.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_rmdb.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_rmdb.c' object='admserv/cgi-ds/ds_rmdb-ds_rmdb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_rmdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_rmdb-ds_rmdb.obj `if test -f 'admserv/cgi-ds/ds_rmdb.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_rmdb.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_rmdb.c'; fi`
-
-admserv/cgi-ds/ds_rmdb-init_ds_env.o: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_rmdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_rmdb-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_rmdb-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_rmdb-init_ds_env.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_rmdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_rmdb-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c
-
-admserv/cgi-ds/ds_rmdb-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_rmdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_rmdb-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_rmdb-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_rmdb-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_rmdb-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_rmdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_rmdb-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-
admserv/cgi-ds/ds_shutdown-shutdown.o: admserv/cgi-ds/shutdown.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_shutdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_shutdown-shutdown.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_shutdown-shutdown.Tpo" -c -o admserv/cgi-ds/ds_shutdown-shutdown.o `test -f 'admserv/cgi-ds/shutdown.c' || echo '$(srcdir)/'`admserv/cgi-ds/shutdown.c; \
@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_shutdown-shutdown.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_shutdown-shutdown.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_shutdown-shutdown.Tpo"; exit 1; fi
@@ -2164,34 +1755,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_start_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_start-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-admserv/cgi-ds/ds_vlvindex-vlvindex.o: admserv/cgi-ds/vlvindex.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_vlvindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_vlvindex-vlvindex.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-vlvindex.Tpo" -c -o admserv/cgi-ds/ds_vlvindex-vlvindex.o `test -f 'admserv/cgi-ds/vlvindex.c' || echo '$(srcdir)/'`admserv/cgi-ds/vlvindex.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-vlvindex.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-vlvindex.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-vlvindex.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/vlvindex.c' object='admserv/cgi-ds/ds_vlvindex-vlvindex.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_vlvindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_vlvindex-vlvindex.o `test -f 'admserv/cgi-ds/vlvindex.c' || echo '$(srcdir)/'`admserv/cgi-ds/vlvindex.c
-
-admserv/cgi-ds/ds_vlvindex-vlvindex.obj: admserv/cgi-ds/vlvindex.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_vlvindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_vlvindex-vlvindex.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-vlvindex.Tpo" -c -o admserv/cgi-ds/ds_vlvindex-vlvindex.obj `if test -f 'admserv/cgi-ds/vlvindex.c'; then $(CYGPATH_W) 'admserv/cgi-ds/vlvindex.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/vlvindex.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-vlvindex.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-vlvindex.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-vlvindex.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/vlvindex.c' object='admserv/cgi-ds/ds_vlvindex-vlvindex.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_vlvindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_vlvindex-vlvindex.obj `if test -f 'admserv/cgi-ds/vlvindex.c'; then $(CYGPATH_W) 'admserv/cgi-ds/vlvindex.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/vlvindex.c'; fi`
-
-admserv/cgi-ds/ds_vlvindex-init_ds_env.o: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_vlvindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_vlvindex-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_vlvindex-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_vlvindex-init_ds_env.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_vlvindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_vlvindex-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c
-
-admserv/cgi-ds/ds_vlvindex-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_vlvindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_vlvindex-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_vlvindex-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_vlvindex-init_ds_env.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_vlvindex-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_vlvindex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_vlvindex-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-
.cpp.o:
@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
16 years, 5 months
[Fedora-directory-commits] adminserver/admserv/cgi-ds addindex.c, 1.2, NONE ds_bak2db.c, 1.2, NONE ds_db2bak.c, 1.2, NONE ds_db2ldif.c, 1.2, NONE ds_ldif2db.c, 1.2, NONE ds_rmdb.c, 1.2, NONE vlvindex.c, 1.2, NONE
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-ds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5290/adminserver/admserv/cgi-ds
Removed Files:
addindex.c ds_bak2db.c ds_db2bak.c ds_db2ldif.c ds_ldif2db.c
ds_rmdb.c vlvindex.c
Log Message:
Resolves: bug 186280
Bug Description: Close potential security vulnerabilities in CGI code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is for the CGIs moved into adminserver from ds. There is quite a bit of code here that we don't use anymore. We can also get rid of Import.java and Export.java in the ds console code. This addresses the security issues because, even though the console doesn't ever call the tasks that invoke the CGIs for db2ldif, ldif2db, etc. a malicious user could still attempt to invoke a task remotely and pass in bogus file and directory names.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
--- addindex.c DELETED ---
--- ds_bak2db.c DELETED ---
--- ds_db2bak.c DELETED ---
--- ds_db2ldif.c DELETED ---
--- ds_ldif2db.c DELETED ---
--- ds_rmdb.c DELETED ---
--- vlvindex.c DELETED ---
16 years, 5 months
[Fedora-directory-commits] admservconsole/help/en/help add_crl_ckl.html, 1.1, 1.2 certificate_information_detail.html, 1.1, 1.2 certificate_request_wizard_introduction.html, 1.1, 1.2 configure_administration_server_access.html, 1.1, 1.2 configure_administration_server_configuration_ds.html, 1.1, 1.2 configure_administration_server_encryption.html, 1.1, 1.2 configure_administration_server_network.html, 1.1, 1.2 configure_administration_server_user_ds.html, 1.1, 1.2 create_user_administrator.html, 1.1, 1.2 ho
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/admservconsole/help/en/help
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27109/en/help
Modified Files:
add_crl_ckl.html certificate_information_detail.html
certificate_request_wizard_introduction.html
configure_administration_server_access.html
configure_administration_server_configuration_ds.html
configure_administration_server_encryption.html
configure_administration_server_network.html
configure_administration_server_user_ds.html
create_user_administrator.html host_information.html
logging_options.html manage_certificates_ca_certs.html
manage_certificates_revoked_certs.html
select_organizational_unit.html server_group_information.html
server_information.html
set_security_device_password_change_security_device_password.html
users_and_groups.html
Log Message:
Resolves: 379211
Summary: Online help corrections.
Index: add_crl_ckl.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/add_crl_ckl.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- add_crl_ckl.html 9 Aug 2007 16:04:04 -0000 1.1
+++ add_crl_ckl.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -6,7 +6,7 @@
Use this dialog box to add a Certificate Revocation List (CRL) or a Compromised Key List (CKL) to the trust database.
</p>
<p class="text">
-<b>Enter full path to CRL/CKL file.</b> Provide the full path to the file containing the CRL or CKL.
+<b>Enter CRL/CKL file.</b> Provide the name of the file containing the CRL or CKL. This file must exist in the same directory as your key and cert database.
</p>
<p class="text">
<b>File contains a Certificate Revocation List (CRL).</b> Select this option if the file contains a CRL.
Index: certificate_information_detail.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/certificate_information_detail.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- certificate_information_detail.html 9 Aug 2007 16:04:04 -0000 1.1
+++ certificate_information_detail.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -7,7 +7,23 @@
</p>
<p class="text">
-<b>Organizational Unit.</b> If an organizational unit was specified during the certificate request process, it is displayed here.
+<b>Locality.</b> If a locality was specified during the certificate request process, it is displayed here.
+</p>
+
+<p class="text">
+<b>Organization.</b> If an organization was specified during the certificate request process, it is displayed here.
+</p>
+
+<p class="text">
+<b>Organization Unit.</b> If an organization unit was specified during the certificate request process, it is displayed here.
+</p>
+
+<p class="text">
+<b>State.</b> If a state was specified during the certificate request process, it is displayed here.
+</p>
+
+<p class="text">
+<b>Country.</b> If a country was specified during the certificate request process, it is displayed here.
</p>
<p class="text">
Index: certificate_request_wizard_introduction.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/certificate_request_wizard_introduction.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- certificate_request_wizard_introduction.html 9 Aug 2007 16:04:04 -0000 1.1
+++ certificate_request_wizard_introduction.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -3,7 +3,7 @@
</p>
<p class="text">
-You can use Management Console to generate a manual or automatic certificate request. A manual request requires you to submit information to a CA. An automatic request is submitted for you by Console. In order to send an automatic request to a CA, you need to obtain a plug-in. For more information, contact your CA.
+You can use the Management Console to generate a manual or automatic certificate request. A manual request requires you to submit information to a CA. An automatic request is submitted for you by Console. In order to send an automatic request to a CA, you need to obtain a plug-in. For more information, contact your CA.
</p>
<p class="text">
Index: configure_administration_server_access.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/configure_administration_server_access.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure_administration_server_access.html 9 Aug 2007 16:04:04 -0000 1.1
+++ configure_administration_server_access.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -3,13 +3,10 @@
</p>
<p class="text">
-Use this tab to specify a user name and password for the Administration Server Administrator and to enable or disable Directory Server Gateway access.
+Use this tab to specify a user name and password for the Administration Server Administrator.
</p>
<p class="text">
-The Administration Server Administrator is a special user that has full access to all features in the Administration Server. This user is created during installation for the purpose of starting Console if a Directory Server is unavailable. The Administration Server Administrator user name and password are stored in the file <code><server_root>/admin-serv/config/admpw</code>.
-</p>
-<p class="text">
-The Directory Server Gateway is a service that provides web-based access to the entire user directory. The Directory Server Gateway must be installed before you can use this option.
+The Administration Server Administrator is a special user that has full access to all features in the Administration Server. This user is created during installation. The Administration Server Administrator user name and password are stored in the file <code>admpw</code> in your Administration Server configuration directory.
</p>
<p class="text">
<b>User name.</b> Enter the user ID for the Administration Server Administrator.
Index: configure_administration_server_configuration_ds.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/configure_administration_server_configuration_ds.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure_administration_server_configuration_ds.html 9 Aug 2007 16:04:04 -0000 1.1
+++ configure_administration_server_configuration_ds.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -15,5 +15,5 @@
<b>LDAP Port.</b> Enter the port number for the configuration directory that this Administration Server uses.
</p>
<p class="text">
-<b>Secure Connection.</b> Select this option if the configuration directory is already SSL enabled.
+<b>Secure Connection.</b> Select this option if you would like the Administration Server to communicate with the configuration directory using SSL.
</p>
Index: configure_administration_server_encryption.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/configure_administration_server_encryption.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure_administration_server_encryption.html 9 Aug 2007 16:04:04 -0000 1.1
+++ configure_administration_server_encryption.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -9,7 +9,7 @@
<b>Enable SSL for this server.</b> Select this option if you want to secure this server with Secure Sockets Layer (SSL) encryption. All other SSL encryption options listed here become available to you only when you enable SSL by checking this box.
</p>
<p class="text">
-<b>Use this cipher family.</b> When you enable SSL encryption, the cipher families available to you are listed here. The Management Console currently supports two cipher families: RSA and Fortezza. The internal security device supports only RSA. If you're using a Fortezza card, you'll also see the Fortezza cipher family listed in the Encryption tab. Select the cipher families you want to use.
+<b>Use this cipher family.</b> When you enable SSL encryption, the cipher families available to you are listed here. The internal security device supports only the RSA cipher family.
</p>
<p class="text">
<b>Security Device.</b> Choose internal (software) if the key is stored in the local key database. All other choices on this list are available only if you are using an external module.
Index: configure_administration_server_network.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/configure_administration_server_network.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure_administration_server_network.html 9 Aug 2007 16:04:04 -0000 1.1
+++ configure_administration_server_network.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -9,16 +9,16 @@
<b>Port.</b> Enter the port number you want the Administration Server to use. The port number can be any number between 1 and 65535, but it is typically a random number greater than 1024.
</p>
<p class="text">
-<b>IP Address.</b> Enter the IP address you want the server to use for incoming requests and connections.
+<b>IP Address.</b> Enter the IP address you want the server to use for incoming requests and connections. Leaving this field empty will cause the Administration Server to listen on all available network interfaces.
</p>
<p class="text">
-<b>Connection Restrictions.</b> Displays a list of hosts currently allowed to connect to the Administration Server. Use the drop-down list to indicate whether you're adding to the list by DNS name or by IP address. The list is evaluated first by host name and then by IP address.
+<b>Connection Restrictions.</b> Displays a list of hosts currently allowed to connect to the Administration Server. Use the drop-down list to indicate whether you're adding to the list by host name or by IP address. The list is evaluated first by host name and then by IP address.
</p>
<p class="text">
<b>Add.</b> Displays a dialog box for adding a host to the list of computers allowed to connect to the Administration Server.
</p>
<p class="text">
-<b>Edit.</b> Displays a dialog box for editing a Host IP address or DNS name on the list of computers allowed to connect to the Administration Server.
+<b>Edit.</b> Displays a dialog box for editing a host name or IP address on the list of computers allowed to connect to the Administration Server.
</p>
<p class="text">
<b>Remove.</b> Removes a selected entry from the list of allowed hosts.
Index: configure_administration_server_user_ds.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/configure_administration_server_user_ds.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure_administration_server_user_ds.html 9 Aug 2007 16:04:04 -0000 1.1
+++ configure_administration_server_user_ds.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -3,7 +3,7 @@
</p>
<p class="text">
-Use this screen to specify one or more Directory Servers to use when authenticating users.
+Use this screen to specify one or more Directory Servers to use when authenticating users to this Administration Server.
</p>
<p class="text">
<b>Use Default User Directory.</b> Choose this option if you want to use the user directory associated with the domain. Its LDAP URL is displayed here.
@@ -41,9 +41,6 @@
</td></tr>
</table>
-<br />
-<br />
-
<p class="text">
<b>Secure Connection.</b> Select this option if the new user directory is already SSL enabled.
</p>
Index: create_user_administrator.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/create_user_administrator.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create_user_administrator.html 9 Aug 2007 16:04:04 -0000 1.1
+++ create_user_administrator.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -32,6 +32,3 @@
<p class="text">
<b>Fax.</b> (Optional) Enter the user or administrator's fax number.
</p>
-<p class="text">
-<b>Access Permissions Help.</b> Provides information on setting access controls that apply to users and groups.
-</p>
Index: host_information.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/host_information.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- host_information.html 9 Aug 2007 16:04:04 -0000 1.1
+++ host_information.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -12,10 +12,10 @@
You can edit the following information about the selected host:
</p>
<p class="text">
-<b>Host name.</b> Specifies the name of the host machine as displayed in the navigation tree. The host name is usually the fully qualified machine name, but any label is acceptable. For example, a host name could be <code>eastcoast.example.com</code> or <code>East Coast Sun ES10000</code>.
+<b>Host name.</b> Specifies the name of the host machine as displayed in the navigation tree. The host name is usually the fully qualified machine name, but any label is acceptable. For example, a host name could be <code>westcoast.example.com</code> or <code>West Coast Server</code>.
</p>
<p class="text">
-<b>Description.</b> (Optional) Contains a brief description of this host. For example, Sun ES10000 for the East Coast division of Example Corporation.
+<b>Description.</b> (Optional) Contains a brief description of this host. For example, Server for the West Coast division of Example Corporation.
</p>
<p class="text">
<b>Location.</b> (Optional) Specifies the physical location of this host. For example, Cube 17043 or Building 15 - Third Floor - Lab No. 1.
@@ -24,8 +24,8 @@
You can view, but not edit, the following information about the selected host:
</p>
<p class="text">
-<b>Platform.</b> Indicates the host machine's architecture. For example, Intel.
+<b>Platform.</b> Indicates the host machine's architecture. For example, i686.
</p>
<p class="text">
-<b>Operating system.</b> Indicates the operating system that this host is running. For example, Windows NT 4.0 (Build 1381).
+<b>Operating system.</b> Indicates the operating system that this host is running as reported by uname. For example, Linux westcoast.example.com 2.6.9-55.0.9.ELsmp Tue Sep 25 02:17:24 EDT i686 i686 i386 GNU/Linux.
</p>
Index: logging_options.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/logging_options.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logging_options.html 9 Aug 2007 16:04:04 -0000 1.1
+++ logging_options.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -3,13 +3,13 @@
</p>
<p class="text">
-The Administration Server uses an access log and an error log. The access log monitors activity while the error log keeps track of server events and problems. Use this panel to indicate where to store each of these log files.
+The Administration Server uses an access log and an error log. The access log monitors activity while the error log keeps track of server events and problems. Use this panel to indicate the filename to use for each of these log files.
</p>
<p class="text">
-<b>Access Log - Log File.</b> Enter a path and filename for the access log. This path can be absolute or relative to the server root. Example: <code>/export/server_logs/access</code>.
+<b>Access Log - Log File.</b> Enter a filename for the access log. This must be a filename with no path provided.
</p>
<p class="text">
-<b>Error Log - Log File.</b> Enter a path and filename for the error log. This path can be absolute or relative to the server root. Example: <code>/export/server_logs/error</code>.
+<b>Error Log - Log File.</b> Enter a filename for the error log. This must be a filename with no path provided.
</p>
Index: manage_certificates_ca_certs.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/manage_certificates_ca_certs.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manage_certificates_ca_certs.html 9 Aug 2007 16:04:04 -0000 1.1
+++ manage_certificates_ca_certs.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -3,7 +3,7 @@
</p>
<p class="text">
-Use this dialog to view, request, and manage Certificate Authority (CA) certificates.
+Use this dialog to view and manage Certificate Authority (CA) certificates.
</p>
<p class="text">
<b>Security Device.</b> Choose the security device that you want to manage. Unless you have installed an external device, only internal (software) will be available.
Index: manage_certificates_revoked_certs.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/manage_certificates_revoked_certs.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manage_certificates_revoked_certs.html 9 Aug 2007 16:04:04 -0000 1.1
+++ manage_certificates_revoked_certs.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -3,7 +3,7 @@
</p>
<p class="text">
-Use this dialog to view, request, and manage Certificate Revocation Lists (CRLs) and Compromised Key Lists (CKLs).
+Use this dialog to view and manage Certificate Revocation Lists (CRLs) and Compromised Key Lists (CKLs).
</p>
<p class="text">
Index: select_organizational_unit.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/select_organizational_unit.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- select_organizational_unit.html 9 Aug 2007 16:04:04 -0000 1.1
+++ select_organizational_unit.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -7,5 +7,5 @@
</p>
<p class="text">
-An organizational unit is a type of branch point in an LDAP directory. Typically, it is used to represent a major entity in your enterprise. This can be a real-life division such as Engineering or a logical grouping of directory entries such as People or Groups. In Distinguished Name (DN) syntax, an organizational unit is represented by <code>ou</code>. The Engineering division of a company might exist under <code>ou=Engineering, o=example.com</code>. Employees may be stored under <code>ou=People, o=example.com</code>.
+An organizational unit is a type of branch point in an LDAP directory. Typically, it is used to represent a major entity in your enterprise. This can be a real-life division such as Engineering or a logical grouping of directory entries such as People or Groups. In Distinguished Name (DN) syntax, an organizational unit is represented by <code>ou</code>. The Engineering division of a company might exist under <code>ou=Engineering, dc=example, dc=com</code>. Employees may be stored under <code>ou=People, dc=example, dc=com</code>.
</p>
Index: server_group_information.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/server_group_information.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server_group_information.html 9 Aug 2007 16:04:04 -0000 1.1
+++ server_group_information.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -12,14 +12,8 @@
You can edit the following information about the selected server group:
</p>
<p class="text">
-<b>Group name.</b> Specifies the name of the server group as displayed in the network tree. The group name usually indicates the type of group that is selected. For example, Western Sales Servers, Finance Department's Directory Server, or Example Corporation's Messaging Servers.
+<b>Group name.</b> Specifies the name of the server group as displayed in the network tree. The group name usually indicates the type of group that is selected. For example, Western Sales Servers or Example Corporation's Directory Servers.
</p>
<p class="text">
<b>Description.</b> (Optional) Contains a brief description of this server group. For example, Servers for the Western region sales force.
</p>
-<p class="text">
-You can view, but not edit, the following information about the selected server group:
-</p>
-<p class="text">
-<b>Installation path.</b> Indicates the path to this server group. This path is also called the "server root."
-</p>
Index: server_information.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/server_information.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server_information.html 9 Aug 2007 16:04:04 -0000 1.1
+++ server_information.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -15,7 +15,7 @@
You can edit the following information about the selected server:
</p>
<p class="text">
-<b>Server Name.</b> Specifies the name of the server as displayed in the network tree. The server name usually indicates the type of server that is selected. For example, Administration Server, Messaging Server, or Directory Server.
+<b>Server Name.</b> Specifies the name of the server as displayed in the network tree. The server name usually indicates the type of server that is selected. For example, Administration Server or Directory Server.
</p>
<p class="text">
<b>Description.</b> (Optional) Contains a brief description of this server. For example, Directory Server for the Eastern region sales force.
@@ -27,9 +27,6 @@
<b>Installation Date.</b> Indicates date and time the server was installed.
</p>
<p class="text">
-<b>Server Root.</b> Indicates directory where the server binaries are installed.
-</p>
-<p class="text">
<b>Product Name.</b> Indicates the server's official product name.
</p>
<p class="text">
@@ -45,7 +42,7 @@
<b>Revision.</b> Indicates whether this server has been upgraded or patched. If no value is present, this is an unpatched installation.
</p>
<p class="text">
-<b>Security Level.</b> Indicates whether the server uses domestic (US based, 128-bit ciphers) or export (non-US based, 40-bit ciphers) encryption levels.
+<b>Security Level.</b> Indicates whether the server uses domestic (128-bit ciphers) or export (40-bit ciphers) encryption levels.
</p>
<p class="text">
<b>Server Status.</b> Indicates whether the server is on or off.
Index: set_security_device_password_change_security_device_password.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/set_security_device_password_change_security_device_password.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- set_security_device_password_change_security_device_password.html 9 Aug 2007 16:04:04 -0000 1.1
+++ set_security_device_password_change_security_device_password.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -10,7 +10,7 @@
The first time you use Administration Server's security features, you are prompted to specify a password for the internal (software) security device.
</p>
-<ul>
+<ul class="text">
<li>
If you are setting the password for the internal security device for the first time, enter information for the following fields:
</li>
Index: users_and_groups.html
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/help/users_and_groups.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- users_and_groups.html 9 Aug 2007 16:04:04 -0000 1.1
+++ users_and_groups.html 14 Nov 2007 16:46:16 -0000 1.2
@@ -6,7 +6,7 @@
This is a multipurpose dialog box you can use to do the following:
</p>
-<ul>
+<ul class="text">
<li>
Locate existing users or groups
</li>
16 years, 5 months
[Fedora-directory-commits] admservconsole/help/en tokens.map, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/admservconsole/help/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27109/en
Modified Files:
tokens.map
Log Message:
Resolves: 379211
Summary: Online help corrections.
Index: tokens.map
===================================================================
RCS file: /cvs/dirsec/admservconsole/help/en/tokens.map,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tokens.map 20 Sep 2007 16:33:13 -0000 1.2
+++ tokens.map 14 Nov 2007 16:46:15 -0000 1.3
@@ -130,7 +130,7 @@
CertRequestWizard-help = help/certificate_request_wizard_introduction.html
CertRequestInfoPage-help = help/certificate_request_wizard_requestor_information.html
TokenPasswordPage-help = help/certificate_request_install_wizard_token_password.html
-CertRequestSubmissionPage = help/certificate_request_wizard_request_submission.html
+CertRequestSubmissionPage-help = help/certificate_request_wizard_request_submission.html
;CERTIFICATE INSTALLATION WIZARD
CertInstallCertPage-help = help/certificate_install_wizard_certificate_location.html
16 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSMigration.pm.in, 1.22, 1.23
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13360
Modified Files:
DSMigration.pm.in
Log Message:
Resolves: bug 345711
Description: migration : ignore idl switch value in 6.21 and earlier
Fix Description: Have to assign the values directly to the array ref - not to a temp array ref
Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DSMigration.pm.in 25 Oct 2007 18:11:59 -0000 1.22
+++ DSMigration.pm.in 14 Nov 2007 15:12:09 -0000 1.23
@@ -143,8 +143,7 @@
my $line = <DBVERSION>;
close DBVERSION;
chomp($line);
- my @foo = split("/", $line);
- $data = \@foo;
+ @{$data} = split("/", $line);
return ();
}
16 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools/rsearch/scripts dbgen.pl.in, 1.1, 1.2
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-serv13204
Modified Files:
dbgen.pl.in
Log Message:
Resolves: bug 367721
Bug Description: dbgen.pl uses incorrect perl interpreter on hpux
Reviewed by: nhosoi (Thanks!)
Fix Description: Set @perlexec@ to the correct platform specific perl location.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: dbgen.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbgen.pl.in 16 Jul 2007 16:49:41 -0000 1.1
+++ dbgen.pl.in 14 Nov 2007 15:07:35 -0000 1.2
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@perlexec@
# 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
16 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm ldbm_config.c, 1.11, 1.12 ldbm_instance_config.c, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12862/ldapserver/ldap/servers/slapd/back-ldbm
Modified Files:
ldbm_config.c ldbm_instance_config.c
Log Message:
Resolves: bug 339041
Bug Description: migration : encryption key entries missing when source is 6.21
Reviewed by: nhosoi (Thanks!)
Fix Description: I found out why it wasn't always adding the attribute encryption entries. If the cn=monitor entry existed for the database, it would not add the other container entries. I don't know why it did that. I changed it to always add those entries, and just skip the ones that already exist. This should ensure that the attribute encryption entries always exist.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: ldbm_config.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ldbm_config.c 15 Mar 2007 21:34:32 -0000 1.11
+++ ldbm_config.c 14 Nov 2007 15:04:51 -0000 1.12
@@ -82,8 +82,10 @@
Slapi_Entry *e;
Slapi_PBlock *util_pb = NULL;
int rc;
+ int result;
char entry_string[512];
int dont_write_file = 0;
+ char ebuf[BUFSIZ];
if (flags & LDBM_INSTANCE_CONFIG_DONT_WRITE) {
dont_write_file = 1;
@@ -93,11 +95,21 @@
util_pb = slapi_pblock_new();
PR_snprintf(entry_string, 512, entries[x], string1, string2, string3);
e = slapi_str2entry(entry_string, 0);
+ PR_snprintf(ebuf, sizeof(ebuf), slapi_entry_get_dn_const(e)); /* for logging */
slapi_add_entry_internal_set_pb(util_pb, e, NULL, li->li_identity, 0);
slapi_pblock_set(util_pb, SLAPI_DSE_DONT_WRITE_WHEN_ADDING,
&dont_write_file);
- if ((rc = slapi_add_internal_pb(util_pb)) != LDAP_SUCCESS) {
- LDAPDebug(LDAP_DEBUG_ANY, "Unable to add config entries to the DSE: %d\n", rc, 0, 0);
+ rc = slapi_add_internal_pb(util_pb);
+ slapi_pblock_get(util_pb, SLAPI_PLUGIN_INTOP_RESULT, &result);
+ if (!rc && (result == LDAP_SUCCESS)) {
+ LDAPDebug(LDAP_DEBUG_CONFIG, "Added database config entry [%s]\n",
+ ebuf, 0, 0);
+ } else if (result == LDAP_ALREADY_EXISTS) {
+ LDAPDebug(LDAP_DEBUG_TRACE, "Database config entry [%s] already exists - skipping\n",
+ ebuf, 0, 0);
+ } else {
+ LDAPDebug(LDAP_DEBUG_ANY, "Unable to add config entry [%s] to the DSE: %d %d\n",
+ ebuf, result, rc);
}
slapi_pblock_destroy(util_pb);
}
Index: ldbm_instance_config.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ldbm_instance_config.c 25 Jul 2007 15:20:01 -0000 1.8
+++ ldbm_instance_config.c 14 Nov 2007 15:04:51 -0000 1.9
@@ -490,27 +490,11 @@
slapi_pblock_destroy(search_pb);
}
- /* now check for cn=monitor -- if not present, add default child entries */
- search_pb = slapi_pblock_new();
- PR_snprintf(dn, BUFSIZ, "cn=monitor, cn=%s, cn=%s, cn=plugins, cn=config",
- inst->inst_name, li->li_plugin->plg_name);
- slapi_search_internal_set_pb(search_pb, dn, LDAP_SCOPE_BASE,
- "objectclass=*", NULL, 0, NULL, NULL,
- li->li_identity, 0);
- slapi_search_internal_pb(search_pb);
- slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &res);
-
- if (res == LDAP_NO_SUCH_OBJECT) {
- /* Add skeleton dse entries for this instance */
- ldbm_config_add_dse_entries(li, ldbm_instance_skeleton_entries,
- inst->inst_name, li->li_plugin->plg_name,
- inst->inst_name, 0);
- }
-
- if (search_pb) {
- slapi_free_search_results_internal(search_pb);
- slapi_pblock_destroy(search_pb);
- }
+ /* Add skeleton dse entries for this instance */
+ /* IF they already exist, that's ok */
+ ldbm_config_add_dse_entries(li, ldbm_instance_skeleton_entries,
+ inst->inst_name, li->li_plugin->plg_name,
+ inst->inst_name, 0);
/* setup the dse callback functions for the ldbm instance config entry */
PR_snprintf(dn, BUFSIZ, "cn=%s, cn=%s, cn=plugins, cn=config",
16 years, 5 months
[Fedora-directory-commits] coolkey/applet/src/com/redhat/ckey/applet CardEdge.java, 1.3, 1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4440
Modified Files:
CardEdge.java
Log Message:
Correctly parse application specific initialization data such that the "issuerInfo" URL can be encoded onto the card. Bug #367751, rev. rrelyea.
Index: CardEdge.java
===================================================================
RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/CardEdge.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CardEdge.java 6 Dec 2006 19:11:21 -0000 1.3
+++ CardEdge.java 12 Nov 2007 19:24:51 -0000 1.4
@@ -123,8 +123,8 @@
private static final byte VERSION_PROTOCOL_MINOR = 1;
private static final byte VERSION_APPLET_MAJOR = 1;
private static final byte VERSION_APPLET_MINOR = 3;
- private static final short BUILDID_MAJOR = (short) 0x4577;
- private static final short BUILDID_MINOR = (short) 0x09c8;
+ private static final short BUILDID_MAJOR = (short) 0x4734;
+ private static final short BUILDID_MINOR = (short) 0xb002;
private static final short ZEROS = 0;
// * Enable pin size check
@@ -504,47 +504,210 @@
//
// initialize the parameters to their default values
+ //Save offset of the instance aid length.
+ byte remainingLength = bLength;
+
short mem_size = (short)6000;
create_object_ACL = RA_ACL;
create_key_ACL = RA_ACL;
create_pin_ACL = RA_ACL;
enable_ACL_change = 0; // can't change ACLs by default
- // allow configuration of the mem_size, since it can't be changed
- // on the fly.
- if ((bArray[bOffset] & 0x80) != 0) {
- mem_size = (short)
- (Util.makeShort(ZEROB,(byte)(bArray[bOffset] & 0x7e))* 100);
- enable_ACL_change = (byte)(bArray[bOffset] & 0x1);
- bOffset++;
- bLength--;
- // we can create APDU's to change the ACL's.
- }
+ pins = new OwnerPIN [MAX_NUM_PINS];
+ keys = new Key [MAX_NUM_KEYS];
+ keyMate = new byte [MAX_NUM_KEYS];
+ keyACLs = new byte [MAX_NUM_KEYS * KEY_ACL_SIZE];
+ keyTries = new byte [MAX_NUM_KEYS];
+ keyPairs = new KeyPair [MAX_NUM_KEYS];
+ ciphers = new Cipher [MAX_NUM_KEYS];
+ signatures = new Signature [MAX_NUM_KEYS];
+ default_nonce = new byte [NONCE_SIZE];
+ issuerInfo = new byte [ISSUER_INFO_SIZE];
+
+ for (byte i = 0; i < MAX_NUM_KEYS; i++) {
+ keyTries[i] = MAX_KEY_TRIES;
+ keyMate[i] = -1;
+ }
+
+ Util.arrayFillNonAtomic(default_nonce, ZEROS, NONCE_SIZE, ZEROB);
+ Util.arrayFillNonAtomic(issuerInfo, ZEROS,ISSUER_INFO_SIZE, ZEROB);
+
+ byte appDataLen = 0;
+ byte issuerLen = 0;
+
+ //Attempt to parse app specific initialization data
+ //Format
+ // n bytes- System header data, skip past to get to app data
+ // App specific data
+ // 1 byte - Issuer Info Len
+ // n bytes- Issuer Info Value, string of characters
+ // 1 byte - Custem memory size Len, agree upon 2
+ // 2 bytes- Custom memory size value
+ // 1 byte - Applet bit mask Len, now only handle 1, allow for more in future
+ // n bytes- Applet bit mask value. Process 1 now.
+
+
+ //Skip past the header data provided by the system
+
+ //Get instance AID length
+
+ byte len = bArray[bOffset];
+
+ short customMemSize = 0;
+ do {
+
+ if(remainingLength <= 0) {
+ break;
+ }
+
+ if( len > remainingLength) {
+ break;
+ }
+
+ //Skip past the instance AID
+ //
+ bOffset+= len + 1;
+ remainingLength-= (len + 1);
+
+ if(remainingLength <= 0) {
+ break;
+ }
+
+ //Get app privileges length
+
+ len = bArray[bOffset];
+
+ if(len > remainingLength) {
+ break;
+ }
+ //Skip past the app privileges
+
+ bOffset+= len + 1;
+ remainingLength-=(len + 1);
+
+ if(remainingLength <= 0) {
+ break;
+ }
+
+ //Get length of the entire application specific data block
+
+ appDataLen = bArray[bOffset];
+
+ if( appDataLen > remainingLength)
+ {
+ break;
+ }
+
+ bOffset +=1;
+ remainingLength=appDataLen;
+
+ if(remainingLength <= 0) {
+ break;
+ }
+
+ //Get the issuer info length
+
+ issuerLen = bArray[bOffset];
+
+ if(issuerLen > remainingLength) {
+ break;
+ }
+
+ bOffset++;
+ remainingLength--;
+
+ if(remainingLength <= 0) {
+ break;
+ }
+
+ //Actually copy our issuer info data
+
+ if(issuerLen != 0) {
+ if((short) issuerLen < ISSUER_INFO_SIZE) {
+ Util.arrayCopyNonAtomic(bArray,bOffset,issuerInfo,ZEROB,issuerLen);
+ } else {
+ break;
+ }
+ }
+
+ //skip past the issuer data if any
+
+ bOffset+= issuerLen ;
+ remainingLength-= issuerLen;
+ if(remainingLength <= 0) {
+ break;
+ }
+
+ //Get memory size length
+
+ byte memSizeLen= bArray[bOffset];
+
+ if(memSizeLen > remainingLength) {
+ break;
+ }
+
+ bOffset+=1;
+ remainingLength-=1;
+ if(remainingLength <= 0) {
+ break;
+ }
+
+ //allow configuration of the mem_size, since it can't be changed
+ //on the fly.
+ //Get memory size from next block,assume 2 bytes
+
+ if(memSizeLen == 2) {
+ customMemSize = Util.makeShort(bArray[bOffset],bArray[(short) (bOffset + 1)]);
+ bOffset += 2;
+ remainingLength-=2;
+ }
+
+ //Sanity check the mem size
+
+ if(customMemSize > 0) {
+ mem_size = (short) customMemSize ;
+ }
+
+ if(remainingLength <= 0) {
+ break;
+ }
+
+ //obtain the applet bit mask to alter the behavior as needed
+ //only pay attention to first byte now.
+
+ byte appletBitMask = 0;
+ byte bitMaskLen = 0;
+
+ bitMaskLen = bArray[bOffset];
+
+ if(bitMaskLen > remainingLength) {
+ break;
+ }
+
+ if(bitMaskLen > 0) {
+ bOffset += 1;
+ remainingLength-=1;
+ appletBitMask = bArray[bOffset];
+ }
+
+ if(remainingLength <= 0) {
+ break;
+ }
+
+ //The first thing in the bitmask we support is allowing the change of ACL's
+
+ if(appletBitMask != 0) {
+ enable_ACL_change = (byte)(appletBitMask & 0x1);
+ }
+
+ } while(false);
+
+ //Memory Management data instantiation
+
+ mem = new MemoryManager(mem_size);
+ om = new ObjectManager(mem);
- mem = new MemoryManager(mem_size);
- om = new ObjectManager(mem);
- pins = new OwnerPIN [MAX_NUM_PINS];
- keys = new Key [MAX_NUM_KEYS];
- keyMate = new byte [MAX_NUM_KEYS];
- keyACLs = new byte [MAX_NUM_KEYS * KEY_ACL_SIZE];
- keyTries = new byte [MAX_NUM_KEYS];
- keyPairs = new KeyPair [MAX_NUM_KEYS];
- ciphers = new Cipher [MAX_NUM_KEYS];
- signatures = new Signature [MAX_NUM_KEYS];
- default_nonce = new byte [NONCE_SIZE];
- issuerInfo = new byte [ISSUER_INFO_SIZE];
-
- for (byte i = 0; i < MAX_NUM_KEYS; i++) {
- keyTries[i] = MAX_KEY_TRIES;
- keyMate[i] = -1;
- }
- Util.arrayFillNonAtomic(default_nonce, ZEROS, NONCE_SIZE, ZEROB);
- Util.arrayFillNonAtomic(issuerInfo, ZEROS,ISSUER_INFO_SIZE, ZEROB);
- // copy the rest of the param date into issuerInfo.
- if (bLength > 0) {
- Util.arrayCopyNonAtomic(bArray,bOffset,issuerInfo,ZEROB,bLength);
- }
authenticated_id = 0;
nonce_ids = 0;
16 years, 5 months
[Fedora-directory-commits] admservconsole fedora-admin-console.spec, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14635
Modified Files:
fedora-admin-console.spec
Log Message:
fix symlinks
Index: fedora-admin-console.spec
===================================================================
RCS file: /cvs/dirsec/admservconsole/fedora-admin-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-admin-console.spec 9 Aug 2007 16:26:13 -0000 1.3
+++ fedora-admin-console.spec 7 Nov 2007 22:07:17 -0000 1.4
@@ -3,10 +3,11 @@
%define dsname fedora-ds
%define shortname fedora-admin
+%define pkgname dirsrv
Name: fedora-admin-console
Version: %{major_version}.%{minor_version}
-Release: 2
+Release: 3%{?dist}
Summary: Fedora Admin Server Management Console
Group: Applications
@@ -35,15 +36,15 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java
-install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java
-install -d $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin/help
-install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin
-install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin
-install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin/help
+install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
+install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
+install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin/help
+install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin
+install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin
+install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin/help
# create symlinks
-pushd $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java
+pushd $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
ln -s %{shortname}-%{version}.jar %{shortname}-%{major_version}.jar
ln -s %{shortname}-%{version}.jar %{shortname}.jar
ln -s %{shortname}-%{version}_en.jar %{shortname}-%{major_version}_en.jar
@@ -55,18 +56,21 @@
%files
%defattr(-,root,root)
-%{_datadir}/%{dsname}/html/java/%{shortname}-%{version}.jar
-%{_datadir}/%{dsname}/html/java/%{shortname}-%{major_version}.jar
-%{_datadir}/%{dsname}/html/java/%{shortname}.jar
-%{_datadir}/%{dsname}/html/java/%{shortname}-%{version}_en.jar
-%{_datadir}/%{dsname}/html/java/%{shortname}-%{major_version}_en.jar
-%{_datadir}/%{dsname}/html/java/%{shortname}_en.jar
-%dir %{_datadir}/%{dsname}/manual/en/admin
-%{_datadir}/%{dsname}/manual/en/admin/tokens.map
-%doc %{_datadir}/%{dsname}/manual/en/admin/*.html
-%doc %{_datadir}/%{dsname}/manual/en/admin/help/*.html
-
+%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}_en.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}_en.jar
+%{_datadir}/%{pkgname}/html/java/%{shortname}_en.jar
+%dir %{_datadir}/%{pkgname}/manual/en/admin
+%{_datadir}/%{pkgname}/manual/en/admin/tokens.map
+%doc %{_datadir}/%{pkgname}/manual/en/admin/*.html
+%doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
+
%changelog
+* Thu Oct 25 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-3
+- updated sources - use dirsrv as package name
+
* Wed Aug 8 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-2
- Added online help files into package.
16 years, 5 months
[Fedora-directory-commits] fedora-idm-console fedora-idm-console.spec, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/fedora-idm-console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25060
Modified Files:
fedora-idm-console.spec
Log Message:
package is not noarch
Index: fedora-idm-console.spec
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/fedora-idm-console.spec,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-idm-console.spec 1 Aug 2007 23:08:51 -0000 1.1.1.1
+++ fedora-idm-console.spec 7 Nov 2007 20:38:15 -0000 1.2
@@ -3,7 +3,7 @@
Name: fedora-idm-console
Version: %{major_version}.%{minor_version}
-Release: 3
+Release: 4
Summary: Fedora Management Console
Group: Applications
@@ -11,7 +11,6 @@
URL: http://directory.fedoraproject.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
Source: %{name}-%{version}.tar.bz2
Requires: idm-console-framework >= 1.1
BuildRequires: ant >= 1.6.2
@@ -48,13 +47,16 @@
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_javadir}/%{name}-%{version}_en.jar
%{_javadir}/%{name}-%{major_version}_en.jar
%{_javadir}/%{name}_en.jar
%{_bindir}/%{name}
%changelog
+* Thu Oct 25 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-4
+- Removed noarch to ensure we find the 64-bit library.
+
* Wed Aug 1 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-3
- Separated theme package.
16 years, 5 months