Bug(s) fixed: 169663

Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components.  I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build.  This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none

9 files changed, 57 insertions, 129 deletions

diff --git a/ldap/admin/lib/Makefile b/ldap/admin/lib/Makefile
index 3eebe24d..b130a224 100644
--- a/ldap/admin/lib/Makefile
+++ b/ldap/admin/lib/Makefile
@@ -64,9 +64,6 @@ SRCS	= dsalib_location.c dsalib_debug.c dsalib_updown.c dsalib_tailf.c \
 OBJS = $(addprefix $(OBJDEST)/, $(subst .c,.o,$(SRCS)))
 
 INCLUDES += -I$(LDAP_SRC)/admin/include
-ifdef FORTEZZA
-INCLUDES += -I$(BUILD_ROOT)/lib
-endif
 
 EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(SECURITYLINK) $(NSPRLINK)
 
@@ -77,15 +74,6 @@ MAPFILE= /MAP:$(LDAP_ADMLIBDIR)/libds_admin.map
 EXTRA_LIBS_DEP += $(LDAP_COMMON_LIBS_DEP) $(LDAP_LIBLDIF_DEP) 
 #EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(LDAP_LIBLDIF) $(LDAP_SDK_LIBLDAP_DLL) \
 #	$(ADMINUTIL_LINK) $(SECURITYLINK) $(NSPRLINK)
-else # WINNT
-ifdef FORTEZZA
-# libci.a needs to be recompiled with the -Z option on HPUX, until then, 
-# we'll link libci.a with the executables which need it -atom
-ifneq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(FORTEZZA_DRIVER)
-EXTRA_LIBS += $(FORTEZZA_DRIVER)
-endif # !HPUX
-endif # FORTEZZA
 endif # WINNT
 
 ifeq ($(ARCH), Linux)
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile
index af5cb826..5210982c 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/Makefile
@@ -132,12 +132,6 @@ EXTRA_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
 OPENSOURCE_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
 else
 ifeq ($(ARCH),HPUX)
-ifdef FORTEZZA 
-# link with libci.a for FORTEZZA builds. On other platforms, libci.a is
-# linked into libds_admin.so, but not on HPUX
-EXTRA_LIBS_DEP += $(FORTEZZA_DRIVER)
-EXTRA_LIBS += $(FORTEZZA_DRIVER)
-endif
 ifeq ($(USE_64), 1)
 EXTRALDFLAGS += +DA2.0W +DS2.0 +Z
 endif
@@ -349,11 +343,7 @@ $(LDAP_SERVER_RELDIR)/namegen.exe:  $(OBJDEST)/namegen.o
 $(LDAP_SERVER_RELDIR)/latest_file.exe:  $(OBJDEST)/latest_file.o
 	$(LINK_EXE_NOLIBSOBJS) $^
 
-installPerlFiles:  $(BINDIR) $(BINDIR)/Install.pl
-
-$(BINDIR)/Install.pl: CreateInstall.pl $(PERL_SCRIPTS_DEST)
-	-@$(RM) $@
-	$(CP) $< $@
+installPerlFiles:  $(BINDIR) $(PERL_SCRIPTS_DEST)
 
 $(BINDIR)/%: %
 	-@$(RM) $@
diff --git a/ldap/clients/dsgw/secglue.c b/ldap/clients/dsgw/secglue.c
index 7cf27610..95834fd2 100644
--- a/ldap/clients/dsgw/secglue.c
+++ b/ldap/clients/dsgw/secglue.c
@@ -147,13 +147,6 @@ FUNC(CERT_GetStateName)
 FUNC(CERT_IsExportVersion)
 FUNC(CERT_PublicModulusLen)
 
-#ifdef FORTEZZA
-FUNC(SSL_EnableGroup)
-FUNC(SEC_OpenVolatileCertDB)
-FUNC(FortezzaConfigureServer)
-FUNC(SSL_IsEnabledGroup)
-#endif /* FORTEZZA */
-
 /* DSGW pkennedy added, for HCL integration */
 FUNC(BTOA_DataToAscii)
 FUNC(ATOB_AsciiToData)
@@ -162,7 +155,6 @@ FUNC(PK11_FindKeyByAnyCert)
 FUNC(PK11_GetTokenName)
 FUNC(PK11_SetPasswordFunc)
 FUNC(PK11_FindCertFromNickname)
-FUNC(PK11_FortezzaHasKEA)
 FUNC(PK11_ConfigurePKCS11)
 FUNC(SSL_SetPolicy)
 FUNC(CERT_VerifyCertNow)
diff --git a/ldap/clients/dsmlgw/Makefile b/ldap/clients/dsmlgw/Makefile
index 22cff75e..f7afbe5c 100644
--- a/ldap/clients/dsmlgw/Makefile
+++ b/ldap/clients/dsmlgw/Makefile
@@ -46,7 +46,9 @@ include $(BUILD_ROOT)/nsconfig.mk
 include $(BUILD_ROOT)/ldap/javarules.mk
 
 all: $(ANT_DEP) $(LDAPJDK_DEP)
-	cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST)
+	@if [ ! -f $(CLASS_DEST)/axis.jar ]; then \
+		cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST) ; \
+	fi
 	$(ANT) 
 
 clean: 	
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index 039a5805..02256a76 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -134,9 +134,6 @@ endif
 
 ifeq ($(BUILD_SECURITY), domestic)
 SEC=-sec domestic
-ifdef FORTEZZA
-SEC=-sec fortezza
-endif 
 else
 SEC=-sec export 
 endif 
@@ -188,24 +185,13 @@ DOTEXE = .exe
 PACKAGE_STAGE_DIR=$(OBJDIR)/package
 endif
 
-SHARETOP = $(COMPONENTS_DIR)/ldapsdk
-BUILD_DATE = $(shell date +%Y%m%d)
-SHAREDIR = $(SHARETOP)/$(BUILD_DATE)/$(NC_BUILD_FLAVOR)
-#ADM_VERSDIR = admserv40
-#ADM_RELDATE = untested/19980119
-#IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
-IMPORTADMINSRVNOTARBASE = $(COMPONENTS_DIR_DEV)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME)
 # these are files and directories in the import adminsrv directory which we don't
 # make a local copy of, we just import directly into the tar file or create a
 # symlink to
-ADMIN_IMPORTS=base admin
+ADMIN_IMPORTS=$(ADMINSERVER_SUBCOMPS)
 ADMIN_SERVER_TARGZ=adminserver.tar.gz
 ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ)
 
-# Release directory for ldapsdk
-RELSDK = $(BUILD_DRIVE)$(RELTOP)/ldapsdk/$(OBJDIR_BASE)
-RELJDK = $(BUILD_DRIVE)$(RELTOP)/ldapjdk
-
 # these are files we need to put in the command line/console only package
 #LDAPSDK_IMPORTS=ldapsearch ldapdelete ldapmodify
 
@@ -290,8 +276,6 @@ else
 endif
 endif
 
-# Borland libraries are build on NT only
-
 dummy:
 	-@echo SITEHACK = $(SITEHACK)
 	-@echo PACKAGE_SRC_DEST = $(PACKAGE_SRC_DEST)
@@ -350,17 +334,23 @@ endif
 # install the DSMLGW into the client directory
 ifeq ($(USE_DSMLGW), 1)
 	$(MKDIR) $(RELDIR)/clients/dsmlgw
-	$(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/*  $(RELDIR)/clients/dsmlgw/
+	if [ -d $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis ] ; then \
+		$(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/*  $(RELDIR)/clients/dsmlgw/ ; \
+	fi
 
 	$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
 	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/server-config.wsdd $(RELDIR)/clients/dsmlgw/WEB-INF
 	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
 
-
 # now time to move the necessary jars in place
 	$(INSTALL) -m 644 $(NSDIST)/classes/ldapjdk.jar  $(RELDIR)/clients/dsmlgw/WEB-INF/lib
 	$(INSTALL) -m 644 $(NSDIST)/classes/activation.jar  $(RELDIR)/clients/dsmlgw/WEB-INF/lib
-	$(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc-api.jar  $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
+# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
+# if so, I'm not sure where to get the implementation
+	if [ -f $(NSDIST)/classes/jaxrpc-api.jar ] ; then \
+		$(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc-api.jar  $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
+	fi
 	$(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc.jar  $(RELDIR)/clients/dsmlgw/WEB-INF/lib
 	$(INSTALL) -m 644 $(NSDIST)/classes/saaj.jar  $(RELDIR)/clients/dsmlgw/WEB-INF/lib
 	$(INSTALL) -m 644 $(NSDIST)/classes/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
@@ -472,13 +462,15 @@ endif
 # install the ds jar file in the <server root>/$(DS_JAR_DEST_PATH) directory
 # also install the other jar files we use
 ifeq ($(USE_CONSOLE), 1)
-	$(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
-	$(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_JAR_DEST_PATH)
+	$(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
+	$(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_JAR_DEST_PATH)
 endif
 ifeq ($(USE_JAVATOOLS), 1)
 	$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
 	$(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSONJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
-	$(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+	if [ -f $(NSDIST)/classes/$(CRIMSON_LICENSE) ] ; then \
+		$(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
+	fi
 endif
 
 # Images for IM Presence plugin
@@ -513,8 +505,8 @@ ifdef USE_QUANTIFY
 endif
 
 # Copy db tools 
-	$(INSTALL) -m 755 $(DB_BINPATH)/db_printlog* $(RELDIR)/bin/slapd/server
-	$(INSTALL) -m 755 $(DB_BINPATH)/db_verify* $(RELDIR)/bin/slapd/server
+	$(INSTALL) -m 755 $(DB_BINPATH)/db_printlog$(EXE_SUFFIX) $(RELDIR)/bin/slapd/server
+	$(INSTALL) -m 755 $(DB_BINPATH)/db_verify$(EXE_SUFFIX) $(RELDIR)/bin/slapd/server
 
 	$(INSTALL) -m 755 $(OBJDIR)/lib/libsi18n/ns-slapd.properties $(RELDIR)/bin/slapd/property;
 
@@ -554,28 +546,13 @@ endif # BUILD_RPM
 # For security reason, it's readable only by the owner
 	chmod 700 $(RELDIR)/bin/slapd/server
 
-# this is the rule to pull the Infozip utilities
-ifndef INFOZIP_PULL_METHOD
-INFOZIP_PULL_METHOD = FTP
-endif
-
-$(INSTDIR)/tools/infozip.zip:
-	$(RM) $@
-	$(FTP_PULL) -method $(INFOZIP_PULL_METHOD) \
-		-objdir $(dir $@) \
-		-componentdir $(COMPONENTS_DIR)/infozip/$(INFOZIP_RELDATE)/$(NSOBJDIR_NAME_32) \
-		-files infozip.zip
-	@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component INFOZIP file $@" ; \
-	exit 1 ; \
-	fi
-
 # this is the rule to pull PerLDAP
 ifndef PERLDAP_PULL_METHOD
 PERLDAP_PULL_METHOD = FTP
 endif
 
 $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE):
+ifdef INTERNAL_BUILD
 	$(RM) $@
 	$(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
 		-objdir $(dir $@) \
@@ -586,6 +563,7 @@ $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE):
 	exit 1 ; \
 	fi
 	$(PERL) -w fixPerlDAPInf.pl $(dir $@)/perldap.inf
+endif
 
 # this is the rule to pull nsPerl
 ifndef NSPERL_PULL_METHOD
@@ -593,6 +571,7 @@ NSPERL_PULL_METHOD = FTP
 endif
 
 $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE):
+ifdef INTERNAL_BUILD
 	$(RM) $@
 	$(FTP_PULL) -method $(NSPERL_PULL_METHOD) \
 		-objdir $(dir $@) \
@@ -607,6 +586,7 @@ $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE):
 # conflicts with the one in perldap - bug 600138
 # SITEHACK is defined in nsperl.mk
 #	$(ZIP) -d $(dir $@)/$(NSPERL_ZIP_FILE) lib/nsPerl5.6.1/$(SITEHACK)/Mozilla/LDAP/LDIF.pm
+endif
 
 $(INSTDIR)/slapd:
 	$(MKDIR) -p $@
@@ -619,7 +599,6 @@ ifneq ($(ARCH), WINNT)
 packageDirectory: $(INSTDIR)/slapd \
 	$(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
 	$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE) \
-	$(INSTDIR)/tools/infozip.zip \
 	$(ADMSERV_DEP)
 
 ifdef BUILD_PATCH
@@ -657,6 +636,7 @@ endif
 endif
 endif
 endif
+ifeq ($(USE_CONSOLE),1)
 # create the slapd-client.zip file, which only has the ds jar file for the console and
 # the ldap client utility programs
 	rm -f $(INSTDIR)/slapd/slapd-client.zip
@@ -668,7 +648,7 @@ else
 # Normal way to ZIP the bits
 	cd $(RELDIR); $(ZIP) $(ZIP_FLAGS) $(ABS_INSTDIR)/slapd/slapd-client.zip ./java
 endif
-
+endif # USE_CONSOLE
 #; for file in $(LDAPSDK_IMPORTS) ; \
 #	do $(ZIP) $(ZIP_FLAGS) -g $(INSTDIR)/slapd/slapd-client.zip bin/slapd/server/$$file$(DOTEXE) ; \
 #	done
@@ -698,16 +678,14 @@ endif
 
 # if the untar directory is there, hooray; otherwise, we will have to unpack the
 # binaries ourselves . . .
-	curdir=`pwd`; cd $(INSTDIR) ; \
-	if [ ! -d $(IMPORTADMINSRVNOTARBASE)/admin ] ; \
-		then for file in $(ADMIN_IMPORTS_TARGZ) ; \
-			do rm -rf $$file ; \
-			$(GUNZIP) -c $(ADMSERV_DIR)/$$file | $(TAR) xvf - ; \
-		done ; \
+	if [ ! -d $(ADMSERV_DIR)/admin ] ; \
+	then \
+		rm -rf $(addprefix $(INSTDIR)/,$(ADMINSERVER_SUBCOMPS)) ; \
+		$(GUNZIP) -c $(ADMSERV_DIR)/$(ADMIN_SERVER_TARGZ) | (cd $(INSTDIR) ; $(TAR) xvf - $(ADMINSERVER_SUBCOMPS)) ; \
 	else \
-		for file in $(ADMIN_IMPORTS) ; \
-			do rm -rf $$file ; \
-			cp -r $(IMPORTADMINSRVNOTARBASE)/$$file $$file ; \
+		for file in $(ADMINSERVER_SUBCOMPS) ; \
+			do rm -rf $(INSTDIR)/$$file ; \
+			cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
 		done ; \
 	fi
 
@@ -715,7 +693,7 @@ endif
 	rm -f $(INSTDIR)/base/nsbase.zip
 # we also need to remove the Archive directive from the [base] section of the
 # base.inf file
-	$(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
+#	$(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
 
 # Install LDAP Readme and License files at root of Installation (dated pre-packaging) directory.
 # And, replace the License.txt file that is packaged in nssvrcore.zip.
@@ -735,14 +713,14 @@ ifndef NO_INSTALLER_TAR_FILES
 ifdef BUILD_SHIP
 ifndef BUILD_PATCH
 	cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
-	perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+	perldap dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
 endif
 ifeq ($(DEBUG), optimize)
 #	$(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
 endif
 else
 	cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
-	perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+	perldap dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
 endif # BUILD_SHIP
 #cp $(INSTDIR).tar.gz  $(BUILD_SHIP)
 #cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz  $(BUILD_SHIP)
@@ -941,8 +919,8 @@ _slapd_files: $(INSTDIR)/$(SLAPD_DIR)  \
 			   $(INSTDIR)/$(SLAPD_DIR)/slapd.z \
 			   $(INSTDIR)/$(SLAPD_DIR)/dsjars.z
 
-$(INSTDIR)/$(SLAPD_DIR)/dsjars.z: $(CLASS_DEST)/$(LDAPCONSOLEJAR) \
-	$(CLASS_DEST)/$(LDAPCONSOLEJAR_EN)  $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE)
+$(INSTDIR)/$(SLAPD_DIR)/dsjars.z: $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR) \
+	$(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR_EN)  $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE)
 	rm -f $(DSJARS_ZIPFILE); cd $(RELDIR); zip -r $(DSJARS_ZIPFILE) java
 
 $(INSTDIR)/$(SLAPD_DIR)/slapd.z: 
@@ -974,7 +952,7 @@ $(INSTDIR)/$(SLAPD_DIR)/slapd.z:
 _setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \
 			  $(INSTDIR)/$(SLAPD_DIR)/slapd.inf \
 			  $(INSTDIR)/admin $(INSTDIR)/base \
-			  $(INSTDIR)/svrcore $(INSTDIR)/tools
+			  $(INSTDIR)/svrcore
 # see components.mk for a description of PACKAGE_SETUP_LIBS
 	-@for file in $(PACKAGE_SETUP_LIBS) ; \
 	do if [ -f $$file ] ; \
@@ -1004,20 +982,6 @@ $(INSTDIR)/base: $(ADMSERV_DIR)/base
 $(INSTDIR)/svrcore: $(ADMSERV_DIR)/svrcore
 	cp -R $< $@
 
-$(INSTDIR)/tools: $(INSTDIR)/tools/infozip.zip
-	$(UNZIP) -j $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
-	lib/nsPerl5.6.1/bin/perl$(DOTEXE) -d $@
-	$(UNZIP) -j $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
-	lib/nsPerl5.6.1/bin/perl56.dll -d $@
-# We need to pull out the perl lib directory for perl to work 
-	mkdir $@/tmp
-	$(UNZIP) $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
-	lib/nsPerl5.6.1/lib/\* -d $@/tmp
-	cp -R $@/tmp/lib/nsPerl5.6.1/lib $@
-	rm -rf $@/tmp
-	$(UNZIP) -j $< -d $@
-	rm -f $<
-
 endif
 
 $(OBJDIR)/lib/libsi18n/ns-slapd.properties:
diff --git a/ldap/cm/newinst/ns-update b/ldap/cm/newinst/ns-update
index 5e4ffe86..24676d6a 100755
--- a/ldap/cm/newinst/ns-update
+++ b/ldap/cm/newinst/ns-update
@@ -63,11 +63,13 @@ start_server()
 install_nsperl()
 {
 	# the current version of nsPerl to use is defined in the slapd.inf
-	nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d=`
-	# run the nsperl installer
-	$nsperlinst > setup/nsperl/install.log
-	# use nsperl as our local copy of perl
-	cp `dirname $nsperlinst`/nsperl $PERL
+	nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d= 2> /dev/null`
+	if [ "$nsperlinst" ]; then
+		# run the nsperl installer
+		$nsperlinst > setup/nsperl/install.log
+		# use nsperl as our local copy of perl
+		cp `dirname $nsperlinst`/nsperl $PERL
+	fi
 }
 
 wrap_security_tools()
@@ -176,13 +178,8 @@ wrap_security_tools $sroot
 cd `dirname $0`
 
 rc=0
-if [ "$iDSISolaris" = "" ]; then  
-	./ds_create $* $extraflags
-	rc=$?
-else
-	$PERL -w Install.pl $* $extraflags
-	rc=$?
-fi
+./ds_create $* $extraflags
+rc=$?
 
 if [ -f fix_secmod_db_64 ]; then
     ./fix_secmod_db_64 $sroot/alias $sroot/shared32/bin
diff --git a/ldap/include/proto-ntutil.h b/ldap/include/proto-ntutil.h
index 49969382..d74171aa 100644
--- a/ldap/include/proto-ntutil.h
+++ b/ldap/include/proto-ntutil.h
@@ -96,9 +96,6 @@ extern BOOL SlapdGetServerNameFromCmdline(char *szServerName, char *szCmdLine, i
  */
 #ifdef NET_SSL
 extern char *Slapd_GetPassword();
-#ifdef FORTEZZA
-extern char *Slapd_GetFortezzaPIN();
-#endif
 extern void CenterDialog(HWND hwndParent, HWND hwndDialog);
 #endif /* NET_SSL */
 
diff --git a/ldap/javarules.mk b/ldap/javarules.mk
index 2d52d3f2..baa70c29 100644
--- a/ldap/javarules.mk
+++ b/ldap/javarules.mk
@@ -116,10 +116,7 @@ else
   endif
 endif
 
-CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(NMCLFJARFILE)$(PATH_SEP)$(LDAPJARFILE)$(PATH_SEP)$(MCCJARFILE)$(PATH_SEP)$(JAVASSLJARFILE)$(PATH_SEP)$(BASEJARFILE)$(PATH_SEP)$(JSSJARFILE)
-#CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(SWINGJARFILE)$(PATH_SEP)$(NMCLFJARFILE)$(PATH_SEP)$(LDAPJARFILE)$(PATH_SEP)$(MCCJARFILE)$(PATH_SEP)$(JAVASSLJARFILE)$(PATH_SEP)$(BASEJARFILE)
-
-RUNCLASSPATH:=$(JAVA_BUILD_DIR) $(PACKAGE_UNDER_JAVA)
+CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(LDAPJARFILE)
 
 ifndef JAVA
   ifdef JAVABINDIR
@@ -145,6 +142,10 @@ ifndef JAVADOC
 endif
 
 # How to run ant (the Java "make" system)
+ifdef GET_ANT_FROM_PATH
+ANT = ant
+else
 ANT = $(JAVA) -Dant.home=$(ANT_HOME) -classpath "$(ANT_CP)$(PATH_SEP)$(JDKLIB)" org.apache.tools.ant.Main
+endif
 
 ##########################################################
diff --git a/ldap/nsldap.mk b/ldap/nsldap.mk
index 6e681f70..42aa3efd 100644
--- a/ldap/nsldap.mk
+++ b/ldap/nsldap.mk
@@ -68,9 +68,9 @@ RELTOP=$(BUILD_ROOT)/built/release
 OBJDIR_BASE = $(notdir $(OBJDIR))
 OBJDIR_BASE_32 = $(notdir $(OBJDIR_32))
 # Release directory for Directory Server
-RELDIR = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE)
-RELDIR_32 = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE_32)
-RELDIR_UNSTRIP = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(ARCHPROCESSOR)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-unstripped-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
+RELDIR = $(BUILD_DRIVE)$(RELTOP)/$(OBJDIR_BASE)
+RELDIR_32 = $(BUILD_DRIVE)$(RELTOP)/$(OBJDIR_BASE_32)
+RELDIR_UNSTRIP = $(RELDIR)-unstripped
 
 # this is the place libraries and plugins go which are used by other
 # components i.e. not specific to slapd and its programs
@@ -384,9 +384,6 @@ endif
 #
 LIBSEC_DEP = $(NSCP_DISTDIR)/lib/libsec-$(SECURITY_EXTN).$(LIB_SUFFIX)
 LIBSEC = $(NSCP_DISTDIR)/lib/libsec-$(SECURITY_EXTN).$(LIB_SUFFIX)
-ifdef FORTEZZA
-LIBSEC += $(FORTEZZA_DRIVER)
-endif
 
 #
 # Libdb