remove obsolete files

241 files changed, 5 insertions, 47882 deletions

diff --git a/Makefile.am b/Makefile.am
index 68a9a1d3..04fdbb17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,7 +231,7 @@ task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
 
 init_SCRIPTS = wrappers/$(PACKAGE_NAME)
 
-inf_DATA = ldap/cm/newinst/slapd.inf
+inf_DATA = ldap/admin/src/slapd.inf
 
 #////////////////////////////////////////////////////////////////
 #
diff --git a/Makefile.in b/Makefile.in
index 611ce591..1e6157a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1165,7 +1165,7 @@ task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
 	$(srcdir)/ldap/admin/src/scripts/template-migrateTo7
 
 init_SCRIPTS = wrappers/$(PACKAGE_NAME)
-inf_DATA = ldap/cm/newinst/slapd.inf
+inf_DATA = ldap/admin/src/slapd.inf
 
 #////////////////////////////////////////////////////////////////
 #
diff --git a/builddsrpm.sh b/builddsrpm.sh
deleted file mode 100755
index 53a1fc68..00000000
--- a/builddsrpm.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh -vx
-# --- BEGIN COPYRIGHT BLOCK ---
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-
-mkdirs() {
-	for d in "$@" ; do
-		if [ -d $d ]; then
-			mv $d $d.deleted
-			rm -rf $d.deleted &
-		fi
-		mkdir -p $d
-	done
-}
-
-flavor=$1
-
-rootdir=`pwd`
-
-if [ ! $flavor ] ; then
-	echo "Error: $0 <flavor>"
-	echo "flavor is either redhat or fedora"
-	echo "use redhat to create a redhat branded DS or use fedora"
-	echo "for the fedora branded DS"
-	exit 1
-fi
-
-mkdirs SOURCES BUILD SRPMS RPMS
-cd SOURCES
-
-# check out files from this CVS repo
-CVSNAME=ldapserver
-# change HEAD to a real static tag when available
-CVSTAG=HEAD
-
-echo "Checking out source code . . ."
-cvs export -r $CVSTAG $CVSNAME > /dev/null 2>&1
-
-echo "Creating the spec file $flavor-ds.spec . . ."
-cd $CVSNAME ; make $flavor-ds.spec ; cp $flavor-ds.spec $rootdir ; cd $rootdir/SOURCES
-
-echo "Get version from spec file . . ."
-VERSION=`grep \^Version $rootdir/$flavor-ds.spec | awk '{print $2}'`
-
-echo "Building tarball . . ."
-mv $CVSNAME $flavor-ds-$VERSION
-tar cfh - $flavor-ds-$VERSION | gzip > $flavor-ds-$VERSION.tar.gz
-rm -rf $flavor-ds-$VERSION
-cd $rootdir
-
-echo "Executing rpmbuild . . ."
-rpmbuild --define "_topdir $rootdir" -ba $flavor-ds.spec
-echo "Finished doing rpmbuild $flavor-ds.spec"
diff --git a/ldap/admin/src/scripts/setup-ds.pl.in b/ldap/admin/src/scripts/setup-ds.pl.in
index bc88c3cd..f73258ac 100644
--- a/ldap/admin/src/scripts/setup-ds.pl.in
+++ b/ldap/admin/src/scripts/setup-ds.pl.in
@@ -46,10 +46,11 @@ use Inf;
 use Resource;
 use DialogManager;
 
-my $setup = new Setup;
+my $res = new Resource("@propertydir@/setup-ds.res");
+
+my $setup = new Setup($res);
 
 if (!$setup->{silent}) {
-    my $res = new Resource("@propertydir@/setup-ds.res");
     my $dialogmgr = new DialogManager($setup, $res, $TYPICAL);
 
     require SetupDialogs;
@@ -68,8 +69,5 @@ if (!$setup->{silent}) {
 }
 
 system("@bindir@/ds_newinst.pl $setup->{inffile}");
-if (!$setup->{keep}) {
-    unlink $setup->{inffile};
-}
 
 $setup->doExit();
diff --git a/ldap/cm/newinst/slapd.inf.in b/ldap/admin/src/slapd.inf.in
index bc84c6e6..bc84c6e6 100644
--- a/ldap/cm/newinst/slapd.inf.in
+++ b/ldap/admin/src/slapd.inf.in
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
deleted file mode 100644
index 019c54e3..00000000
--- a/ldap/cm/Makefile
+++ /dev/null
@@ -1,1092 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Makefile to Create packages for Directory Server and LDAP SDK
-#
-
-default help :
-	@echo "The following targets are available:"
-	@echo ""
-	@echo "     releaseDirectory"
-	@echo "     packageDirectory"
-
-	@echo ""
-
-
-BUILD_ROOT=../..
-TREE_ROOT=$(BUILD_ROOT)
-
-# make sure we pull the admin server component here
-ifeq ($(USE_ADMINSERVER), 1)
-ADMSERV_DEPS = 1
-endif
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(BUILD_ROOT)/ldap/nsldap.mk
-include $(BUILD_ROOT)/ldap/javarules.mk
-include $(BUILD_ROOT)/ns_usesh.mk
-
-NSDISTMODE = copy
-
-ifneq ($(ARCH), WINNT)
-# tar must support the -h flag to follow symlinks and not copy them
-TAR=tar
-endif
-
-MMDD := $(shell date +%m.%d)
-
-TMPLIST := $(shell echo /tmp/build.$$$$)
-
-# we don't want to build with warnings-as-errors for the cm/ stuff, because
-# it's crappy C++ code which is LITTERED with warnings, most of which we
-# can't fix because it comes from files in dist/, etc.
-ifeq ($(ARCH), Linux)
-CFLAGS := $(subst -Werror,,$(CFLAGS))
-endif
-
-# Absolute path to .ldap/cm is needed for AIX packaging.  Due to NFS problems on AIX 4.2.1
-# the build script RSH's to cindercone but it tries to cd to $(RELDIR) which is relative
-# to the CWD of this Makefile in current build environment.  So, the cd to RELDIR fails
-# since the RSH set the new CWD to /u/svbld.  By determining its location in the tree then
-# cd'ing to same location on cindercone the cd to RELDIR finds the correct "release" directory.
-# This hack can go away when we use a version of AIX that fixes the NFS problem(s). (tfox)
-TMP_CM_PWD := $(shell pwd)
-LDAP_CM_ABS_PATH := $(TMP_CM_PWD:/tmp_mnt/%=/%) # AIX prefixes /tmp_mnt to path.
-
-ifneq ($(ARCH), WINNT)
-RELTOOLS=$(RELTOOLSPATH)/ftpname_new.pl
-SUF=-suf .tar
-SUFEXE=-suf .tar.gz
-BACKGROUND=&
-else
-RELTOOLSDIR=$(RELTOOLSPATH)
-NT_RELTOOLS=$(RELTOOLSDIR)
-RELTOOLS=perl $(RELTOOLSDIR)/ftpname.pl
-SUF=-suf .zip
-SUFEXE=-suf .exe
-ifdef BUILD_SHIP
-ifndef BuildDir
-HOST=$(shell hostname)
-BuildDir=$(shell cd $(RELTOOLSDIR);perl getdefaults -var BuildDir -if $(RELTOOLSDIR)/init/directory/directory5.init -machine $(HOST)) 
-endif
-endif
-endif
-
-ifdef USE_64
-VERSION=-ver 1.0.4-64bit
-else
-VERSION=-ver 1.0.4
-endif
-
-ifeq ($(ARCH), HPUX)
-RSH=remsh 
-REMSH=$(RSH) anuurn -l root
-else
-RSH=rsh 
-REMSH=$(RSH) anuurn -l root
-endif
-
-
-ifdef PRODUCT_MARKET
-ifeq ($(PRODUCT_MARKET), JA)
-INTL=-intl ja
-INTL_INSTALL=-DJA=1
-endif
-ifeq ($(PRODUCT_MARKET), EU)
-INTL=-intl eu 
-endif
-else
-INTL=-intl us
-endif
-
-ifeq ($(BUILD_SECURITY), domestic)
-SEC=-sec domestic
-else
-SEC=-sec export 
-endif 
-
-ifneq ($(DEBUG), optimize)
-DBG=-debug full
-else
-DBG=-debug optimize
-endif
-
-FTPNAME = $(shell $(RELTOOLS) -name directory $(VERSION) $(INTL) $(SEC) $(DBG) $(SUF)) 
-FTPNAMEGZ = $(shell $(RELTOOLS) -name directory $(VERSION) $(INTL) $(SEC) $(DBG) $(SUFEXE) ) 
-
-# regular NT 
-
-ifeq ($(ARCH), WINNT)
-
-INSTALL = nsinstall -t
-PLAT_ID = 32
-CONVERTER = cp
-DOTTXT = .txt
-
-# NT Alpha 
-
-ifeq ($(PROCESSOR_ARCHITECTURE), ALPHA)
-PLAT_ID = 64
-endif
-
-else
-INSTALL = $(OBJDIR)/nsinstall -t
-CONVERTER = cp
-endif
-
-PROD_ID = dk
-
-ifeq ($(DEBUG), optimize)
-STRIP = strip
-BLDTYPE_ID =
-else
-STRIP = true
-BLDTYPE_ID = d
-endif
-
-DOTDLL = .$(DLL_SUFFIX)
-DOTLIB = .$(LIB_SUFFIX)
-
-ifeq ($(ARCH), WINNT)
-DOTEXE = .exe
-PACKAGE_STAGE_DIR=$(OBJDIR)/package
-endif
-
-# 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=$(ADMINSERVER_SUBCOMPS)
-ADMIN_SERVER_TARGZ=$(ADMINSERVER_PKG)
-ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ)
-
-ifeq ($(USE_SETUPUTIL), 1)
-  LDAP_PACKAGE_FILES:=setup setup.inf setup.res silent.inf unzip_wrapper.pl svrcore dsktune LICENSE.txt README.txt slapd
-else
-  LDAP_PACKAGE_FILES:=dsktune slapd
-endif
-
-# these are files we need to put in the command line/console only package
-#LDAPSDK_IMPORTS=ldapsearch ldapdelete ldapmodify
-
-# perl script to add the slapd information to the base installer
-# setup information file
-FIX_SETUP_INF = $(BUILD_ROOT)/ldap/cm/fixSetupInf.pl
-FIX_BASE_INF = $(BUILD_ROOT)/ldap/cm/fixBaseInf.pl
-
-ABSBUILD_ROOT = $(shell cd $(BUILD_ROOT); pwd)
-ABSRELDIR = $(ABSBUILD_ROOT)/built/release
-GENRPMPATCH = $(ABSBUILD_ROOT)/ldap/cm/genRpmPatch.pl
-PATCHINF = $(ABSBUILD_ROOT)/ldap/cm/fedora-patch.inf
-DATETIME := $(shell date +%Y%m%d-%H%M%S)
-SPEXT := .SP.$(DATETIME)
-
-# This is the directory where we put what we're making: the files which go on the CD.
-ifndef INSTDIR
-ifeq ($(ARCH), WINNT)
-INSTDIR = $(TREE_ROOT)/../$(MMDD)/$(NS_BUILD_FLAVOR)
-else
-INSTDIR = $(BUILD_DRIVE)$(BUILD_ROOT)/../$(MMDD)/$(NS_BUILD_FLAVOR)
-endif
-endif
-ABS_INSTDIR = $(shell cd $(INSTDIR); pwd)
-ABS_DISTDIR = $(ABSBUILD_ROOT)/../dist
-ESCAPED_ABS_DISTDIR = $(shell echo $(ABS_DISTDIR) | sed -e 's/\//\\\//g')
-
-ifdef BUILD_PATCH
-PATCHINSTDIR = $(ABS_INSTDIR)-SP
-SLAPDSP = slapd-10
-endif
-
-INST_TARGET_RESKIT=$(INSTDIR)/reskit
-INST_TARGET_INTL=./$(PRODUCT_MARKET)dir
-
-LDAPDIR = $(BUILD_ROOT)/ldap
-
-NSDIST = $(BUILD_ROOT)/../dist
-
-DS_JAR_SRC_PATH = $(NSDIST)/$(BUILD_DEBUG)
-# this is the directory into which we place those java files and associated
-# web services files that are Apache or Java licensed - we cannot put them
-# in the same rpm/tarball as the directory server, so we create a separate
-# package for them, using the below macro as the staging area
-# actually, we can - GPL is compatible with APL in this situation
-EXT_JAVA_RELDIR = $(RELDIR)
-XMLTOOLS_JAR_FILE = xmltools.jar
-
-UNZIP=unzip -o
-UNZIPNOPATHS=$(UNZIP) -j
-ZIP=zip
-ZIP_FLAGS=-r -T
-EXCLUDED_FILES=
-# Linux Zip has problems zipping gif file over NFS (??)
-ifeq ($(ARCH), Linux)
-ZIP_FLAGS=-r -T -n .gif
-endif
-
-ifeq ($(ARCH), Linux)
-MAKEARCH=$(ARCH)
-else
-ifeq ($(USE_64), 1)
-MAKEARCH=$(ARCH)64
-else
-MAKEARCH=$(ARCH)
-endif
-endif
-
-PACKAGE_SETUP_LIBS_32=$(subst $(NS64TAG),,$(PACKAGE_SETUP_LIBS))
-
-# set the values of the macros used by rpmbuild
-ifdef BUILD_RPM
-# name and version of RPM - must correspond to the spec file - these get branded
-	RPM_BASE_NAME=fedora
-	RPM_VERSION=1.0.4
-	RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION)
-	RPM_ARCH = $(shell uname -i)
-# root dir for RPM built and temp files
-	ABS_TOPDIR = $(shell cd $(INSTDIR)/.. ; pwd)
-	RPM_TOPDIR = --define "_topdir $(ABS_TOPDIR)"
-# location of source tarball
-	RPM_SOURCEDIR = --define "_sourcedir $(ABS_TOPDIR)"
-# location of staging area built into RPM
-	RPM_BUILDDIR = --define "_builddir $(ABS_INSTDIR)"
-# location of final RPM file
-	RPM_RPMDIR = --define "_rpmdir $(ABS_TOPDIR)"
-# location of source RPM
-	RPM_SRPMDIR = --define "_srcrpmdir $(ABS_TOPDIR)"
-ifneq ($(BUILD_DEBUG), optimize)
-	RPM_FLAVOR = dbg
-else
-	RPM_FLAVOR = opt
-endif
-endif
-
-dummy:
-	-@echo SITEHACK = $(SITEHACK)
-	-@echo PACKAGE_SRC_DEST = $(PACKAGE_SRC_DEST)
-
-importAdmin:
-
-releaseDirectory:
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/ldif/*.ldif $(RELDIR)/$(DS_LDIFDIR)
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/schema/*.ldif $(RELDIR)/$(DS_SCHEMADIR)
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/schema/slapd-collations.conf $(RELDIR)/$(DS_CONFIGDIR)
-
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/lib/ldaputil/certmap.conf $(RELDIR)/$(DS_CONFIGDIR)
-
-# the httpd library
-ifneq ($(ARCH), WINNT)
-  ifeq ($(ARCH), SOLARIS)
-	$(INSTALL) -m 755 $(OBJDIR)/$(NSHTTPD_DLL)$(DLL_PRESUF).$(DLL_SUFFIX)* $(LDAP_PLUGIN_RELDIR)
-  else
-	$(INSTALL) -m 755 $(OBJDIR)/$(NSHTTPD_DLL)$(DLL_PRESUF).$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)
-  endif
-endif
-
-# Images for IM Presence plugin
-ifdef BUILD_PRESENCE
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/presence/images/*.gif $(RELDIR)/$(DS_CONFIGDIR)/presence
-endif
-
-ifdef USE_PURIFY
-	-$(INSTALL) -m 755 $(DB_LIBPATH)/*.so_pure* $(DS_LIBDIR)
-	-$(INSTALL) -m 755 $(NSCP_DISTDIR)/lib/*.so_pure* $(DS_LIBDIR)
-	rm -f $(RELDIR)/$(DS_LIBDIR)/ns-slapd
-	mv -f $(RELDIR)/$(DS_LIBDIR)/ns-slapd.pure $(RELDIR)/$(DS_LIBDIR)/ns-slapd
-endif
-ifdef USE_QUANTIFY
-	rm -f $(RELDIR)/$(DS_LIBDIR)/ns-slapd
-	mv -f $(RELDIR)/$(DS_LIBDIR)/ns-slapd.quantify $(RELDIR)/$(DS_LIBDIR)/ns-slapd
-endif
-
-	$(INSTALL) -m 755 $(OBJDIR)/lib/libsi18n/ns-slapd.properties $(RELDIR)/$(DS_PROPERTYDIR)
-
-# Install LDAP Readme and License files at root of SLAPD Release sub-directory.
-ifeq ($(ARCH), WINNT)
-	if [ -d $(LDAPDIR)/docs ] ; then \
-		cd $(LDAPDIR)/docs; \
-		perl $(NT_RELTOOLS)/unx2dos.plx WINNT LICENSE.txt $(RELDIR)/$(DS_ETCDIR); \
-		perl $(NT_RELTOOLS)/unx2dos.plx WINNT LICENSE.txt $(RELDIR); \
-		perl $(NT_RELTOOLS)/unx2dos.plx WINNT README.txt $(RELDIR)/$(DS_ETCDIR); \
-		perl $(NT_RELTOOLS)/unx2dos.plx WINNT README.txt $(RELDIR); \
-	fi
-else
-	if [ -d $(LDAPDIR)/docs ] ; then \
-		cd $(LDAPDIR)/docs; \
-		$(INSTALL) -m 755 README.txt LICENSE.txt $(RELDIR)/$(DS_ETCDIR); \
-		$(INSTALL) -m 755 README.txt LICENSE.txt $(RELDIR); \
-	fi
-endif
-
-# include the old configuration files in the package so we can use them
-# for comparison purposes during migration
-	$(INSTALL) -m 444 $(LDAPDIR)/cm/v1confs/*.* $(RELDIR)/$(DS_LEGACYSCHEMADIR)/version1
-	$(INSTALL) -m 444 $(LDAPDIR)/cm/v3confs/*.* $(RELDIR)/$(DS_LEGACYSCHEMADIR)/version3
-	$(INSTALL) -m 444 $(LDAPDIR)/cm/v4confs/40/*.*  $(RELDIR)/$(DS_LEGACYSCHEMADIR)/version4/40
-	$(INSTALL) -m 444 $(LDAPDIR)/cm/v4confs/41/*.*  $(RELDIR)/$(DS_LEGACYSCHEMADIR)/version4/41
-	$(INSTALL) -m 444 $(LDAPDIR)/cm/v4confs/411/*.* $(RELDIR)/$(DS_LEGACYSCHEMADIR)/version4/411
-	$(INSTALL) -m 444 $(LDAPDIR)/cm/v4confs/412/*.* $(RELDIR)/$(DS_LEGACYSCHEMADIR)/version4/412
-
-# for RPM, include the post install setup program
-ifdef BUILD_RPM
-	$(INSTALL) -m 755 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/cm/newinst/setup $(RELDIR)/$(DS_SETUPDIR)
-endif # BUILD_RPM
-
-	find $(RELDIR) -exec chmod go-w {} \;
-# $(RELDIR)/$(DS_LIBDIR) may host a core file if the server crashes
-# shortly after startup (otherwise, cores go in slapd-instance/logs)
-# For security reasons, it's readable only by the owner
-# but it needs to be executable (11) so that it can
-# load in shared libs from slapd/lib after the setuid
-	chmod 711 $(RELDIR)/$(DS_LIBDIR)
-
-$(INSTDIR):
-	$(MKDIR) -p $@
-
-$(INSTDIR)/slapd:
-ifeq ($(USE_SETUPUTIL), 1)
-	$(MKDIR) -p $@
-endif
-
-# Packaging for UNIX is totally different than NT, so we conditionally execute here
-
-ifneq ($(ARCH), WINNT)
-
-# ---THE UNIX PACKAGE---
-packageDirectory: $(INSTDIR) $(INSTDIR)/slapd \
-	$(ADMSERV_DEP)
-
-# LIBS_TO_PKG is defined in components.mk - these are component files (not directories) to install
-# with the other component files that we don't necessarily pick up from the admin server build
-# see below for windows packaging
-ifneq ($(ARCH), WINNT)
-###############################################################################
-### THIS INSTALLATION SHOULD GO AWAY, WHEN LIBS_TO_PKG BECOME SYSTEM LIB: BEGIN
-###############################################################################
-	for file in $(LIBS_TO_PKG) ; \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(RELDIR)/$(DS_LIBDIR) ; \
-	fi ; \
-	done
-# these are files to copy to the bin directory - ldap cmd line tools, sec tools, etc.
-	for file in $(BINS_TO_PKG_SHARED); \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(RELDIR)/$(CORE_BINDIR) ; \
-	fi ; \
-	done
-# these are files to copy to the lib directory - ldap cmd line tools, sec tools, etc.
-	for file in $(LIBS_TO_PKG_SHARED); \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(RELDIR)/$(CORE_LIBDIR) ; \
-	fi ; \
-	done
-#############################################################################
-### THIS INSTALLATION SHOULD GO AWAY, WHEN LIBS_TO_PKG BECOME SYSTEM LIB: END
-#############################################################################
-# these are libs to copy to lib on unix to support dsgw & pb
-ifeq ($(USE_DSGW), 1)
-	for file in $(LIBS_TO_PKG_CLIENTS); \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(RELDIR)/$(CORE_LIBDIR) ; \
-	fi ; \
-	done
-# the httpd library
-	$(INSTALL) -m 755 $(OBJDIR)/$(NSHTTPD_DLL)$(DLL_PRESUF).$(DLL_SUFFIX)* $(RELDIR)/$(CORE_LIBDIR)
-endif # USE_DSGW
-## We don't need this any more, do we?
-#ifeq ($(PACKAGE_LIB32), 1)
-## these are files to copy to the shared32/lib directory - nspr, nss, ldapsdk lib
-#	for file in $(LIBS_TO_PKG_SHARED_32); \
-#	do if [ -f $$file ] ; \
-#	then $(INSTALL) -m 755 $$file $(RELDIR)/shared32/lib ; \
-#	fi ; \
-#	done
-#endif
-## We don't need this any more, do we?
-endif
-
-# PACKAGE_SRC_DEST is defined in components.mk - these are component files and directories to install
-# with the other component files that we don't necessarily pick up from the admin server build
-# these can go in any directory
-	for dest in $(PACKAGE_SRC_DEST) ; \
-	do if [ "$$src" ] ; \
-	then if [ ! -d $(RELDIR)/$$dest ] ; then mkdir -p $(RELDIR)/$$dest ; fi ; \
-		if [ -d $$src ] ; \
-		then bs=`basename $$src` ; \
-			if [ -d $(RELDIR)/$$dest/$$bs ] ; then rm -rf $(RELDIR)/$$dest/$$bs ; fi ; \
-			cp -r $$src $(RELDIR)/$$dest ; \
-		else $(INSTALL) -m 755 $$src $(RELDIR)/$$dest ; \
-		fi ; \
-		src= ; \
-	else src=$$dest ; \
-	fi ; \
-	done
-
-# PACKAGE_SRC_DESTFILE is defined in components.mk - these are component files and directories to install
-# with the other component files that we don't necessarily pick up from the admin server build
-# these can go in any directory - this differs from PACKAGE_SRC_DEST above in that in this case, the
-# destination is a _file_, not a directory, and src must be a filename, not a directory
-	for destfile in $(PACKAGE_SRC_DESTFILE) ; \
-	do if [ "$$src" ] ; \
-	then destdir=`dirname $$destfile` ; \
-		if [ ! -d $(RELDIR)/$$destdir ] ; then mkdir -p $(RELDIR)/$$destdir ; fi ; \
-		$(CP) $$src $(RELDIR)/$$destfile ; \
-		src= ; \
-	else src=$$destfile ; \
-	fi ; \
-	done
-
-# install the DSMLGW into the client directory
-# the following DSML files must be packaged separately:
-# web-app_2_3.dtd, activation.jar, saaj.jar - due to Sun license
-# jaxrpc-api.jar, jaxrpc.jar, xercesImpl.jar, xml-apis.jar, crimson.jar - due to Apache license
-ifeq ($(USE_DSMLGW), 1)
-	$(MKDIR) $(RELDIR)/$(DS_DSMLGWDIR)
-	if [ -d $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis ] ; then \
-		$(CP) -R $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis/*  $(RELDIR)/$(DS_DSMLGWDIR) ; \
-	fi
-
-	$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF/lib
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/server-config.wsdd $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/$(DS_DSMLGWDIR)/
-
-# now time to move the necessary jars in place
-	$(INSTALL) -m 644 $(LDAPJARFILE)  $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF/lib
-	if [ -f $(DSMLGWJARS_BUILD_DIR)/jaf.jar ] ; then \
-		$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaf.jar  $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF/lib ; \
-	else \
-		$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar  $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF/lib ; \
-	fi
-# 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 $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar ] ; then \
-		$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar  $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF/lib ; \
-	fi
-	$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc.jar  $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF/lib
-	$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar  $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
-	$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF/lib
-	$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF/lib
-	$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jakarta-commons-codec.jar $(RELDIR)/$(DS_DSMLGWDIR)/WEB-INF/lib
-endif # USE_DSMLGW
-
-# PACKAGE_UNDER_JAVA is defined in components.mk - these are component .jar files to install
-# with the other component files that we don't necessarily pick up from the admin server build
-# these go in the java/ directory
-ifdef PACKAGE_UNDER_JAVA
-	for file in $(PACKAGE_UNDER_JAVA) ; \
-		do if [ -f $$file ] ; \
-		then $(INSTALL) -m 755 $$file $(RELDIR)/$(DS_JAVADIR) ; \
-	fi ; \
-	done
-endif
-
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/dsml/*.dsml $(RELDIR)/$(DS_DSMLGWDIR)
-
-### Package up the orgchart ###
-ifeq ($(USE_ORGCHART), 1)
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.gif $(RELDIR)/clients/orgchart/html
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.html $(RELDIR)/clients/orgchart/html
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.css $(RELDIR)/clients/orgchart/html
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.tmpl $(RELDIR)/clients/orgchart
-
-ifeq ($(ARCH), WINNT)
-	$(INSTALL) -m 755 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.bat $(RELDIR)/clients/orgchart/bin
-	$(INSTALL) -m 755 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.pl $(RELDIR)/clients/orgchart/bin
-else
-	$(MKDIR) $(RELDIR)/clients/orgchart/bin
-	$(CP) $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/org.pl $(RELDIR)/clients/orgchart/bin/org
-	$(CP) $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/myorg.pl $(RELDIR)/clients/orgchart/bin/myorg
-	chmod 755 $(RELDIR)/clients/orgchart/bin/org
-	chmod 755 $(RELDIR)/clients/orgchart/bin/myorg
-endif
-endif # USE_ORGCHART
-### end orgchart package ###
-
-# libdb for windows special and smartheap
-ifeq ($(ARCH), WINNT)
-    ### THIS INSTALLATION SHOULD GO AWAY, WHEN LIBS_TO_PKG BECOME SYSTEM LIB
-	$(INSTALL) -m 755 $(DB_LIBPATH)/$(DB_LIBNAME).$(DLL_SUFFIX) $(RELDIR)/$(DS_LIBDIR)
-	$(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)  $(RELDIR)/$(DS_LIBDIR)
-#Install smartheap dll in the server binary directory
-ifeq ($(DEBUG), optimize)
-	$(INSTALL) -m 755 $(SH_LIBPATH)/shsmp.$(DLL_SUFFIX)  $(RELDIR)/$(DS_LIBDIR)
-endif
-endif # WINNT
-
-ifeq ($(ARCH), SOLARIS)
-ifndef LDAP_DONT_USE_SMARTHEAP
-    ### THIS INSTALLATION SHOULD GO AWAY, WHEN LIBS_TO_PKG BECOME SYSTEM LIB
-    ### BUT WE DON'T NEED THIS ANY MORE, DO WE?
-	$(INSTALL) -m 755 $(SH_LIBPATH)/libsh.$(DLL_SUFFIX)  $(RELDIR)/$(DS_LIBDIR)
-endif
-endif
-
-ifeq ($(ARCH), HPUX)
-ifeq ($(DEBUG), optimize)
-ifndef LDAP_DONT_USE_SMARTHEAP
-    ### DO WE STILL NEED THIS???
-	$(INSTALL) -m 755 $(SH_LIBPATH)/libsh.$(DLL_SUFFIX)  $(RELDIR)/$(DS_LIBDIR)
-endif
-endif
-endif
-
-# if not Linux, we need package sasl library and supported plugins
-ifneq ($(ARCH), Linux)
-	$(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)
-	$(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(RELDIR)/$(CORE_LIBDIR)
-	-mkdir $(DS_LIBDIR)/sasl2
-	$(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libdigestmd5.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)/sasl2
-	$(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libgssapiv2.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)/sasl2
-endif
-
-# the plugin API
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/slapi-plugin.h $(RELDIR)/$(DS_PLUGINDIR)/include
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/slapi-plugin-compat4.h $(RELDIR)/$(DS_PLUGINDIR)/include
-#	if [ -f $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/docs/plugin/README ] ; \
-#	then $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/docs/plugin/README $(RELDIR)/plugins/slapd ; \
-#	fi
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/*.c $(RELDIR)/$(DS_PLUGINDIR)/examples
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/*.h $(RELDIR)/$(DS_PLUGINDIR)/examples
-	$(INSTALL) -m 644 $(DB_INCLUDE)/db.h $(RELDIR)/$(DS_PLUGINDIR)/examples
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/README $(RELDIR)/$(DS_PLUGINDIR)/examples
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/clients/*.* $(RELDIR)/$(DS_PLUGINDIR)/examples/clients
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/clients/README $(RELDIR)/$(DS_PLUGINDIR)/examples/clients
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/*.c $(RELDIR)/$(DS_PLUGINDIR)/examples/distrib
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/README $(RELDIR)/$(DS_PLUGINDIR)/examples/distrib
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/Makefile.$(MAKEARCH) $(RELDIR)/$(DS_PLUGINDIR)/examples
-	$(MV) $(RELDIR)/$(DS_PLUGINDIR)/examples/Makefile.$(MAKEARCH) $(RELDIR)/$(DS_PLUGINDIR)/examples/Makefile
-	$(CP) $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/Makefile.$(MAKEARCH) $(RELDIR)/$(DS_PLUGINDIR)/examples/distrib/Makefile
-ifeq ($(ARCH), WINNT)
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/testplugin.mak $(RELDIR)/$(DS_PLUGINDIR)/examples
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/testplugin.def $(RELDIR)/$(DS_PLUGINDIR)/examples
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/testplugin.dsp $(RELDIR)/$(DS_PLUGINDIR)/examples
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/distrib.dsp $(RELDIR)/$(DS_PLUGINDIR)/examples/distrib
-	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/libdistrib.def $(RELDIR)/$(DS_PLUGINDIR)/examples/distrib
-endif
-ifeq ($(ARCH), WINNT)
-	$(INSTALL) -m 755 $(LIBSLAPD) $(RELDIR)/$(DS_PLUGINDIR)/lib
-	$(INSTALL) -m 755 $(NSPR_LIBPATH)/*.lib $(RELDIR)/$(DS_PLUGINDIR)/lib
-# needed only for testdatainterop plugin in the plugins examples
-	mkdir -p $(RELDIR)/$(DS_PLUGINDIR)/examples/lib
-	$(INSTALL) -m 755 $(DB_LIBPATH)/$(DB_LIBNAME).lib $(RELDIR)/$(DS_PLUGINDIR)/examples/lib
-endif
-
-# install the ds jar file in the <server root>/$(DS_CONSOLEDIR) directory
-# also install the other jar files we use
-ifeq ($(USE_CONSOLE), 1)
-	$(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_CONSOLEDIR)
-	$(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_CONSOLEDIR)
-  ifneq ($(ARCH), WINNT)
-	-(cd $(RELDIR)/$(DS_CONSOLEDIR); ln -s $(LDAPCONSOLEJAR_EN) $(LDAPCONSOLEGENJAR_EN))
-	-(cd $(RELDIR)/$(DS_CONSOLEDIR); ln -s $(LDAPCONSOLEJAR) $(LDAPCONSOLEGENJAR))
-  endif
-endif
-ifeq ($(USE_JAVATOOLS), 1)
-	$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_CONSOLEDIR)
-	$(INSTALL) -m 644 $(CRIMSONJAR_FILE) $(EXT_JAVA_RELDIR)/$(DS_CONSOLEDIR)
-	if [ -f $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) ] ; then \
-		$(INSTALL) -m 644 $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) $(EXT_JAVA_RELDIR)/$(DS_CONSOLEDIR) ; \
-	fi
-endif
-
-# docs
-	-$(RM) -r $(RELDIR)/$(DS_DOCDIR)/en/slapd
-	-$(MKDIR) $(RELDIR)/$(DS_DOCDIR)/en/slapd
-# copy over the manual files built in our build tree
-	if [ -d "$(OBJDIR)/manual/slapd" ] ; then \
-	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/help/*.* $(RELDIR)/$(DS_DOCDIR)/en/slapd/help ; \
-	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.map $(RELDIR)/$(DS_DOCDIR)/en/slapd/ ; \
-	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.htm $(RELDIR)/$(DS_DOCDIR)/en/slapd/ ; \
-	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/pixel.gif $(RELDIR)/$(DS_DOCDIR)/en/slapd/ ; \
-	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/topicindex.htm $(RELDIR)/$(DS_DOCDIR)/en/slapd/ ; \
-	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/tokens.map $(RELDIR)/$(DS_DOCDIR)/en/slapd/ ; \
-    fi
-# copy the manual files from the zip files or checked out directory
-	if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
-      if [ -f $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) ] ; then \
-	    $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) -d $(RELDIR)/$(DS_DOCDIR)/en/slapd ; \
-	    $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS) -d $(RELDIR)/$(DS_DOCDIR)/en/slapd ; \
-      else \
-        cp -r $(DSDOC_DIR) $(RELDIR)/$(DS_DOCDIR)/en/slapd ; \
-      fi ; \
-	fi
-
-# Copy db tools 
-### THIS INSTALLATION SHOULD GO AWAY, WHEN LIBS_TO_PKG BECOME SYSTEM LIB
-	$(INSTALL) -m 755 $(DB_BINPATH)/db_printlog$(EXE_SUFFIX) $(RELDIR)/$(DS_LIBDIR)
-	$(INSTALL) -m 755 $(DB_BINPATH)/db_verify$(EXE_SUFFIX) $(RELDIR)/$(DS_LIBDIR)
-
-# this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others
-ifeq ($(USE_SETUPUTIL), 1)
-	cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR)
-	@echo "removing unzipped dir"
-	@dirs=`ls $(INSTDIR)`; for adir in $$dirs ; do \
-	  if [ -d $(INSTDIR)/$$adir/unzipped ] ; then \
-	    rm -rf $(INSTDIR)/$$adir/unzipped; \
-	  fi; \
-	done
-ifeq ($(DS_BRAND), redhat)
-	@(cd $(INSTDIR); \
-	$(PERL) $(RELTOOLSPATH)/brandver.pl -i $(ABS_ROOT)/branding/rhds/setup.dat; \
-	cat setup.inf | sed -e "s/^#Resource/Resource/" > setup.inf.tmp; \
-	mv setup.inf.tmp setup.inf)
-endif
-endif
-
-ifeq ($(USE_SETUPUTIL), 1)
-# copy in our product .inf files
-	$(INSTALL) -m 755 $(OBJDIR)/*.inf $(INSTDIR)/slapd
-endif
-
-# strip the executables in the optimized build
-ifeq ($(DEBUG), optimize)
-# purify doesn't like stripped executables
-ifndef USE_PURIFY
-ifndef USE_QUANTIFY
-ifdef SAVE_UNSTRIP
-	mkdir -p $(RELDIR_UNSTRIP)
-	cp -R $(RELDIR)/* $(RELDIR_UNSTRIP)
-endif
-  ifeq ($(SECURITY_RELDATE), NSS_3_7_9_RTM)
-	./unixstrip $(PERL) $(RELDIR)
-  else
-	./unixstrip $(PERL) $(RELDIR) $(SECURITY_BUILD_DIR)/bin/shlibsign $(SECURITY_BUILD_DIR)/lib:$(NSPR_BUILD_DIR)/lib
-  endif
-endif
-endif
-endif
-
-ifdef BUILD_PATCH
-# take care of files in components (e.g., a file in nsadmin.zip)
-	-@for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
-	  zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
-	  afile=`echo $$pair | awk -F: '{print $$2}'` ; \
-	  cd $(ABSRELDIR)/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
-	done
-ifdef BUILD_RPM
-# create a patch
-	$(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
-	mv $(ABSRELDIR)/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/$(NS_BUILD_FLAVOR).original
-	ln -s $(ABSRELDIR)/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/$(NS_BUILD_FLAVOR)
-endif
-endif
-
-ifeq ($(USE_DSMLGW), 1)
-#	cd $(EXT_JAVA_RELDIR) ; tar cf - * | gzip > $(ABS_INSTDIR)/extjava.tar.gz
-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
-ifdef RSH_ZIP_HOST
-# Workaround for problems with ZIP and some SunOS5.6 nfs servers
-# Usage : RSH_ZIP_HOST=remote host for zipping RSH_ZIP_PATH=full path on remote host for zip binary
-	$(RSH) $(RSH_ZIP_HOST) "cd $(TMP_CM_PWD)/$(RELDIR); $(RSH_ZIP_PATH)/$(ZIP) $(ZIP_FLAGS) $(ABS_INSTDIR)/slapd/slapd-client.zip ./java"
-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 $(DS_LIBDIR)/$$file$(DOTEXE) ; \
-#	done
-
-ifeq ($(USE_SETUPUTIL), 1)
-# create the slapd zip file
-	rm -f $(INSTDIR)/slapd/ns$(DIR).zip
-# create installable package
-ifdef RSH_ZIP_HOST
-# Workaround for problems with ZIP and some SunOS5.6 nfs servers (see above)
-	rsh $(RSH_ZIP_HOST) "cd $(TMP_CM_PWD)/$(RELDIR); $(RSH_ZIP_PATH)/$(ZIP) $(ZIP_FLAGS) $(ABS_INSTDIR)/slapd/ns$(DIR).zip * $(EXCLUDED_FILES) "
-else
-# Normal way to ZIP the bits
-	cd $(RELDIR); $(ZIP) $(ZIP_FLAGS) $(ABS_INSTDIR)/slapd/ns$(DIR).zip * $(EXCLUDED_FILES)
-endif
-
-# do one last check for aix. aix zip doesn't like -r -T 
-	$(ZIP) -T  $(INSTDIR)/slapd/ns$(DIR).zip
-# install the ns-config file into the slapd package directory
-	$(INSTALL) -m 755 $(RELDIR)/bin/slapd/admin/bin/ns-config $(INSTDIR)/slapd
-
-# if we are packaging our own version of the components, we need them during setup too
-	-@for file in $(PACKAGE_SETUP_LIBS) ; \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(INSTDIR)/slapd ; \
-	fi ; \
-	done
-else # !USE_SETUPUTIL
-  ifdef BUILD_SHIP
-	cd $(RELDIR); $(TAR) cf - * | gzip > $(BUILD_SHIP)/$(FTPNAMEGZ)
-  else
-	cd $(RELDIR); $(TAR) cf - * | gzip > $(ABS_INSTDIR)/slapd.tar.gz
-  endif
-endif # USE_SETUPUTIL
-
-ifeq ($(USE_ADMINSERVER), 1)
-# if the untar directory is there, hooray; otherwise, we will have to unpack the
-# binaries ourselves . . .
-	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 $(ADMINSERVER_SUBCOMPS) ; \
-			do rm -rf $(INSTDIR)/$$file ; \
-			cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
-		done ; \
-	fi
-endif # USE_ADMINSERVER
-
-# make sure setup.inf has everything we need
-ifeq ($(USE_SETUPUTIL),1)
-	cp $(INSTDIR)/setup.inf $(INSTDIR)/setup.inf.tmp
-	$(PERL) -w $(FIX_SETUP_INF) $(INSTDIR)/setup.inf.tmp $(INSTDIR)/setup.inf $(USE_ADMINSERVER)
-	rm -f $(INSTDIR)/setup.inf.tmp
-
-# we must remove the nsbase.zip file - we package those files now
-	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
-endif
-
-# 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.
-	if [ -d $(LDAPDIR)/docs ] ; then \
-		rm -rf $(INSTDIR)/LICENSE.txt $(INSTDIR)/README.txt; \
-		$(INSTALL) -m 755 $(LDAPDIR)/docs/README.txt $(LDAPDIR)/docs/LICENSE.txt $(INSTDIR); \
-	fi
-
-# Install dsktune at root of Installation
-	cp $(RELDIR)/$(DS_LIBDIR)/dsktune $(INSTDIR)
-
-ifeq ($(USE_SETUPUTIL), 1)
-ifndef NO_INSTALLER_TAR_FILES
-# build the slapd package tar file
-	cd $(INSTDIR); $(TAR) cvf - slapd \
-	| gzip -f > ../$(NS_BUILD_FLAVOR).tar.gz
-# build the combined packages tar file; use h flag to follow symlinks
-ifdef BUILD_SHIP
-ifndef BUILD_PATCH
-	cd $(INSTDIR); $(TAR) cvfh - $(LDAP_PACKAGE_FILES) \
-	$(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
-endif
-ifeq ($(DEBUG), optimize)
-#	$(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
-endif
-else
-	echo base/unzipped > $(TMPLIST)
-	echo admin/unzipped >> $(TMPLIST)
-	cd $(INSTDIR); $(TAR) cvfh - -X $(TMPLIST) $(LDAP_PACKAGE_FILES) \
-	$(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
-	rm -f $(TMPLIST)
-endif # BUILD_SHIP
-#cp $(INSTDIR).tar.gz  $(BUILD_SHIP)
-#cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz  $(BUILD_SHIP)
-# $(INSTDIR) is used to build international products.
-endif
-endif # USE_SETUPUTIL
-
-ifdef BUILD_RPM
-# make the .spec file - actually lives in OBJDIR
-	$(MAKE) $(MFLAGS) -C $(BUILD_ROOT) $(RPM_BASE_NAME)-ds.spec
-# create the source tarball - the name must correspond to the Source: in the spec file
-# they should correspond because the values come from the same source - branding
-	startdir=`pwd` ; cd $(BUILD_ROOT) ; builddir=`pwd` ; \
-	cd $$startdir ; cd $(INSTDIR)/.. ; \
-	if [ ! -f $(RPM_FILE_BASE).tar.gz ] ; then \
-		if [ ! -d $(RPM_FILE_BASE) -a ! -f $(RPM_FILE_BASE) ] ; then \
-			ln -s $$builddir $(RPM_FILE_BASE) ; \
-		fi ; tar cfh - --exclude \*/built --exclude \*/CVS --exclude \*/branding --exclude \*/RHEL* $(RPM_FILE_BASE) | gzip > $(RPM_FILE_BASE).tar.gz ; \
-		if [ -h $(RPM_FILE_BASE) ] ; then \
-			rm $(RPM_FILE_BASE) ; \
-		fi ; \
-	fi
-# execute the RPM build
-	rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) $(RPM_REQUIRES) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(OBJDIR)/$(RPM_BASE_NAME)-ds.spec
-
-ifdef BUILD_SHIP
-	cp $(ABS_TOPDIR)/$(RPM_FILE_BASE)*$(NSOS_ARCH)$(NSOS_RELEASE).$(RPM_ARCH).$(RPM_FLAVOR).rpm $(BUILD_SHIP)
-endif # BUILD_SHIP
-endif # BUILD_RPM
-
-ifdef BUILD_PATCH
-	mkdir -p $(PATCHINSTDIR)/$(SLAPDSP)
-	cp $(INSTDIR)/setup $(PATCHINSTDIR)/dssetup
-	cp $(INSTDIR)/unzip_wrapper.pl $(PATCHINSTDIR)
-	cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR)
-	cp $(INSTDIR)/README.txt $(PATCHINSTDIR)
-	cp $(BUILD_ROOT)/ldap/cm/newinst/setup.patch $(PATCHINSTDIR)/setup
-# prepare the main inf file: setup.inf pointing inf file $(SLAPDS)/$(SLAPD).inf
-	sed -e "s/Components.*=/Components = $(SLAPDSP)/" $(INSTDIR)/setup.inf > $(PATCHINSTDIR)/setup.inf
-	echo "" >> $(PATCHINSTDIR)/setup.inf
-	echo "[$(SLAPDSP)]" >> $(PATCHINSTDIR)/setup.inf
-	echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf
-# create a zip file based upon the $(PATCHINF) file
-	cd $(ABSRELDIR)/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `grep "^file:" $(PATCHINF) | awk -F: '{print $$3}'`
-	cd $(ABSRELDIR)/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'`
-# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
-	$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
-	-@for file in $(PACKAGE_SETUP_LIBS_32) ; \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(PATCHINSTDIR)/$(SLAPDSP) ; \
-	fi ; \
-	done
-# create patch inf file: $(SLAPD).inf
-	cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
-	cd $(ABSRELDIR)/$(NS_BUILD_FLAVOR); ls `grep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
-	cd $(ABSRELDIR)/$(NS_BUILD_FLAVOR); ls `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` >> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
-	echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
-	echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
-	rm -f $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
-ifdef BUILD_SHIP
-	cd $(PATCHINSTDIR); $(TAR) cvfh - * | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
-else
-	cd $(PATCHINSTDIR); $(TAR) cvfh - * | gzip -f > ../$(NS_BUILD_FLAVOR)-SP.tar.gz
-endif
-endif
-
-else
-
-# ---THE NT PACKAGE---
-$(PACKAGE_STAGE_DIR):
-	mkdir -p $@
-
-$(INSTDIR):
-	mkdir -p $@
-
-###self-extracting EXE using EXEBUILD and MAKE the INI file on the fly ##
-# and rename OBJDIR_BASE directroy to temp since EXEBUILDER chokes on LFNS 
-# when building across NFS, then rename it back. davidk
-
-make_zip:
-	if [ -d $(LDAPDIR)/docs ] ; then \
-		rm -rf $(INSTDIR)/license-nt.txt $(INSTDIR)/slapd.txt $(INSTDIR)/README.txt $(INSTDIR)/LICENSE.txt; \
-		cd $(LDAPDIR)/docs; $(INSTALL) -m 755 README.txt LICENSE.txt $(INSTDIR); \
-	fi
-ifdef BUILD_SHIP
-	cd $(INSTDIR); zip -r $(BUILD_SHIP)/$(FTPNAME) * 
-endif
-
-endif
-
-## Run Acceptance Test from the auto builds
-## Run it only on domestic - optimized
-## davidk
-
-ifeq ($(BUILD_SECURITY), domestic)
-ifeq ($(BUILD_DEBUG), optimize)
-acceptdir=../../../tetframework/testcases/DS/6.0/acceptance
-longdir=../../../tetframework/testcases/DS/6.0/longduration
-endif
-endif
-
-Acceptance:
-ifdef BUILD_SHIP
-ifeq ($(BUILD_SECURITY), domestic)
-ifeq ($(BUILD_DEBUG), optimize)
-ifeq ($(ARCH), HPUX)
-ifeq ($(USE_64), 1)  # only run acceptance on 64-bit HPUX builds
-	$(acceptdir)/accept $(BUILD_SHIP)/$(FTPNAMEGZ) &
-endif  # USE_64
-else
-ifeq ($(ARCH), Linux)
-ifdef BUILD_RPM
-	$(acceptdir)/accept $(shell echo $(BUILD_SHIP)/$(RPM_FILE_BASE)*$(NSOS_ARCH)$(NSOS_RELEASE).$(RPM_ARCH).$(RPM_FLAVOR).rpm) &
-else # !BUILD_RPM
-	$(acceptdir)/accept $(BUILD_SHIP)/$(FTPNAMEGZ) &
-endif  # BUILD_RPM
-else
-	$(acceptdir)/accept $(BUILD_SHIP)/$(FTPNAMEGZ) &
-endif  # Linux
-endif  # HPUX
-endif  # optimize
-endif  # domestic
-endif  # BUILD_SHIP
-
-Longduration:
-ifdef BUILD_SHIP
-ifeq ($(BUILD_SECURITY), domestic)
-ifeq ($(BUILD_DEBUG), optimize)
-ifeq ($(ARCH), HPUX)
-ifeq ($(USE_64), 1)  # only run long duration on 64-bit HPUX builds
-	$(longdir)/longduration $(BUILD_SHIP)/$(FTPNAMEGZ) &
-endif  # USE_64
-else
-ifeq ($(ARCH), Linux)
-ifdef BUILD_RPM
-	$(longdir)/longduration $(shell echo $(BUILD_SHIP)/$(RPM_FILE_BASE)*$(NSOS_ARCH)$(NSOS_RELEASE).$(RPM_ARCH).$(RPM_FLAVOR).rpm) &
-endif  # BUILD_RPM
-else
-	$(longdir)/longduration $(BUILD_SHIP)/$(FTPNAMEGZ) &
-endif  # Linux
-endif  # HPUX
-endif  # optimize
-endif  # domestic
-endif  # BUILD_SHIP
-
-cleanDirectory:
-	cd $(LDAPDIR); $(MAKE) clean
-	rm -rf $(BUILD_ROOT)/../dist/$(NSOBJDIR_NAME)
-	rm -rf $(BUILD_ROOT)/built/$(NS_BUILD_FLAVOR)
-
-
-ifeq ($(ARCH), WINNT)
-copyLibslapd: $(OBJDIRLIB) 
-	$(CP) $(INST_TARGET_RESKIT)/libslapd.$(DLL_SUFFIX) $(LIBSLAPD_DEP)
-	$(CP) $(INST_TARGET_RESKIT)/libslapd.$(LIB_SUFFIX) $(LIBSLAPD)
-else
-copyLibslapd: $(OBJDIRLIB) 
-	$(CP) $(INST_TARGET_RESKIT)/libslapd.$(DLL_SUFFIX) $(LIBSLAPD_DEP)
-endif
-
-packageReskit:
-ifdef BUILD_SHIP
-	rm -rf $(BUILD_SHIP)/$(NS_BUILD_FLAVOR)
-	$(MKDIR) $(BUILD_SHIP)/$(NS_BUILD_FLAVOR)
-ifeq ($(ARCH), WINNT)
-	$(INSTALL) -m 755 $(LIBSLAPD) $(BUILD_SHIP)/$(NS_BUILD_FLAVOR)/lib
-	$(INSTALL) -m 755 $(OBJDIRLIB)/cos-plugin.$(LIB_SUFFIX) $(BUILD_SHIP)/$(NS_BUILD_FLAVOR)/lib
-endif
-	$(INSTALL) -m 755 $(LIBSLAPD_DEP) $(BUILD_SHIP)/$(NS_BUILD_FLAVOR)/lib 
-	$(INSTALL) -m 755 $(OBJDIRLIB)/cos-plugin.$(DLL_SUFFIX) $(BUILD_SHIP)/$(NS_BUILD_FLAVOR)/lib
-endif 
-### END OF DS4.x RESOURCE KIT STUFF
-#####################################################
-
-ifeq ($(ARCH), WINNT)
-
-SLAPD_DIR=slapd
-
-# ------------------------- all below this line is packageDirectory --------------------------
-
-packageDirectory: $(INSTDIR)/$(SLAPD_DIR) _admserv_files _slapd_files _setup_files make_zip
-
-#--------------------------  admserv rules ----------------------------------------------------
-_admserv_files: $(INSTDIR) $(ADMSERV_DEP)
-# we don't want to copy the tarball with the other setup files . . .
-	mv $(ADMSERV_DIR)/$(ADMIN_SERVER_TARGZ) $(ADMSERV_DIR)/..
-# copy in the setup.exe, setup.inf, dlls, etc.
-	cp $(ADMSERV_DIR)/*.* $(INSTDIR)
-# move the tarball back after the copy
-	mv $(ADMSERV_DIR)/../$(ADMIN_SERVER_TARGZ) $(ADMSERV_DIR)
-# make sure our packages are in the setup.inf file
-	$(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf $(USE_ADMINSERVER)
-
-
-#----------------------------  slapd rules --------------------------------------------------
-
-# Files which go in the distibution and which we make ourselves
-SLAPD_ZIPFILE=$(ABS_ROOT_PARENT)/$(MMDD)/$(NS_BUILD_FLAVOR)/$(SLAPD_DIR)/slapd.z
-DSJARS_ZIPFILE=$(ABS_ROOT_PARENT)/$(MMDD)/$(NS_BUILD_FLAVOR)/$(SLAPD_DIR)/dsjars.z
-
-.PHONY: _slapd_files
-
-_slapd_files: $(INSTDIR)/$(SLAPD_DIR)  \
-			   $(INSTDIR)/$(SLAPD_DIR)/slapd.z \
-			   $(INSTDIR)/$(SLAPD_DIR)/dsjars.z
-
-$(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: 
-# see components.mk for a description of LIBS_TO_PKG
-	-@for file in $(LIBS_TO_PKG) ; \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(RELDIR)/$(DS_LIBDIR) ; \
-	fi ; \
-	done
-# these are files to copy to the bin directory - ldap cmd line tools, sec tools, etc.
-	for file in $(BINS_TO_PKG_SHARED) $(LIBS_TO_PKG_SHARED); \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(RELDIR)/$(CORE_BINDIR) ; \
-	fi ; \
-	done
-# these are dlls to copy to the clients/dsgw/bin directory to support dsgw & pb
-	for file in $(LIBS_TO_PKG_CLIENTS); \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(RELDIR)/$(DS_DSGWDIR) ; \
-	fi ; \
-	done
-	$(INSTALL) -m 755 $(OBJDIR)/$(BUILD_HTTPDLL_NAME).dll $(RELDIR)/$(DS_PLUGINDIR)
-	$(INSTALL) -m 755 $(OBJDIR)/$(BUILD_HTTPDLL_NAME).dll $(RELDIR)/$(DS_DSGWDIR)
-	rm -f $(SLAPD_ZIPFILE); cd $(RELDIR); zip -r $(SLAPD_ZIPFILE) *
-
-#----------------------------- setup rules ---------------------------------------------------
-
-_setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \
-			  $(INSTDIR)/$(SLAPD_DIR)/slapd.inf \
-			  $(INSTDIR)/admin $(INSTDIR)/base \
-			  $(INSTDIR)/svrcore
-# see components.mk for a description of PACKAGE_SETUP_LIBS
-	-@for file in $(PACKAGE_SETUP_LIBS) ; \
-	do if [ -f $$file ] ; \
-	then $(INSTALL) -m 755 $$file $(INSTDIR) ; \
-	fi ; \
-	done
-
-$(INSTDIR)/$(SLAPD_DIR)/dsinst.dll: $(OBJDIR)/setup/dsinst.dll
-	cp $< $@
-
-$(INSTDIR)/$(SLAPD_DIR)/slapd.inf: $(OBJDIR)/setup/slapd.inf
-	cp $< $@
-
-$(INSTDIR)/admin: $(ADMSERV_DIR)/admin
-	cp -R $< $@
-
-$(INSTDIR)/base: $(ADMSERV_DIR)/base
-	cp -R $< $@
-	rm -f $@/base.z
-	rm -f $@/basesys.z
-# we need to remove the jre per Red Hat.  Users will download their own jre
-	rm -f $(INSTDIR)/base/jre.z
-# we also need to remove the Archive directive from the [base] section of the
-# base.inf file
-	$(PERL) -w $(FIX_BASE_INF) $@/base.inf
-
-$(INSTDIR)/svrcore: $(ADMSERV_DIR)/svrcore
-	cp -R $< $@
-
-endif
-
-$(OBJDIR)/lib/libsi18n/ns-slapd.properties:
-	cd $(BUILD_ROOT)/lib/libsi18n ; $(MAKE) $(MFLAGS) all
diff --git a/ldap/cm/fedora-patch.inf b/ldap/cm/fedora-patch.inf
deleted file mode 100644
index 2f823f14..00000000
--- a/ldap/cm/fedora-patch.inf
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Sample Info file to generate service pack
-# base: <builddir> containing the base package -- e.g., DS7.1
-# file: <bugzilla number>: <patchfile>
-# compfile: bug#: <patch_zipfile>:<patchfile> 
-#                 %DISTDIR% points <buildroot>/dist/<platform>
-#
-base: /share/dev4/fedora-ds/fds71/ships/20050526.1
-
-file: 000001: README.txt
-file: 000002: lib/libback-ldbm.*
-
-compfile: 000003: %DISTDIR%/adminserver/admin/nsadmin.zip:manual/help/help
diff --git a/ldap/cm/filterfiles.sh b/ldap/cm/filterfiles.sh
deleted file mode 100644
index 84bb7b63..00000000
--- a/ldap/cm/filterfiles.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Usage: filterfiles.sh filter into-dir from-dir from-file ...
-# echo filterdir.sh "$@"
-
-FILTER="$1"; shift
-INTO="$1"; shift
-FROM="$1"; shift
-if [ ! -d ${INTO} ]; then mkdir ${INTO}; fi
-for PATTERN in "$@"; do
-    for FILE in ${FROM}/${PATTERN}; do
-	if [ -f ${FILE} ]; then
-	    BASE=`basename ${FILE}`
-	    case ${BASE} in
-		*.gif )
-		    echo "cp ${FILE} ${INTO}"
-		          cp ${FILE} ${INTO} || exit $? ;;
-		* )
-		    echo "sh ${FILTER} ${FILE} > ${INTO}/${BASE}"
-		          sh ${FILTER} ${FILE} > ${INTO}/${BASE} || exit $? ;;
-	    esac
-	fi
-    done
-done
diff --git a/ldap/cm/fixBaseInf.pl b/ldap/cm/fixBaseInf.pl
deleted file mode 100644
index f9a97384..00000000
--- a/ldap/cm/fixBaseInf.pl
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-# the first argument is the full path and filename of ths nsperl.inf file
-# the second argument is the name of the sub component to use
-
-$infile = $ARGV[0];
-$outfile = $ARGV[0] . ".tmp";
-open(IN, $infile) or die "Error: could not read file $infile: $!";
-open(OUT, ">$outfile") or die "Error: could not write file $outfile: $!";
-
-$inBaseSection = 0;
-while (<IN>) {
-  my $printIt = 1;
-  if ($inBaseSection && /^Archive/) {
-	$printIt = 0; # remove the Archive directives
-  } elsif ($inBaseSection && /^System32Archive/) {
-	$printIt = 0; # remove the Archive directives
-  } elsif ($inBaseSection && /^RestoreFiles/) {
-	$printIt = 0; # these files may not be present
-  }
-  if (/^\[base\]/) {
-	$inBaseSection = 1;
-  } elsif (/^\[/) {
-	$inBaseSection = 0;
-  }
-  print OUT if $printIt;
-}
-
-close OUT;
-close IN;
-
-unlink $infile;
-rename $outfile, $infile;
diff --git a/ldap/cm/fixNSPerlInf.pl b/ldap/cm/fixNSPerlInf.pl
deleted file mode 100644
index 5194eaf6..00000000
--- a/ldap/cm/fixNSPerlInf.pl
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-# the first argument is the full path and filename of ths nsperl.inf file
-# the second argument is the name of the sub component to use
-
-$infile = $ARGV[0];
-$outfile = $ARGV[0] . ".tmp";
-open(IN, $infile) or die "Error: could not read file $infile: $!";
-open(OUT, ">$outfile") or die "Error: could not write file $outfile: $!";
-
-$PRINT = 1;
-while (<IN>) {
-  if (/^Components\s*=\s*/) {
-    if ($' =~ /$ARGV[1]/) {
-      $_ = "Components=$ARGV[1]\n";
-    } else {
-      die "Error: the version of nsPerl in $infile does not contain $ARGV[1]\n";
-    }
-  }
-  if (/^Archive=/) {
-	$_ = "Archive=nsperl561.zip\n";
-  }
-  if (/^\[(\w+)\]/) {
-    if (($1 eq $ARGV[1]) || ($1 eq General)) {
-      $PRINT = 1;
-    } else {
-      $PRINT = 0;
-    }
-  }
-
-  if ($PRINT) {
-    if (/^Description/) {
-	  s/The Sun \| Netscape Alliance/Fedora/g;
-	  s/iPlanet/Fedora/g;
-    } elsif (/^Vendor/) {
-	  s/The Sun \| Netscape Alliance/Fedora/g;
-    }
-    print OUT;
-    if (/^RunPostInstall/) {
-      print OUT "Checked=TRUE\nVisible=FALSE\n";
-    }
-  }
-}
-
-close OUT;
-close IN;
-
-unlink $infile;
-rename $outfile, $infile;
diff --git a/ldap/cm/fixPerlDAPInf.pl b/ldap/cm/fixPerlDAPInf.pl
deleted file mode 100644
index 7875c77e..00000000
--- a/ldap/cm/fixPerlDAPInf.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-# the argument is the full path and filename of the perldap.inf file
-
-$infile = $ARGV[0];
-$outfile = $ARGV[0] . ".tmp";
-open(IN, $infile) or die "Error: could not read file $infile: $!";
-open(OUT, ">$outfile") or die "Error: could not write file $outfile: $!";
-
-while (<IN>) {
-  if (/^Description/) {
-	s/The Sun \| Netscape Alliance/Fedora/g;
-	s/iPlanet/Fedora/g;
-  } elsif (/^Vendor/) {
-	s/The Sun \| Netscape Alliance/Fedora/g;
-  }
-  print OUT;
-  if (/^Archive=perldap.*\.zip/) {
-    print OUT "Visible=FALSE\n";
-  }
-}
-
-close OUT;
-close IN;
-
-unlink $infile;
-rename $outfile, $infile;
diff --git a/ldap/cm/fixSetupInf.pl b/ldap/cm/fixSetupInf.pl
deleted file mode 100644
index 003cba5f..00000000
--- a/ldap/cm/fixSetupInf.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-#
-
-$isNT = -d '\\';
-
-if ($isNT) {
-  $ServerDir = "/Fedora/Servers";
-} else {
-  $ServerDir = "/opt/fedora/servers";
-}
-$ServerDirKey = "DefaultInstallDirectory";
-
-$input = shift;
-$output = shift;
-$use_adminserver = shift;
-
-die "cannot open input file $input" unless open( FILE, $input );
-die "cannot open output file $output" unless open( OUT, ">$output" );
-$inGeneralSection = 0;
-$addServerDir = 1; # add the server dir if it's not already there
-while ( <FILE> ) {
-	# if the line begins with Components and does not contain
-	# slapd already, add ", slapd" to the end 
-	# else, just copy the line to output
-	if ( /^Components/ ) {
-		chomp;
-		if (! /slapd/) {
-			$_ .= ", slapd";
-			$addedSlapd = 1;
-		}
-        if (! /admin/ && $use_adminserver) {
-			$_ .= ", admin";
-			$addedAdmin = 1;
-        }
-		if (! /perldap/) {
-			$_ .= ", perldap";
-			$addedPerLDAP = 1;
-		}
-		$_ .= "\n";
-	}
-	if ( $inGeneralSection && /^$ServerDirKey/ ) {
-		$addServerDir = 0; # already there, don't add it
-	}
-	if ( $inGeneralSection && /^\[/ ) {
-		if ( $addServerDir ) {
-			$_ = "$ServerDirKey = $ServerDir\n$_";
-			$addServerDir = 0;
-		}
-		$inGeneralSection = 0;
-	}
-	if ( /^\[General\]/ ) {
-		$inGeneralSection = 1;
-	}
-	print OUT $_;
-}
-
-close ( FILE );
-
-# now, print the slapd section information
-if ($addedSlapd) {
-	print OUT "\n[slapd]\n";
-	print OUT "ComponentInfoFile = slapd/slapd.inf\n";
-}
-
-if ($addedAdmin) {
-	print OUT "\n[admin]\n";
-	print OUT "ComponentInfoFile = admin/admin.inf\n";
-}
-
-if ($addedPerLDAP) {
-	print OUT "\n[perldap]\n";
-	print OUT "ComponentInfoFile = perldap/perldap.inf\n";
-}
-
-close ( OUT ); 
-
-exit(0);
diff --git a/ldap/cm/genPerlDAPInf.pl b/ldap/cm/genPerlDAPInf.pl
deleted file mode 100644
index 79932f8c..00000000
--- a/ldap/cm/genPerlDAPInf.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2006 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-# Usage: genPerlDAPInf.pl <full_path_to_perldap.inf> <version> <Vendor>
-
-$vendor = "Red Hat, Inc.";
-if ($#ARGV < 1) {
-    print "Usage: genPerlDAPInf.pl <full_path_to_perldap.inf> <version> [<Vendora>]\n";
-    exit 1;
-}
-$outfile = $ARGV[0];
-$version = $ARGV[1];
-if ($#ARGV >= 2) {
-    $vendor = $ARGV[2];
-}
-
-print "outfile: $outfile, version: $version, vendor: $vendor\n";
-
-($nodot_version = $version) =~ tr/\.//d;
-$component = "perldap" . $nodot_version;
-
-open(OUT, ">$outfile") or die "Error: could not write file $outfile: $!";
-print OUT "[General]\n";
-print OUT "Name=PerLDAP\n";
-print OUT "Description=This is mozilla.org PerLDAP.\n";
-print OUT "Components=$component\n\n";
-print OUT "[$component]\n";
-print OUT "Description=The mozilla.org PerLDAP $version\n";
-print OUT "NickName=$component\n";
-print OUT "Name=PerLDAP $version\n";
-print OUT "SourcePath=perldap\n";
-print OUT "Vendor=$vendor\n";
-print OUT "Security=none\n";
-print OUT "Version=$version\n";
-print OUT "Compatible=$version\n";
-print OUT "Archive=perldap-$version.zip\n";
-print OUT "Visible=FALSE\n";
-print OUT "Checked=TRUE\n";
-close OUT;
-
-exit 0;
diff --git a/ldap/cm/genRpmPatch.pl b/ldap/cm/genRpmPatch.pl
deleted file mode 100755
index 2ea24090..00000000
--- a/ldap/cm/genRpmPatch.pl
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/usr/bin/perl
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-#
-
-sub usage {
-    print(STDERR "Usage : $0 -r <releasedir> -o <objdir> -e <extension> -i <identity> -f <inffile>\n");
-    print(STDERR "        -r <releasedir>: built/release dir\n");
-    print(STDERR "        -o <objdir>: e.g., RHEL4-domestic-full-normal-pth-slapd\n");
-    print(STDERR "        -e <extension>: extension for the patch dir\n");
-    print(STDERR "        -i <identity>: fedora or redhat\n");
-    print(STDERR "        -f <inffile>: file containing the patch info\n");
-    print(STDERR "sample <inffile>\n");
-    print(STDERR "  ======================================================\n");
-    print(STDERR "  base: /share/dev4/fedora-ds/fds71/ships/20050526.1\n");
-    print(STDERR "  file: 147585: plugins/slapd/slapi/examples/testpreop.c\n");
-    print(STDERR "  file: 164834,165641: bin/slapd/server/ns-slapd\n");
-    print(STDERR "  ======================================================\n");
-}
-
-$verbose = 0;
-$inffile = "";
-$builtdirname = "";
-$releasedir = "";
-$extension = "";
-$identity = "";
-
-$i = 0;
-while ($i <= $#ARGV) {
-    if ("$ARGV[$i]" eq "-o") {
-        $i++;
-        $builtdirname = $ARGV[$i];
-    } elsif ("$ARGV[$i]" eq "-r") {
-        $i++;
-        $releasedir = $ARGV[$i];
-    } elsif ("$ARGV[$i]" eq "-e") {
-        $i++;
-        $extension = $ARGV[$i];
-    } elsif ("$ARGV[$i]" eq "-i") {
-        $i++;
-        $identity = $ARGV[$i];
-    } elsif ("$ARGV[$i]" eq "-f") {
-        $i++;
-        $inffile = $ARGV[$i];
-    } elsif ("$ARGV[$i]" eq "-v") {
-        $verbose = 1;
-    }
-    $i++;
-}
-
-if ("$builtdirname" eq "") {
-    print(STDERR "ERROR: builtdirname is not given\n");
-    &usage; exit(1);
-}
-if ("$releasedir" eq "") {
-    print(STDERR "ERROR: releasedir is not given\n");
-    &usage; exit(1);
-}
-if ("$extension" eq "") {
-    print(STDERR "ERROR: extension is not given\n");
-    &usage; exit(1);
-}
-if ("$identity" eq "" || 
-    (("$identity" ne "fedora") && ("$identity" ne "redhat"))) {
-    print(STDERR "ERROR: $identity is not fedora or redhat\n");
-    &usage; exit(1);
-}
-if ("$inffile" eq "") {
-    print(STDERR "ERROR: inffile is not given\n");
-    &usage; exit(1);
-}
-if (!(-d "$releasedir")) {
-    print(STDERR "ERROR: $releasedir does not exist\n");
-    exit(1);
-}
-
-unless (open (INFFILE, $inffile)) {
-    die "Error, cannot open info file $inffile\n";
-}
-
-$basedir = 0;
-@newfiles = ();
-while ($l = <INFFILE>) {
-    chop($l);
-    $pos = length($l);
-    if ($l =~ /^base: /) {
-        $pos = rindex($l, ":", $pos);
-        $pos++;
-        $basedir = substr($l, $pos);
-        $basedir =~ s/[     ]//g;
-    } elsif ($l =~ /^file: /) {
-        $pos = rindex($l, ":", $pos);
-        $pos++;
-        $file = substr($l, $pos);
-        $file =~ s/[ 	]//g;
-        push(@newfiles, ($file));
-    } elsif ($l =~ /^compfile: /) {
-        $pos = rindex($l, ":", $pos);
-        $pos++;
-        $file = substr($l, $pos);
-        $file =~ s/[ 	]//g;
-        push(@newfiles, ($file));
-    }
-}
-if (1 == $verbose) {
-    print "Base: $basedir\n";
-    print "New Files:\n";
-    foreach $afile (@newfiles) {
-        print "    $afile\n";
-    }
-}
-
-if ($builtdirname !~ /RHEL/) {
-    print(STDERR "ERROR: Not RHEL\n");
-    exit(1);
-}
-
-# Get info from $builtdirname (e.g., RHEL4-domestic-full-normal-pth-slapd\n")
-$rhelversion = "";
-$rhelversionl = "";
-if ($builtdirname =~ /RHEL3/) {
-    $rhelversion = "RHEL3";
-    $rhelversionl = "rhel3";
-} elsif ($builtdirname =~ /RHEL4/) {
-    $rhelversion = "RHEL4";
-    $rhelversionl = "rhel4";
-} else {
-    print(STDERR "ERROR: $builtdirname is not supported\n");
-    exit(1);
-}
-
-$optordbg = "";
-if ($builtdirname =~ /_DBG/) {
-    $optordbg = "dbg";
-} elsif ($builtdirname =~ /_OPT/) {
-    $optordbg = "opt";
-} else {
-    print(STDERR "ERROR: $builtdirname has no opt/debug info\n");
-    exit(1);
-}
-
-# Get fullpath to the RPM file
-$fullrpmfile = "";
-$iddir = "";
-opendir(BASEDIR, $basedir) or die "ERROR: Could not open $basedir\n";
-while ( defined ( $subdir = readdir(BASEDIR))) {
-    if ($subdir =~ /$rhelversionl/ || $subdir =~ /$rhelversion/) {
-        $fullsubdir = $basedir . "/" . $subdir;
-        opendir(SUBDIR, $fullsubdir) or die "ERROR: Could not open $fullsubdir\n";
-        while ( defined ( $rpmfile = readdir(SUBDIR))) {
-            if (($rpmfile =~ /$rhelversionl/ || $rpmfile =~ /$rhelversion/) &&
-                $rpmfile =~ /$optordbg/ && $rpmfile =~ /\.rpm$/) {
-                $fullrpmfile = $fullsubdir . "/" . $rpmfile;
-                ($org, $ds, $rest) = split('-', $rpmfile, 3);
-                $iddir = $org . "-" . $ds;
-                if ("$org" ne "$identity") {
-                    print "ERROR: rpmfile name $rpmfile does not match the given identity $identity\n";
-                    exit(1);
-                }
-                closedir(SUBDIR);
-                last;
-            }
-        }
-        closedir(BASEDIR);
-        last;
-    }
-}
-if ("$fullrpmfile" eq "") {
-    print(STDERR "ERROR: Cannot file an rpm file under $basedir\n");
-    exit(1);
-}
-if (1 == $verbose) {
-    print "RPM File: $fullrpmfile\n";
-}
-
-# Expand the RPM file to the $releasedir
-$workdir = $releasedir . "/" . $builtdirname . $extension;
-mkdir($workdir, 0700);
-chdir($workdir);
-if (1 == $verbose) {
-    print "Work Dir: $workdir\n";
-}
-open(RPM2CPIO, "rpm2cpio $fullrpmfile | cpio -id | ") or die "Cannot run program: $!\n";
-close(RPM2CPIO);
-
-# Copy new files onto the expanded files
-foreach $afile (@newfiles) {
-    $srcfile = $releasedir . "/" . $builtdirname . "/" . $afile;
-    $destfile = $workdir . "/opt/" . $iddir . "/" . $afile;
-    $destdir = substr($destfile, 0, rindex($destfile, "/", length($destfile)));
-    if (!(-d $destdir)) {
-        print "WARNING: $destdir does not exist.  Skipping ...\n";
-        next;
-    }
-    if (1 == $verbose) {
-        print "Copy: $srcfile => $destdir\n";
-    }
-    open(COPY, "cp $srcfile $destdir | ") or print "Copy $srcfile to $destdir failed: $!\n";
-    close(COPY);
-}
diff --git a/ldap/cm/ldapjava.mpw b/ldap/cm/ldapjava.mpw
deleted file mode 100644
index b9d0a019..00000000
--- a/ldap/cm/ldapjava.mpw
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# this is mapped via and NTFS Appleshare volume from //Keefer/java
# this is a Macintosh Programmers Workshop File (MPW)
# created by David Keefer e-mail davidk@netscape.com

set location 'java:ldapserver:built:release:ldapjdk-mac:'

for DosFile in `WhereIs  -d -s {location} .htm`
 set dave "{DosFile}"
 echo setting {DosFile} ...
SetFile -t TEXT -c MOSS {dave}
  
end

for DosFile in `WhereIs  -d -s {location} .txt `
 set dave "{DosFile}"
 echo setting {DosFile} ...
SetFile -t TEXT -c ttxt {dave}
  
end

for ftype in .java .mf .jsb
  for DosFile in `WhereIs  -d -s {location} {ftype} `
   set dave "{DosFile}"
   echo setting {DosFile} ...
   SetFile -t TEXT -c 'R*ch' {dave}
  end
end

for DosFile in `WhereIs  -d -s {location} .class `
 set dave "{DosFile}"
 echo setting {DosFile} ...
SetFile -t TEXT -c Javc {dave}

for DosFile in `WhereIs  -d -s {location} .gif `
 set dave "{DosFile}"
 echo setting {DosFile} ...
SetFile -t TEXT -c MOSS {dave}
  
end


diff --git a/ldap/cm/nbsp2utf8.sh b/ldap/cm/nbsp2utf8.sh
deleted file mode 100644
index 29b6b5b6..00000000
--- a/ldap/cm/nbsp2utf8.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Note that due to a bug in the Bourne shell on Digital UNIX 4.0, this
-# script should always be invoked with one argument, e.g., like this:
-#
-#    ./nbsp2utf8.sh infile > outfile
-#   
-exec sed -e 's/&nbsp;/ /g' "$@"
diff --git a/ldap/cm/newinst/Makefile b/ldap/cm/newinst/Makefile
deleted file mode 100644
index 5e4bffd6..00000000
--- a/ldap/cm/newinst/Makefile
+++ /dev/null
@@ -1,190 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Source for the install forms and CGI programs
-
-.SUFFIXES: .cc
-
-BUILD_ROOT = ../../..
-LDAP_SRC = ../..
-
-MODULE=slapdInstallBin
-# override BUILD_MODULE = HTTP_ADMIN
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-test:
-	echo $(SETUPUTIL_VERSION)
-	echo $(SETUPUTIL_RELEASE)
-
-# MODULE_CFLAGS = -DUSE_ADMSERV
-
-BINDEST=$(LDAP_ADMIN_BIN_RELDIR)
-OBJDEST=$(LDAP_ADMOBJDIR)
-
-ifndef $(OFFLAG)
-OFFLAG=-o 
-endif
-
-# we don't want to build with warnings-as-errors for the cm/ stuff, because
-# it's crappy C++ code which is LITTERED with warnings, most of which we
-# can't fix because it comes from files in dist/, etc.
-ifeq ($(ARCH), Linux)
-CFLAGS := $(subst -Werror,,$(CFLAGS))
-endif
-
-NOSTDCLEAN=true
-NOSTDSTRIP=true
-
-OSOBJS=
-OBJS1=$(OBJDEST)/ux-dialog.o $(OBJDEST)/ux-config.o $(OBJDEST)/ux-dsalib_dn.o
-OBJS1GT=$(OBJDEST)/ux-guesses.o 
-
-PROGS= ns-config
-ifeq ($(ARCH),WINNT)
-BINS=
-OSOBJS=
-OBJS1=
-OBJS2=
-OSLIBS=
-OSDEPLIBS=
-LIBS=
-else
-BINS=$(addprefix $(BINDEST)/, $(PROGS))
-endif
-INFO= $(OBJDIR)/$(DIR)
-PATCHINFO= $(ABS_OBJDIR)/$(DIR)
-
-# Source for staged installation utilities
-INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src
-
-all: $(OBJDEST) $(BINDEST) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP)  $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall
-# removed ns-keygen from build - it was only used for Dir Lite
-# $(BINDEST)/ns-keygen 
-ifeq ($(ARCH), BSDI)
-CFLAGS += -DNO_DOMAINNAME
-endif
-
-ifeq ($(ARCH), IRIX)
-CFLAGS += -exceptions
-EXTRA_LIBS += -lm -lc
-endif
-
-ifeq ($(ARCH), OSF1)
-EXTRA_LIBS += -lm
-endif
-
-#LIBLDAPU= ldapu
-#LIBLDAP= $(LDAP_LIBPATH)/libldap$(LDAP_SUF).a
-#DEPLIBS=$(addprefix $(OBJDIR)/lib/lib, \
-#        $(addsuffix .$(LIB_SUFFIX), $(LIBLDAPU))) $(OSDEPLIBS)
-
-ifeq ($(ARCH), HPUX)
-
-ifeq ($(NSOS_RELEASE),B.10.10)
-CURSES=-lHcurses
-endif
-
-ifeq ($(NSOS_RELEASE),B.11.00)
-	MODERNHP=1
-endif
-
-ifeq ($(NSOS_RELEASE),B.11.11)
-	MODERNHP=1
-endif
-
-ifeq ($(NSOS_RELEASE),B.11.23)
-	MODERNHP=1
-endif
-
-ifeq ($(MODERNHP),1)
-CURSES=-lHcurses
-else
-CURSES=/usr/lib/libcurses.a
-endif
-ifeq ($(USE_64), 1)
-CURSES=-lcurses
-endif
-else
-CURSES=-lcurses -ltermcap
-endif
-
-ifeq ($(ARCH), AIX)
-CURSES=-lcurses
-endif
-
-$(BINDEST)/ns-update : ns-update
-	-@$(RM) $@
-	$(CP) $< $@
-
-$(BINDEST)/ns-keygen: ns-keygen 
-	-@$(RM) $@
-	$(CP) $< $@
-
-$(BINDEST)/uninstall: uninstall
-	-@$(RM) $@
-	$(CP) $< $@
-
-$(BINDEST)/ns-config: $(OBJS1) $(OBJS2)
-	$(PURIFY) $(CXX) $(SHARED_FLAG) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \
-		-o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
-	       $(SASL_LINK) $(EXTRA_LIBS) $(CURSES)
-
-ifeq ($(ARCH), WINNT)
-$(INFO):
-	$(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "bin/admin/ns-admin,bin/admin/ns-admin.so"
-else
-$(INFO):
-	$(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
-ifdef BUILD_PATCH
-	$(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $(PATCHINFO)-patch.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
-endif
-endif
-
-$(OBJDEST)/%.o: %.c
-	$(CC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) -c $< $(OFFLAG)$@
-
-$(OBJDEST)/%.o: %.cc
-	$(CXX) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) -c $< $(OFFLAG)$@
-
-ns-config-gt: $(OBJS1GT)
-	$(PURIFY) $(CXX) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \
-		-o ns-config-gt $(OBJS1GT) $(SETUPUTILLINK) $(LIBLDAP) \
-		$(EXTRA_LIBS) $(CURSES)
diff --git a/ldap/cm/newinst/fixINF.pl b/ldap/cm/newinst/fixINF.pl
deleted file mode 100644
index 7a6c1ca8..00000000
--- a/ldap/cm/newinst/fixINF.pl
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# parameters: BUILD_MODULE versionString buildnum.dat input security name isdirLite output [expDefine]
-
-$module = shift;
-$version = shift;
-$buildFile = shift;
-$input = shift;
-$security = shift;
-$name = shift;
-$isdirLite = shift;
-$instanceNamePrefix = shift;
-$output = shift;
-$expDefine = shift;
-if ($expDefine) {
-	( $junk, $expires ) = split( /=/, $expDefine );
-	if ( ! $expires ) {
-		$expires = 0;
-	}
-} else {
-	$expires = 0;
-}
-
-# get the build number
-open( FILE, $buildFile );
-while ( <FILE> ) {
-    last if ( $buildNum ) = /\\"(.*)\\"/;
-}
-close( FILE );
-
-# copy the input file to the output file changing stuff along the way
-open( FILE, $input );
-open( OUT, ">$output" );
-while ( <FILE> ) {
-    s/%%%INSTANCE_NAME_PREFIX%%%/$instanceNamePrefix/;
-    s/%%%SERVER_NAME%%%/$name/;
-    s/%%%SERVER_VERSION%%%/$version/;
-    s/%%%SERVER_BUILD_NUM%%%/$buildNum/;
-    s/%%%PUMPKIN_HOUR%%%/$expires/;
-    s/%%%SECURITY%%%/$security/;
-    s/%%%IS_DIR_LITE%%%/$isdirLite/;
-	print OUT;
-}
-close( OUT );
-close( FILE );
diff --git a/ldap/cm/newinst/ns-keygen b/ldap/cm/newinst/ns-keygen
deleted file mode 100755
index 5c23e957..00000000
--- a/ldap/cm/newinst/ns-keygen
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh 
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Usage  ns-keygen password_file fully_qualified_hostname
-# Example:
-#	./ns-keygen  ../password.txt myhost.directory.fedora.redhat.com
-#
-# Assumes that NSHOME is Set
-# if NSHOME is not set, it will be derived from the path of this script, which is
-# usually NSHOME/bin/slapd/admin/bin
-
-if [ $# -ge 2 ]
-then 
- 	passwd_file="$1"
-	certDN="$2"
-else
-	echo "ERROR:Incorrect Usage: $0 password_file certDN"
-	exit
-fi
-
-if [ ! "$NSHOME" ]; then
-	fullpath=`pwd`
-	if echo $0 | grep \^/ > /dev/null 2>&1 ; then # is absolute
-		fullpath=`dirname $0`
-	else # is a relative path - could be ./ or ../ or something else
-		base=`basename $0`
-		if [ "$base" != $0 ]; then # e.g. ns-keygen bare from that directory
-			savedir=$fullpath
-			cd `dirname $0`
-			fullpath=`pwd`
-			cd $savedir
-		fi
-	fi
-	# is $0 relative or absolute path?
-	NSHOME=`echo $fullpath | sed -e s@/bin/slapd/admin/bin@@g`
-fi
-
-# set the LD_LIBRARY_PATH - required for the cert tools
-TOOL_PATH=$NSHOME/bin/slapd/admin/bin ; export TOOL_PATH
-# for HPUX
-SHLIB_PATH=$TOOL_PATH:$TOOL_PATH/../lib:$TOOL_PATH/../../lib:$TOOL_PATH/../../../lib:$TOOL_PATH/../../../../lib:$SHLIB_PATH ; export SHLIB_PATH
-# for other unix
-LD_LIBRARY_PATH=$TOOL_PATH:$TOOL_PATH/../lib:$TOOL_PATH/../../lib:$TOOL_PATH/../../../lib:$TOOL_PATH/../../../../lib:$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH
-
-#echo password file name is: $passwd_file
-#echo certDN is: $certDN
-
-rm -f key3.db key4.db cert7.db cert8.db secmodule.db secmod.db random.dat keyid.dat
-
-# Check for  password file
-
-#
-# Set umask for best security
-#
-umask 077 
-
-#
-# Create some "random" data. 
-#
-ps -ale >>random.dat
-date >>random.dat
-netstat -a >>random.dat
-
-if [ ! -s "$passwd_file" ]
-then
-	echo "Error:Password file is missing."
-	exit 1
-fi
-
-#
-# Set the key database password
-#
-$TOOL_PATH/certutil -W -d . -f "$passwd_file"
-RC=$?
-if [ $RC != 0 ]
-then 
-	echo "Error:Unable to set the key database password."
-	exit 1
-fi
-
-#
-# Create and sign a self-signed certificate for this
-# server using the server name
-#
-$TOOL_PATH/certutil -S -s "$certDN" -x -t u,, \
- -v 60 -d . -n Server-Cert -f "$passwd_file" -z random.dat
-RC=$?
-if [ $RC != 0 ]
-then 
-	echo "Error:Unable to create the cert."
-	exit 1
-fi
-
-hostname=`uname -n`
-
-#
-# Copy the key/cert db & password file to the correct place.
-#
-keydb=key3.db
-if [ -f key4.db ] ; then
-	keydb=key4.db
-fi
-
-if [ -f $NSHOME/alias/slapd-$hostname-$keydb ]; then
-	echo "Found existing key database - copying to $NSHOME/alias/slapd-$hostname-$keydb.bak"
-	cp $NSHOME/alias/slapd-$hostname-$keydb $NSHOME/alias/slapd-$hostname-$keydb.bak
-	if [ ! -f $NSHOME/alias/slapd-$hostname-$keydb.orig ] ; then
-		cp $NSHOME/alias/slapd-$hostname-$keydb $NSHOME/alias/slapd-$hostname-$keydb.orig
-	fi
-fi
-cp $keydb $NSHOME/alias/slapd-$hostname-$keydb
-RC=$?
-if [ $RC != 0 ]
-then 
-	echo "Error:Key Database $keydb could not be copied"
-	exit 1
-fi
-
-certdb=cert7.db
-if [ -f cert8.db ] ; then
-	certdb=cert8.db
-fi
-if [ -f $NSHOME/alias/slapd-$hostname-$certdb ]; then
-	echo "Found existing cert database - copying to $NSHOME/alias/slapd-$hostname-$certdb.bak"
-	cp $NSHOME/alias/slapd-$hostname-$certdb $NSHOME/alias/slapd-$hostname-$certdb.bak
-	if [ ! -f $NSHOME/alias/slapd-$hostname-$certdb.orig ] ; then
-		cp $NSHOME/alias/slapd-$hostname-$certdb $NSHOME/alias/slapd-$hostname-$certdb.orig
-	fi
-fi
-cp $certdb $NSHOME/alias/slapd-$hostname-$certdb
-RC=$?
-if [ $RC != 0 ]
-then 
-	echo "Error:Cert Database $certdb could not be copied"
-	exit 1
-fi
-
-# create and copy pin file
-passwd=`cat $passwd_file`
-if [ -f $NSHOME/alias/slapd-$hostname-pin.txt ]; then
-	echo "Found existing pin file - copying to $NSHOME/alias/slapd-$hostname-pin.txt.bak"
-	cp $NSHOME/alias/slapd-$hostname-pin.txt $NSHOME/alias/slapd-$hostname-pin.txt.bak
-	if [ ! -f $NSHOME/alias/slapd-$hostname-pin.txt.orig ]; then
-		cp $NSHOME/alias/slapd-$hostname-pin.txt $NSHOME/alias/slapd-$hostname-pin.txt.orig
-	fi
-fi
-echo "Internal (Software) Token:$passwd" > $NSHOME/alias/slapd-$hostname-pin.txt
-RC=$?
-if [ $RC != 0 ]
-then 
-	echo "Error:password file could not be copied"
-	exit 1
-fi
-# Test the new location for the files.
-
-#
-# Cleanup
-rm -f random.dat
-
-#
-# End
-#
diff --git a/ldap/cm/newinst/ns-update b/ldap/cm/newinst/ns-update
deleted file mode 100755
index 2a67acd9..00000000
--- a/ldap/cm/newinst/ns-update
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# This file essentially serves as a wrapper around the instance
-# creation and configuration program (index) since it must be run from
-# the directory it lives in due to run time shared library
-# dependencies
-
-# ns-update is supposed to be placed in _libdir/<brand>-ds
-brand_ds=`echo $0 | sed -e "s#.*/\([a-z]*-ds\)/.*#\1#"`
-if [ -z ${brand_ds} ]; then
-    brand_ds=`pwd | sed -e "s#.*/\([a-z]*-ds\)/.*#\1#"`
-fi
-sroot=`echo $0 | sed -e "s#/lib/$brand_ds/.\*##g"`
-PERL=perl # just use perl from PATH
-
-#        run_ds_create "$sroot" "$dir" "$inffile"
-run_ds_create()
-{
-    sroot="$1"
-    shift
-    dir="$1"
-    shift
-    inffile="$1"
-
-    # the inffile is incomplete - it needs the instance specific stuff
-    dseldif=$sroot/var/lib/$dir/dse.ldif
-    port=`grep \^nsslapd-port: $dseldif | sed -e s/\^nsslapd-port:[\ \	]*//`
-    rootdn=`grep \^nsslapd-rootdn: $dseldif | sed -e s/\^nsslapd-rootdn:[\ \	]*//`
-    id=`echo $dir | sed -e s/^slapd-//`
-    suffix="o=NetscapeRoot"
-
-    realfile=/tmp/fds$$.inf
-    cp $inffile $realfile
-    echo "" >> $realfile
-    echo "[slapd]" >> $realfile
-    echo "ServerIdentifier= $id" >> $realfile
-    echo "ServerPort= $port" >> $realfile
-    echo "RootDN= $rootdn" >> $realfile
-    # dummy password
-    echo "RootDNPwd= password" >> $realfile
-    echo "Suffix= $suffix" >> $realfile
-
-    cwd=`pwd`
-    cd `dirname $0`
-
-    ./ds_create -r -f $realfile
-
-    rm -f $realfile
-	cd $cwd
-}
-
-start_server()
-{
-	NETSITE_ROOT=$1
-	REQUEST_METHOD=GET 
-	export NETSITE_ROOT REQUEST_METHOD
-	QUERY_STRING="InstanceName=$2"
-	SERVER_NAMES=$2
-	export QUERY_STRING SERVER_NAMES
-	cwd=`pwd`
-	cd `dirname $0`
-	./start 2>&1 | grep -v '^Content' | grep -v '^ds_'
-	cd $cwd
-}
-
-# get the inf file name
-seenfarg=
-inffile=
-
-# if the -r flag is present, this means we're doing a
-# reinstall or an upgrade, so restart the servers
-for arg in "$@" ; do
-	if [ "$arg" = "-r" ]; then
-		reconfig=1
-	fi
-	if [ "$arg" = "-S" ]; then
-                iDSISolaris=1
-        fi
-    if [ $seenfarg ]; then
-        inffile="$arg"
-        seenfarg=
-    fi
-    if [ "$arg" = "-f" ]; then
-        seenfarg=1
-    fi
-done
-
-extraflags=
-# For Solaris 9+ specific installation, the following 
-# method of determining reconfiguration by checking 
-# the existence of <sroot>/slapd-nickname/config
-# directory cannot be used. This is because the
-# server_root is the same for all instances. Also, it
-# uses standard Solaris supplied perl.
-if [ "$iDSISolaris" = "" ]; then 
-	# for some reason, we are not being passed the -r flag during
-	# reinstall; so, determine if there are existing server
-	# instances in this server root, and assume -r if there
-	# are
-	if [ "$reconfig" = "" ]; then
-		cd $sroot/var/lib
-		for dir in slapd-* ; do
-			if [ -f $dir/dse.ldif ]; then
-				reconfig=1
-				extraflags="-r"
-				break
-			fi
-		done
-	fi
-fi
-
-if [ $reconfig ] ; then
-	cd $sroot
-	for dir in slapd-* ; do
-		# first, fix any old password files
-		if [ -d etc/$brand_ds/$dir ]; then
-			cd etc/$brand_ds/$dir
-			echo Converting $dir to new format password file . . .
-			$PERL $sroot/lib/$brand_ds/migratePwdFile $sroot $dir
-			cd ../../..
-		fi
-		# Copy new schema ldiffiles
-		echo Copying new schema ldiffiles . . .
-		$PERL $sroot/lib/$brand_ds/upgradeServer $brand_ds $sroot $dir
-
-		# next, start the server
-		echo Starting $dir . . .
-		start_server $sroot $dir
-		echo ""
-
-        # more reconfiguration
-        run_ds_create "$sroot" "$dir" "$inffile" "$extraflags" "$@"
-
-	done
-	# fix any non-instance specific files - omit server instance argument
-	$PERL $sroot/lib/$brand_ds/upgradeServer $brand_ds $sroot
-fi
-
-cd `dirname $0`
-
-# we need to make sure the alias directory is owned by the server user/group
-# in order for the server to be able to create the initial key/cert db files
-
-if [ ! -f "$inffile" ] ; then
-	echo "WARNING: Could not read the setup info file $inffile"
-else
-# grab the ssuser and ssgrp
-	ssuser=`grep SuiteSpotUserID $inffile | sed -e 's/SuiteSpotUserID[ 	]*=[ 	]*//'`
-	ssgrp=`grep SuiteSpotGroup $inffile | sed -e 's/SuiteSpotGroup[ 	]*=[ 	]*//'`
-#	echo "user = $ssuser group = $ssgrp"
-# chown the alias directory
-	chown $ssuser:$ssgrp $sroot/alias
-fi
-
-rc=0
-# not reconfig - run ds_create as usual
-if test -z "$reconfig" ; then
-    ./ds_create $* $extraflags
-fi
-rc=$?
-
-# dsgw package should take care of this ???
-## chown the cookie directory - bug 175098
-#if [ "$ssuser" ] ; then
-#    if [ "$ssgrp" ] ; then
-#        chown $ssuser:$ssgrp $sroot/bin/slapd/authck
-#    else
-#        chown $ssuser $sroot/bin/slapd/authck
-#    fi
-#fi
-
-exit $rc
diff --git a/ldap/cm/newinst/replaceToken.pl b/ldap/cm/newinst/replaceToken.pl
deleted file mode 100644
index 474ef304..00000000
--- a/ldap/cm/newinst/replaceToken.pl
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-# The first argument is the file to edit
-# The remaining arguments are pairs of values: the first value of the pair is
-# the token to look for, and the second is the value to replace it with e.g.
-# if the input file foo contains
-#    $NETSITE_ROOT/%%%PERL_RUNTIME%%% -w perlscript ...
-# then running $(PERL) thisscript foo %%%PERL_RUNTIME%%% foo/bar/perl5 > output/foo
-# will result in output/foo containing
-#    NETSITE_ROOT/foo/bar/perl5 -w perlscript ...
-
-($input, %tokens) = @ARGV;
-
-if (! $input) {
-	print STDERR "Usage: $ $0 <inputfilename> [token1 replace1] ... [tokenN replaceN]\n";
-	exit 1;
-}
-
-open(INPUT, $input) or die "Error: could not open file $input: $!";
-
-while (<INPUT>) {
-	while (($key, $value) = each %tokens) {
-		s/$key/$value/g;
-	}
-	print;
-}
-
-close INPUT;
diff --git a/ldap/cm/newinst/setup b/ldap/cm/newinst/setup
deleted file mode 100755
index cc38ce88..00000000
--- a/ldap/cm/newinst/setup
+++ /dev/null
@@ -1,564 +0,0 @@
-#!/bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-###########################
-#
-# This shell script provides a way to set up a new installation after
-# the binaries have already been extracted.  This is typically after
-# using native packaging support to install the package e.g. RPM,
-# pkgadd, depot, etc.  This script will show the license, readme,
-# dsktune, then run the usual setup pre and post installers.  This
-# script should be run from the server root directory since it uses
-# pwd to get the server root directory.
-#
-##########################
-
-# get command line arguments
-
-# see if silent mode
-
-counter=0
-doMktmp() {
-	tmpfile=`mktemp /tmp/${1}XXXXXX 2> /dev/null`
-	if ! [ $tmpfile ] ; then
-		tmpfile=/tmp/$1.$counter.$$
-		counter=`expr $counter + 1`
-	fi
-	echo $tmpfile
-}
-
-doExit() {
-	echo "ERROR Exiting . . ." | tee -a $logfile
-	if [ $tmpinffile ]; then
-		rm -f $inffile
-	fi
-	echo "Log file is $logfile"
-	exit 1
-}
-
-askYN() {
-	prompt="$1"
-	finished=
-	while ! [ $finished ]; do
-		echo ""
-		echo -n "$prompt (yes/no) " | tee -a $logfile
-		read ans
-		echo $ans >> $logfile
-		case "$ans" in
-		y*|Y*) finished=1 ;;
-		n*|N*) exit 1 ;;
-		*) echo "Please answer yes or no" | tee -a $logfile ;;
-		esac
-	done
-}
-
-ask123() {
- 	prompt=$2
- 	default=$1
- 	finished=
- 	ans=
- 	while ! [ $finished ]; do
-		echo -n ""
-		echo ""
-		echo -n $prompt "" | tee -a $logfile
-		read ans
-		echo $ans >> $logfile
-		if ! [ $ans ]; then
-			return $default
-		fi
-		case "$ans" in
-		1|2|3) finished=1 ;;
-		*) echo "Please answer 1, 2, or 3" | tee -a $logfile ;;
-		esac
-	done
-	return $ans
-}
-
-getFQDN() {
-	max=0
-	maxhost=
-	defhost=`hostname`
-	echo "getFQDN: hostname = $defhost" >> $logfile
-	hosthost=`host $defhost | grep -v "not found" | awk '{print $1}'`
-	echo "getFQDN: host $defhost = $hosthost" >> $logfile
-	for host in $defhost $hosthost `hostname -f` `hostname -a` ; do
-		len=`echo $host | wc -c`
-		echo "getFQDN: host $host has length $len" >> $logfile
-		if [ $len -gt $max ]; then
-			max=$len
-			maxhost=$host
-			echo "getFQDN: new max host $host has length $max" >> $logfile
-		fi
-	done
-	echo $maxhost
-}
-
-getValFromAdminConf() {
-	cattr=$1
-	cfile=$2
-	rval=`grep -i $cattr $sroot/admin-serv/config/$cfile | awk '{print $2}'`
-	echo $rval
-}
-
-getValFromAdmpw() {
-	cfile=$1
-	rval=`head -1 $sroot/admin-serv/config/$cfile | cut -f1 -d\:`
-	echo $rval
-}
-
-getValFromInf() {
-	cattr=$1
-	cfile=$2
-	rval=`grep -i ^$cattr $cfile | head -1 | sed -e 's/^.*=[ 	]*//'`
-	echo $rval
-}
-
-logfile=`doMktmp log`
-myargs=
-silent=
-inffile=
-tmpinffile=
-nextisinffile=
-keepinffile=
-# set by user or from existing files during upgrade
-user=
-# set by user or from existing files during upgrade
-group=
-for arg in "$@" ; do
-	if [ "$arg" = "-s" ]; then
-		silent=1
-	elif [ "$arg" = "-k" ]; then
-		keepinffile=1
-	elif [ "$arg" = "-f" ]; then
-		nextisinffile=1
-	elif [ $nextisinffile ]; then
-		inffile="$arg"
-		nextisinffile=
-	else
-		myargs="$myargs $arg"
-	fi
-done
-
-# figure out where we are and make sure we cd to the serverroot dir
-setupdir=`dirname $0`
-sroot=`dirname $setupdir`
-cd $sroot
-currentdir=`pwd`
-
-if [ "$currentdir" != "$sroot" ]; then
-	# running setup using a relative path
-	bname=`basename $setupdir`
-	if [ "$bname" = "." ]; then
-		setupdir=$currentdir
-	else
-		setupdir=`echo $currentdir/$bname`
-	fi
-	sroot=`dirname $setupdir`
-	cd $sroot
-fi
-
-rm -f $sroot/setup/install.inf
-
-echo "INFO Begin Setup . . ." | tee -a $logfile
-# cat LICENSE.txt
-if ! [ $silent ]; then
-	echo "" | tee -a $logfile
-	echo "" | tee -a $logfile
-	echo "" | tee -a $logfile
-	cat LICENSE.txt | tee -a $logfile
-	askYN "Do you accept the license terms?"
-fi
-
-# cat README.txt
-if ! [ $silent ]; then
-	cat README.txt | tee -a $logfile
-	askYN "Continue?"
-fi
-
-isadminsslon=0
-sslparams=""
-
-adminSSLOff() {
-	conffile=$1
-	confparam=$2
-	tmpfile=$3
-	if [ -f $conffile ]; then
-		security=`grep -i "^$confparam" $conffile | awk '{print $1}'`
-		issecure=`grep -i "^$confparam" $conffile | awk '{print $2}'`
-		if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
-		then
-			if [ $isadminsslon -eq 0 ]; then
-				$sroot/stop-admin
-				isadminsslon=1
-			fi
-			echo $conffile=$security >> $tmpfile
-			cat $conffile | sed -e "s/^\($security\) .*/\1 off/g" > $conffile.01
-			mv $conffile.01 $conffile
-			chown $user:$group $conffile
-			echo "$conffile: SSL off ..."
-		fi
-	fi
-}
-
-adminXmlSSLOff() {
-	conffile=$1
-	confparam=$2
-	tmpfile=$3
-	if [ -f $conffile ]; then
-		grep -i "\<security=\"on\"" $conffile > /dev/null 2>&1
-		rval=$?
-		if [ $rval -eq 0 ]
-		then
-			if [ $isadminsslon -eq 0 ]; then
-				$sroot/stop-admin
-				isadminsslon=1
-			fi
-			echo $conffile=$confparam >> $tmpfile
-			cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"off\"/g" > $conffile.0
-			mv $conffile.0 $conffile
-			chown $user:$group $conffile
-			echo "$conffile: SSL off ..."
-		fi
-		sslparams0=`grep -i "<.*SSLPARAMS " $conffile`
-		rval=$?
-		if [ $rval -eq 0 ]
-		then
-			if [ $isadminsslon -eq 0 ]; then
-				$sroot/stop-admin
-				isadminsslon=1
-			fi
-echo adminXmlSSLOff: SSLPARAMS off
-			sslparams1=`echo $sslparams0 | sed -e 's/\//\\\\\//g'`
-			sslparams=`echo $sslparams1 | sed -e 's/\"/\\\\\"/g'`
-			cat $conffile | sed -e "s/\($sslparams\)/\<\!-- \1 --\>/g" > $conffile.1
-			mv $conffile.1 $conffile
-			chown $user:$group $conffile
-		fi
-	fi
-}
-
-SSLOff() {
-	rm -f dssecure.txt assecure.txt > /dev/null 2>&1
-	touch dssecure.txt
-	touch assecure.txt
-
-	for dir in $sroot/slapd-* ; do
-		if [ -f $dir/config/dse.ldif ]; then
-			security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
-			issecure=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $2}'`
-			if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
-			then
-				echo $dir >> dssecure.txt
-				$dir/stop-slapd
-				cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 off/g" > $dir/config/dse.ldif.0
-				mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
-				chown $user:$group $dir/config/dse.ldif
-				echo "$dir/config/dse.ldif: SSL off ..."
-			fi
-		fi
-	done
-	if [ -d $sroot/admin-serv/config ]; then
-		adminSSLOff $sroot/admin-serv/config/adm.conf security: assecure.txt
-		adminSSLOff $sroot/admin-serv/config/local.conf configuration.nsServerSecurity: assecure.txt
-        if [ -f $sroot/admin-serv/config/magnus.conf ] ; then
-            adminSSLOff $sroot/admin-serv/config/magnus.conf Security assecure.txt
-        fi
-        if [ -f $sroot/admin-serv/config/server.xml ] ; then
-            adminXmlSSLOff $sroot/admin-serv/config/server.xml security assecure.txt
-        fi
-
-		if [ $isadminsslon -ne 0 ]; then
-			$sroot/start-admin
-		fi
-	fi
-}
-
-adminSSLOn() {
-	conffile=$1
-	confparam=$2
-	if [ -f $conffile ]; then
-		cat $conffile | sed -e "s/^\($confparam\) .*/\1 on/g" > $conffile.00
-		mv $conffile.00 $conffile
-		chown $user:$group $conffile
-		echo "$conffile $confparam: SSL on ..."
-	fi
-}
-
-adminXmlSSLOn() {
-	conffile=$1
-	if [ -f $conffile ]; then
-		cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"on\"/g" > $conffile.2
-		mv $conffile.2 $conffile
-		chown $user:$group $conffile
-	fi
-	grep -i "<.*SSLPARAMS " $conffile > /dev/null 2>&1
-	rval=$?
-	if [ $rval -eq 0 ]
-	then
-		cat $conffile | sed -e "s/<\!-- *$sslparams *-->/$sslparams/g" > $conffile.3
-		mv $conffile.3 $conffile
-		chown $user:$group $conffile
-	fi
-	echo "$conffile: SSL on ..."
-}
-
-SSLOn() {
-	if [ -f dssecure.txt ]; then
-		for dir in `cat dssecure.txt` ; do
-			if [ -f $dir/config/dse.ldif ]; then
-				security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
-				$dir/stop-slapd
-				cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
-				mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
-				chown $user:$group $dir/config/dse.ldif
-				echo "$dir/config/dse.ldif: SSL on ..."
-				echo "Restarting Directory Server: $dir/start-slapd"
-				$dir/start-slapd
-			fi
-		done
-		rm -f dssecure.txt > /dev/null 2>&1
-	fi
-
-	if [ $isadminsslon -ne 0 ]; then
-		$sroot/stop-admin
-	fi
-	if [ -f assecure.txt ]; then
-		for confline in `cat assecure.txt` ; do
-			conffile=`echo $confline | awk -F= '{print $1}'`
-			confparam=`echo $confline | awk -F= '{print $2}'`
-			echo $conffile | grep "\.xml$" > /dev/null 2>&1
-			rval=$?
-			if [ $rval -eq 0 ]; then
-				adminXmlSSLOn $conffile $confparam
-			else
-				adminSSLOn $conffile $confparam
-			fi
-		done
-		rm -f assecure.txt > /dev/null 2>&1
-	fi
-	if [ $isadminsslon -ne 0 ]; then
-		echo "Restarting Administration Server: $sroot/start-admin"
-		$sroot/start-admin
-	fi
-
-}
-
-# check whether it is an in-place installation
-if [ -f $sroot/admin-serv/config/adm.conf ]; then
-	dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
-	if [ -f $sroot/$dsinst/config/dse.ldif ]; then
-		user=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $3}'`
-		group=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $4}'`
-    fi
-
-	SSLOff
-
-	if [ -f $sroot/$dsinst/config/dse.ldif ]; then
-		# it is an in=place installation
-		ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
-		ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
-		adminport=`getValFromAdminConf "\<port:" "adm.conf"`
-		adminid=`getValFromAdmpw "admpw"`
-		sysuser=`getValFromAdminConf "nsSuiteSpotUser:" "local.conf"`
-		admindomain=`echo $ldaphost | awk -F. '{print $5 ? $2 "." $3 "." $4 "." $5: $4 ? $2 "." $3 "." $4 : $3 ? $2 "." $3 : $2 ? $2 : ""}'`
-		if [ "$admindomain" = "" ]; then
-			admindomain=`domainname`
-		fi
-
-		echo "In order to reconfigure your installation, the Configuration Directory"
-		echo "Administrator password is required.  Here is your current information:"
-		echo ""
-		echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot"
-		echo "Configuration Administrator ID: $adminid"
-		echo ""
-		echo "At the prompt, please enter the password for the Configuration Administrator."
-		echo ""
-		echo "administrator ID: $adminid"
-		siepasswd=""
-		while [ "$siepasswd" = "" ]; do
-			printf "Password: "
-			read siepasswd
-		done
-
-		inffile=$sroot/setup/myinstall.inf
-		echo "[General]" > $inffile
-		echo "FullMachineName=   $ldaphost" >> $inffile
-		echo "SuiteSpotUserID=   $user" >> $inffile
-		echo "SuitespotGroup=   $group" >> $inffile
-		echo "ServerRoot=   $sroot" >> $inffile
-		echo "ConfigDirectoryLdapURL=   ldap://$ldaphost:$ldapport/o=NetscapeRoot" >> $inffile
-		echo "ConfigDirectoryAdminID=   $adminid" >> $inffile
-		echo "AdminDomain=   $admindomain" >> $inffile
-		echo "ConfigDirectoryAdminPwd=   $siepasswd" >> $inffile
-		echo "" >> $inffile
-		echo "[admin]" >> $inffile
-		echo "ServerAdminID=   $adminid" >> $inffile
-		echo "ServerAdminPwd=   $siepasswd" >> $inffile
-		echo "SysUser=   $sysuser" >> $inffile
-		echo "Port=   $adminport" >> $inffile
-		echo "ServerIpAddress=" >> $inffile
-
-		# set silent mode
-		silent=1
-	fi
-fi
-
-# dsktune
-if ! [ $silent ]; then
-	bin/slapd/server/dsktune | tee -a $logfile
-	askYN "Continue?"
-fi
-
-# install mode
-if ! [ $silent ]; then
-	echo ""
-	echo "Please select the install mode:"
-	echo "  1 - Express - minimal questions"
-	echo "  2 - Typical - some customization (default)"
-	echo "  3 - Custom - lots of customization"
-	
-	ask123 "2" "Please select 1, 2, or 3 (default: 2) "
-	installmode=$?
-fi
-
-# if silent mode, do not run the pre-installer programs
-# otherwise, create a temp file for their use
-if ! [ $silent ]; then
-	inffile=`doMktmp setup`
-	tmpinffile=1
-
-	# put some common answers in the file
-	hostname=`getFQDN`
-	if ! [ $hostname ] ; then
-		hostname=localhost.localdomain
-	fi
-	echo "" | tee -a $logfile
-	echo -n "Hostname to use (default: $hostname) " | tee -a $logfile
-	read ans
-	echo $ans >> $logfile
-	if [ "$ans" ]; then
-		hostname="$ans"
-	fi
-
-	user=nobody
-	group=nobody
-	echo ""
-	echo -n "Server user ID to use (default: $user) " | tee -a $logfile
-	read ans
-	echo $ans >> $logfile
-	if [ "$ans" ]; then
-		user="$ans"
-	fi
-	echo ""
-	echo -n "Server group ID to use (default: $group) " | tee -a $logfile
-	read ans
-	echo $ans >> $logfile
-	if [ "$ans" ]; then
-		group="$ans"
-	fi
-
-	echo '[General]' >> $inffile
-	echo "FullMachineName = $hostname" >> $inffile
-	echo "SuiteSpotUserID = $user" >> $inffile
-	echo "SuiteSpotGroup = $group" >> $inffile
-	echo ServerRoot = `pwd` >> $inffile
-
-	# check if ds instance directory exists or not
-	# if it does, run ns-config with the reconfigure option
-	doreconfig=""
-	ls -d slapd-* > /dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		doreconfig="-r"
-	fi
-
-	# first, run ds
-	cd bin/slapd/admin/bin
-	./ns-config -f $inffile -l $logfile -m $installmode $doreconfig || doExit
-	cd ../../../..
-
-	# next, run admin
-	cd bin/admin
-	./ns-config -f $inffile -l $logfile -m $installmode $doreconfig || doExit
-	cd ../..
-fi
-
-# do the post installers
-silentarg=""
-if ! [ $silent ] ; then
-	silentarg="-s"
-fi
-
-`pwd`/bin/slapd/admin/bin/ns-update $silentarg $myargs -f $inffile | tee -a $logfile || doExit
-
-`pwd`/bin/admin/ns-update $doreconfig $silentarg $myargs -f $inffile | tee -a $logfile || doExit
-
-SSLOn
-
-# get user, host, port for startconsole
-adminport=`getValFromInf Port $inffile`
-adminhost=`getValFromInf FullMachineName $inffile`
-adminuser=`getValFromInf ConfigDirectoryAdminID $inffile`
-
-echo ""
-echo "You can now use the console.  Here is the command to use to start the console:" | tee -a $logfile
-echo "cd $sroot" | tee -a $logfile
-echo "./startconsole -u $adminuser -a http://$adminhost:$adminport/" | tee -a $logfile
-echo""
-echo "INFO Finished with setup, logfile is setup/setup.log" | tee -a $logfile
-if [ -f setup/setup.log ] ; then
-	cat $logfile >> setup/setup.log
-else
-	cp $logfile setup/setup.log
-fi
-rm -f $logfile
-
-if [ $tmpinffile ]; then
-	if [ $keepinffile ]; then
-		if [ -f setup/install.inf ]; then
-			cat $inffile >> setup/install.inf
-		else
-			cp $inffile setup/install.inf
-		fi
-		chmod 600 setup/install.inf
-	fi
-	rm -f $inffile
-fi
-
-exit 0
diff --git a/ldap/cm/newinst/setup.patch b/ldap/cm/newinst/setup.patch
deleted file mode 100755
index ebc67ec0..00000000
--- a/ldap/cm/newinst/setup.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-#!/bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-#
-# This script is a wrapper for dssetup used for inplace upgrade / patch 
-# installation.
-#
-clear
-
-echo "                                Fedora Project"
-echo "              Fedora Server Products Installation/Uninstallation"
-echo "-------------------------------------------------------------------------------"
-echo ""
-echo ""
-echo "BY INSTALLING THIS SOFTWARE YOU ARE CONSENTING TO BE BOUND BY"
-echo "AND ARE BECOMING A PARTY TO THE AGREEMENT FOUND IN THE"
-echo "LICENSE.TXT FILE. IF YOU DO NOT AGREE TO ALL OF THE TERMS"
-echo "OF THIS AGREEMENT, PLEASE DO NOT INSTALL OR USE THIS SOFTWARE."
-echo ""
-printf "Do you agree to the license terms? [No]: "
-read ans
-
-if [ "$ans" != "Y" -a "$ans" != "YES" -a "$ans" != "Yes" -a "$ans" != "y" -a "$ans" != "yes" ]; then
-    exit 1;
-fi
-
-clear
-
-echo "                                Fedora Project"
-echo "              Fedora Server Products Installation/Uninstallation"
-echo "-------------------------------------------------------------------------------"
-echo ""
-echo ""
-echo "This program will extract the patch files and install them"
-echo "into a directory where the Directory Server is already installed."
-echo ""
-echo "To accept the default shown in brackets, press the Enter key."
-echo ""
-printf "Install location [/opt/fedora/servers]: "
-read serverroot
-
-if [ ! -d $serverroot ]; then
-    echo ""
-    echo "Directory $serverroot does not exist."
-    exit 1
-fi
-
-if [ ! -f $serverroot/admin-serv/config/adm.conf ]; then
-    echo ""
-    echo "Administration Server's configuration file $serverroot/admin-serv/config/adm.conf does not exist."
-    exit 1
-fi
-
-getValFromAdminConf() {
-    cattr=$1
-    cfile=$2
-    rval=`grep -i $cattr $serverroot/admin-serv/config/$cfile | awk '{print $2}'`
-    echo $rval
-}
-
-getValFromAdmpw() {
-    cfile=$1
-    rval=`head -1 $serverroot/admin-serv/config/$cfile | awk -F\: '{print $1}'`
-    echo $rval
-}
-
-dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
-dsconffile=$serverroot/$dsinst/config/dse.ldif
-if [ ! -f $dsconffile ]; then
-    echo ""
-    echo "Directory Server's configuration file $dsconffile does not exist."
-    exit 1
-fi
-
-clear
-
-isadminsslon=0
-sslparams=""
-
-adminSSLOff() {
-    conffile=$1
-    confparam=$2
-    tmpfile=$3
-    if [ -f $conffile ]; then
-        security=`grep -i "^$confparam" $conffile | awk '{print $1}'`
-        issecure=`grep -i "^$confparam" $conffile | awk '{print $2}'`
-        if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
-        then
-            if [ $isadminsslon -eq 0 ]; then
-                $serverroot/stop-admin
-                isadminsslon=1
-            fi
-            echo $conffile=$security >> $tmpfile
-            cat $conffile | sed -e "s/^\($security\) .*/\1 off/g" > $conffile.0
-            mv $conffile.0 $conffile
-            echo "$conffile: SSL off ..."
-        fi
-    fi
-}
-
-adminXmlSSLOff() {
-    conffile=$1
-    confparam=$2
-    tmpfile=$3
-    if [ -f $conffile ]; then
-        grep -i "\<security=\"on\"" $conffile > /dev/null 2>&1
-        rval=$?
-        if [ $rval -eq 0 ]
-        then
-            if [ $isadminsslon -eq 0 ]; then
-                $serverroot/stop-admin
-                isadminsslon=1
-            fi
-            echo $conffile=$confparam >> $tmpfile
-            cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"off\"/g" > $conffile.0
-            mv $conffile.0 $conffile
-            echo "$conffile: SSL off ..."
-        fi
-        sslparams0=`grep -i "<.*SSLPARAMS " $conffile`
-        rval=$?
-        if [ $rval -eq 0 ]
-        then
-            if [ $isadminsslon -eq 0 ]; then
-                $serverroot/stop-admin
-                isadminsslon=1
-            fi
-            sslparams1=`echo $sslparams0 | sed -e 's/\//\\\\\//g'`
-            sslparams=`echo $sslparams1 | sed -e 's/\"/\\\\\"/g'`
-            cat $conffile | sed -e "s/\($sslparams\)/\<\!-- \1 --\>/g" > $conffile.0
-            mv $conffile.0 $conffile
-            echo "$conffile: SSL off ..."
-        fi
-    fi
-}
-
-rm -f dssecure.txt assecure.txt > /dev/null 2>&1
-touch dssecure.txt
-touch assecure.txt
-
-for dir in $serverroot/slapd-* ; do
-    if [ -f $dir/config/dse.ldif ]; then
-        security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
-        issecure=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $2}'`
-        if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
-        then
-            echo $dir >> dssecure.txt
-            $dir/stop-slapd
-            cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 off/g" > $dir/config/dse.ldif.0
-            mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
-            echo "$dir/config/dse.ldif: SSL off ..."
-            $dir/start-slapd
-        fi
-    fi
-done
-
-if [ -d $serverroot/admin-serv/config ]; then
-    adminSSLOff $serverroot/admin-serv/config/adm.conf security: assecure.txt
-    adminSSLOff $serverroot/admin-serv/config/local.conf configuration.nsServerSecurity: assecure.txt
-    adminSSLOff $serverroot/admin-serv/config/magnus.conf Security assecure.txt
-    adminXmlSSLOff $serverroot/admin-serv/config/server.xml security assecure.txt
-
-    if [ $isadminsslon -ne 0 ]; then
-        $serverroot/start-admin
-    fi
-fi
-
-ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
-ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
-adminid=`getValFromAdmpw "admpw"`
-suitespotuser=`ls -l $dsconffile | awk '{print $3}'`
-suitespotgroup=`ls -l $dsconffile | awk '{print $4}'`
-admindomain=`echo $ldaphost | awk -F. '{if ($5) {print $2 "." $3 "." $4 "." $5} else if ($4) {print $2 "." $3 "." $4} else if ($3) {print $2 "." $3} else if ($2) {print $2} else {print ""}}'`
-if [ "$admindomain" = "" ]; then
-    admindomain=`domainname`
-fi
-
-clear
-
-echo "                                Fedora Project"
-echo "                     Directory Installation/Uninstallation"
-echo "-------------------------------------------------------------------------------"
-echo ""
-echo "In order to reconfigure your installation, the Configuration Directory"
-echo "Administrator password is required.  Here is your current information:"
-echo ""
-echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot"
-echo "Configuration Administrator ID: $adminid"
-echo ""
-echo "At the prompt, please enter the password for the Configuration Administrator."
-echo ""
-echo "administrator ID: $adminid"
-siepasswd=""
-while [ "$siepasswd" = "" ]; do
-    printf "Password: "
-    read siepasswd
-done
-
-inffile=./myinstall.inf
-
-echo "[General]" > $inffile
-echo "FullMachineName=   $ldaphost" >> $inffile
-echo "SuiteSpotUserID=   $suitespotuser" >> $inffile
-echo "SuitespotGroup=   $suitespotgroup" >> $inffile
-echo "ServerRoot=   $serverroot" >> $inffile
-echo "ConfigDirectoryLdapURL=   ldap://$ldaphost:$ldapport/" >> $inffile
-echo "ConfigDirectoryAdminID=   $adminid" >> $inffile
-echo "AdminDomain=   $admindomain" >> $inffile
-echo "ConfigDirectoryAdminPwd=   $siepasswd" >> $inffile
-echo "Components=   slapd-71sp1" >> $inffile
-echo "" >> $inffile
-echo "[slapd-71sp1]" >> $inffile
-echo "Components=   slapd-71sp1" >> $inffile
-
-clear
-
-./dssetup -s -f $inffile
-
-adminSSLOn() {
-    conffile=$1
-    confparam=$2
-    if [ -f $conffile ]; then
-        cat $conffile | sed -e "s/^\($confparam\) .*/\1 on/g" > $conffile.0
-        mv $conffile.0 $conffile
-        echo "$conffile $confparam: SSL on ..."
-    fi
-}
-
-adminXmlSSLOn() {
-    conffile=$1
-    if [ -f $conffile ]; then
-        cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"on\"/g" > $conffile.0
-        mv $conffile.0 $conffile
-    fi
-    grep -i "<.*SSLPARAMS " $conffile > /dev/null 2>&1
-    rval=$?
-    if [ $rval -eq 0 ]
-    then
-        cat $conffile | sed -e "s/<\!-- *$sslparams *-->/$sslparams/g" > $conffile.0
-        mv $conffile.0 $conffile
-    fi
-    echo "$conffile: SSL on ..."
-}
-
-if [ -f dssecure.txt ]; then
-    for dir in `cat dssecure.txt` ; do
-        clear
-        if [ -f $dir/config/dse.ldif ]; then
-            security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
-            $dir/stop-slapd
-            cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
-            mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
-            echo "$dir/config/dse.ldif: SSL on ..."
-            echo "Restarting Directory Server: $dir/start-slapd"
-            $dir/start-slapd
-        fi
-    done
-    rm -f dssecure.txt
-fi
-
-if [ $isadminsslon -ne 0 ]; then
-    $serverroot/stop-admin
-fi
-if [ -f assecure.txt ]; then
-    for confline in `cat assecure.txt` ; do
-        conffile=`echo $confline | awk -F= '{print $1}'`
-        confparam=`echo $confline | awk -F= '{print $2}'`
-        echo $conffile | grep "\.xml$" > /dev/null 2>&1
-        rval=$?
-        if [ $rval -eq 0 ]; then
-            adminXmlSSLOn $conffile $confparam
-        else
-            adminSSLOn $conffile $confparam
-        fi
-    done
-    rm -f assecuire.txt
-fi
-if [ $isadminsslon -ne 0 ]; then
-    echo "Restarting Administration Server: $serverroot/start-admin"
-    $serverroot/start-admin
-fi
-
diff --git a/ldap/cm/newinst/setup.pl b/ldap/cm/newinst/setup.pl
deleted file mode 100755
index 978db5be..00000000
--- a/ldap/cm/newinst/setup.pl
+++ /dev/null
@@ -1,176 +0,0 @@
-#!./tools/perl
-# --- BEGIN COPYRIGHT BLOCK ---
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-# This program will package a downloaded JRE into a nsjre.zip
-# file suitable for a DS install.
-
-use lib './lib';
-use FileHandle;
-
-autoflush STDERR 1;
-autoflush STDOUT 1;
-
-delete $ENV{LD_LIBRARY_PATH};
-
-# Set required JRE version
-if ($^O eq "hpux") {
-    $jdkVersion = "HP's 32-bit HP-UX";
-    $reqVersion = "1.4.2.07";
-    delete $ENV{SHLIB_PATH};
-} elsif ($^O eq "MSWin32") {
-    $jdkVersion = "Sun's 32-bit MS Windows";
-    $reqVersion = "1.4.2_05";
-} elsif ($^O eq "linux") {
-    $jdkVersion = "Sun's 32-bit Linux";
-    $reqVersion = "1.4.2_05";
-} elsif ($^O eq "solaris") {
-    $jdkVersion = "Sun's 32-bit Solaris";
-    $reqVersion = "1.4.2_05";
-} else {
-    print("Unsupported operating system: $^O!\n");
-    exit;
-}
-
-# Check if base/nsjre.zip or base/jre.z already exists
-unless (-e "./base/nsjre.zip" || -e "./base/jre.z") {
-    # Check if NSJRE environment variable is set
-    if ($ENV{NSJRE}) {
-        chomp ($jrepath = $ENV{NSJRE});
-        print ("Using NSJRE environment variable: $jrepath\n");
-    } else {
-        print ("In order to run setup, you need to have version");
-        print (" $reqVersion of\n");
-        print ("$jdkVersion Java runtime environment on your system.\n\n");
-        print ("Enter the path to the unpackaged JRE: ");
-        chomp ($jrepath = <STDIN>);
-    }
-
-    VerifyJRE();
-    CreatePackage();
-    CleanUp();
-}
-
-# Kick off setup
-exec("./dssetup @ARGV");
-
-sub VerifyJRE {
-    print ("\nVerifying JRE...");
-    unless (-e "$jrepath" && -r "$jrepath") { die ("\nError: Can't access JRE: $!\n"); }
-    unless (-e "$jrepath/bin" && -r "$jrepath/bin") { die ("\nError: Can't access $jrepath/bin: $!\n"); }
-    unless (-e "$jrepath/bin" && -r "$jrepath/lib") { die ("\nError: Can't access $jrepath/lib: $!\n"); }
-    unless (-e "$jrepath/bin/java" || -e "$jrepath/bin/java.exe") { die ("\nError: Invalid JRE found: $!\n"); }
-
-    my $jreVersion = `\"$jrepath/bin/java\" -version 2>&1`;
-    $jreVersion =~ /".*"/;
-    $foundVersion = $&;
-    print (" Found JRE $foundVersion\n");
-    unless ($foundVersion =~ $reqVersion) {
-        print ("\nWarning: This product was certified with JRE version \"$reqVersion\".  You have version $foundVersion.\n");
-        print ("The product may not behave correctly if you use this JRE.\n");
-        print ("Would you like to continue anyway [yes/no]? ");
-        chomp ($answer = <STDIN>);
-        unless ($answer eq "yes") { exit; } 
-    }
-}
-
-sub CreatePackage {
-    print ("Creating JRE package...");
-
-    # Create packaging area
-    mkdir ("bin", 0755) || die ("Error: Can't create ./bin: $!\n");
-    mkdir ("bin/base", 0755) || die ("Error: Can't create ./bin/base: $!\n");
-    mkdir ("bin/base/jre", 0755) || die ("Error: Can't create ./bin/base/jre: $!\n");
-
-    # Copy bin and lib from JRE into packaging area, then create zip archive
-    if ($^O eq "MSWin32") {
-        system ("xcopy /E /I /Q \"$jrepath/bin\" \"bin/base/jre/bin\"") == 0 ||
-            die ("\nError: Can't copy JRE: $!\n");
-        system ("xcopy /E /I /Q \"$jrepath/lib\" \"bin/base/jre/lib\"") == 0 ||
-            die ("\nError: Can't copy JRE: $!\n");
-        system ("./tools/zip -q -r ./base/jre.z ./bin") == 0 ||
-            die ("\nError: Can't create JRE archive: $!\n");
-    } else {
-        system ("cp -R $jrepath/bin ./bin/base/jre") == 0 ||
-            die ("\nError: Can't copy JRE: $!\n");
-        system ("cp -R $jrepath/lib ./bin/base/jre") == 0 ||
-            die ("\nError: Can't copy JRE: $!\n");
-
-        # On HP-UX, we need to move some libraries in the JRE package
-        if ($^O eq "hpux") {
-            system ("cp -f ./bin/base/jre/lib/PA_RISC/native_threads/libhpi.sl ./bin/base/jre/lib/PA_RISC/libhpi.sl") == 0 ||
-                die ("\nError: Can't create JRE archive: $!\n");
-            system ("cp -f ./bin/base/jre/lib/PA_RISC2.0/native_threads/libhpi.sl ./bin/base/jre/lib/PA_RISC2.0/libhpi.sl") == 0 ||
-                die ("\nError: Can't create JRE archive: $!\n");
-            system ("cp -f ./bin/base/jre/lib/PA_RISC2.0W/native_threads/libhpi.sl ./bin/base/jre/lib/PA_RISC2.0W/libhpi.sl") == 0 ||
-                die ("\nError: Can't create JRE archive: $!\n");
-        }
-
-        system ("./tools/zip -q -r ./base/nsjre.zip ./bin") == 0 ||
-            die ("\nError: Can't create JRE archive: $!\n");
-    }
-
-    print (" Done\n");
-}
-
-sub CleanUp {
-    print ("Cleaning up...");
-
-    # Remove packaging area
-    RemoveFiles ("./bin");
-    rmdir ("./bin") || die ("Error: can't remove ./bin: $!\n");
-
-    print (" Done\n");
-}
-
-sub RemoveFiles {
-    my $dir = shift;
-    opendir (DIR, $dir) || die ("Error: Can't open $dir: $!");
-    my @entries = map { "$dir/$_" } grep { !/^\.$|^\.\.$/ } readdir DIR;
-    closedir DIR;
-    for (@entries) {
-	if (-l $_) {
-            unlink || die ("Error: Can't remove $_: $!\n");
-	} elsif (-d $_) {
-            RemoveFiles($_);
-            rmdir($_) || die ("Error: Can't remove $_: $!\n");
-        } else {
-            unlink || die ("Error: Can't remove $_: $!\n");
-        }
-    }
-}
-
diff --git a/ldap/cm/newinst/setup.sh b/ldap/cm/newinst/setup.sh
deleted file mode 100755
index 640d416b..00000000
--- a/ldap/cm/newinst/setup.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# --- BEGIN COPYRIGHT BLOCK ---
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-
-setupdir=`dirname $0`
-cd ${setupdir}
-
-# Kick off setup script
-./setup.pl $*
diff --git a/ldap/cm/newinst/slapd-patch.inf b/ldap/cm/newinst/slapd-patch.inf
deleted file mode 100644
index c09309fb..00000000
--- a/ldap/cm/newinst/slapd-patch.inf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-[General]
-Name= %%%SERVER_NAME%%%
-Components=slapd-10
-
-[slapd-10]
-Name= %%%SERVER_NAME%%%
-InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
-Description= %%%SERVER_NAME%%%
-NickName= slapd-10
-Version= %%%SERVER_VERSION%%%
-BuildNumber= %%%SERVER_BUILD_NUM%%%
-Archive= nsslapd-10.zip
-SourcePath=slapd-10
-PreInstall= ns-config -r
-PostInstall= bin/slapd/admin/bin/ns-update
-PreUninstall= bin/slapd/admin/bin/uninstall
-PostUninstall=
-Checked=True
-Mandatory=False
-IsLdap=True
diff --git a/ldap/cm/newinst/uninstall b/ldap/cm/newinst/uninstall
deleted file mode 100755
index f48fa343..00000000
--- a/ldap/cm/newinst/uninstall
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-# determine server root directory from $0; this script is being run
-# from server root/bin/slapd/admin/bin
-
-sroot=`echo $0 | sed 's#/bin/slapd/admin/bin/.*##g'`
-
-# check if Solaris 9+ specific un-installation
-for arg in $* ; do
-        if [ "$arg" = "-S" ]; then
-                iDSISolaris=1
-        fi
-done
-
-if [ "$iDSISolaris" = "1" ]; then
-        vardir=`echo $sroot | sed 's#/usr/iplanet/#/var/#'`
-        etcdir=`echo $sroot | sed 's#/usr/#/etc/#'`
-fi
-
-# search for all slapd-* directories
-
-cd $sroot || {
-	echo "Could not change dir to server root directory $sroot"
-	exit 1
-}
-
-NETSITE_ROOT=$sroot
-REQUEST_METHOD=GET
-export NETSITE_ROOT REQUEST_METHOD
-# for each server instance
-for dir in slapd-* ; do
-	QUERY_STRING="InstanceName=$dir"
-	SERVER_NAMES=$dir
-	export QUERY_STRING SERVER_NAMES
-	# try to remove the nice way . . .
-	cd bin/slapd/admin/bin
-	status=0
-	./ds_remove $* > /dev/null 2>&1 || status=$?
-	cd $sroot
-	# wait for that to finish
-	sleep 2
-	if [ $status -ne 0 -o -d $dir ]; then
-		# something went wrong; kill with extreme prejudice . . .
-		# Solaris 9+ specific un-installation
-        if [ -f $dir/logs/pid ]; then
-			pid=`cat $dir/logs/pid`
-			# kill the server
-			kill -9 $pid > /dev/null 2>&1
-			# wait for it to stop
-			sleep 2
-		fi
-		# remove the instance directory
-		rm -rf $dir
-	fi
-	# Solaris 9+ specific un-installation
-        if [ "$iDSISolaris" = "1" ]; then
-                rm -rf $etcdir/$dir
-                rm -rf $vardir/$dir
-        fi
-
-done
-
-# remove some other stuff which is dynamically created
-if [ "$iDSISolaris" = "" ]; then
-	rm -rf bin/slapd
-fi
-
-exit 0
diff --git a/ldap/cm/newinst/ux-config.cc b/ldap/cm/newinst/ux-config.cc
deleted file mode 100644
index df1cf5c8..00000000
--- a/ldap/cm/newinst/ux-config.cc
+++ /dev/null
@@ -1,1118 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-/*********************************************************************
-**
-** NAME:
-**   ux-config.cc
-**
-** DESCRIPTION:
-**   Fedora Directory Server Pre-installation Program
-**
-** NOTES:
-**   This program is intended for UNIX only and is NOT thread-safe.
-**   Based on the original ux-config.c.
-**
-*********************************************************************/
-
-extern "C" {
-#include <stdio.h>
-#include <string.h>
-#ifdef AIX
-#include <strings.h>
-#endif
-#include "nspr.h"
-#include "plstr.h"
-}
-/* Newer g++ wants the new std header forms */
-#if defined( Linux )
-#include <strstream>
-using std::ostrstream;
-/* But some platforms won't accept those (specifically HP-UX aCC */
-#else
-#include <strstream.h>
-#endif
-#include "dialog.h"
-#include "ux-config.h"
-#include "ux-dialog.h"
-#include "install_keywords.h"
-#include "utf8.h"
-extern "C" {
-#include <dsalib.h>
-
-#if defined(__sun) || defined(__hppa) || defined(__osf__) || defined(__linux__) || defined(linux)
-#include <netdb.h>
-#endif
-}
-
-extern const char *DEFAULT_SYSUSER = "root";
-extern const char *DEFAULT_OLDROOT = "/usr/ns-home";
-
-const int RECONFIG_EXIT_CODE = 7;
-
-/*
- * iDSISolaris is set to 1 for Solaris 9+ specific installation.
- * This can be done by passing -S as the command line argument.
- */
-int iDSISolaris = 0;
-
-static char *
-my_strdup(const char *s)
-{
-	char *ret = 0;
-	if (s)
-	{
-		ret = new char[strlen(s) + 1];
-		strcpy(ret, s);
-	}
-
-	return ret;
-}
-
-/*********************************************************************
-**
-** METHOD:
-**   main
-** DESCRIPTION:
-**   This is the ns-config program. This program functions as
-**     - The Pre-installation program used during the Installation
-**       of the Directory Server. In this case, the program
-**       is supposed to be executed by the common installer (ns-setup)
-**       and can be executed from anywhere.
-**
-**     - The stand-alone configuration program used to re-configure
-**       the directory server. In this case, the program has
-**       to be executed from the serverroot.
-**
-** SIDE EFFECTS:
-**   None
-** RESTRICTIONS:
-**
-** ALGORITHM:
-**
-**********************************************************************/
-int
-main(int argc, char **argv)
-{
-   int err = 0;
-
-   SlapdPreInstall program(argc, argv);
-
-   err = program.init();
-   if (!err)
-   {
-      err = program.start();
-   }
-
-   return err;
-} 
-
-SlapdPreInstall::SlapdPreInstall(int argc, char **argv) : _reconfig(False)
-{
-   setInstallMode(Interactive);
-   setInstallType(Typical);
-   _configured = False;
-
-   getOptions(argc, argv);
-
-}
-
-SlapdPreInstall::~SlapdPreInstall()
-{
-}
-
-void
-SlapdPreInstall::getOptions(int argc, char **argv)
-{
-   int opt;
-
-   while ((opt = getopt(argc,argv, "l:f:m:rsS")) != EOF)
-   {
-      switch (opt)
-      {
-         case 'l':
-           _logFile = strdup(optarg);
-           break;
-         case 'f':
-           _infoFile = strdup(optarg);
-           break;
-         case 's':
-           setInstallMode(Silent);
-           break;
-         case 'm':
-           setInstallType((InstallType)atoi(optarg));
-           break;
-         case 'r':
-           _reconfig = True;
-           break;
-         case 'S':
-	   /*
-	    * Solaris 9+ specific installation
-	    */	 
-           iDSISolaris = 1;
-           break;
-         default:
-		   fprintf(stderr, "SlapdPreInstall::getOptions(): "
-				   "invalid option [%s]\n", argv[optind-1]);
-           break;
-       }
-   }
-}
-
-
-int
-SlapdPreInstall::init()
-{
-   char errMsg[256];
-   struct stat fi;
-   Bool shell = True;
-
-   _installInfo = NULL;
-   _slapdInfo = new InstallInfo;
-
-   if (installMode() != Silent)
-   {
-	 Dialog::initDisplay("Directory", "Fedora Project");
-   }
-
-   if ((installMode() == Silent && _infoFile == (char *) NULL) || 
-       (_infoFile != (char *) NULL && InstUtil::fileExists(_infoFile) == False))
-   {
-      PR_snprintf(errMsg, sizeof(errMsg), "ERROR: answer cache not found\n");
-      if (installMode() == Silent)
-      {
-         printf(errMsg);
-      }
-      else
-      {
-         DialogAlert alert(errMsg);
-         alert.execute();
-      }
-      return -1;
-   }
-
-   _serverRoot = InstUtil::getCurrentDir();
-   if (installMode() != Silent)
-   {
-      if (_infoFile == (char *) NULL)
-      {
-         // Not executing from the Shell, check if this is the server
-         if (stat ("admin-serv", &fi) != 0)
-         {
-            PR_snprintf(errMsg, sizeof(errMsg), "ERROR: %s is not a server root\n",_serverRoot.data());
-            DialogAlert alert(errMsg);
-            alert.execute();
-            return -1;
-         }
-         shell = False;
-		 // if we are here, we are being run to reconfigure
-		 _reconfig = True;
-      }
-   }
-
-   if (installMode() == Silent)
-   {
-      if (_logFile == (char *) NULL)
-      {
-         // Should have a logfile
-         _logFile = _serverRoot + "/setup/install.log";
-      }
-      _installLog = new InstallLog (_logFile);
-   }
-
-   if (shell)
-   {
-      _installInfo = new InstallInfo(_infoFile);
-      _serverRoot = _installInfo->get(SLAPD_KEY_SERVER_ROOT);
-	  if (!(_adminInfo = _installInfo->getSection("admin")))
-	  {
-		  _adminInfo = new InstallInfo;
-	  }
-   }
-   else
-   {
-      // Retrieve configuration data into installInfo
-      _infoFile = _serverRoot + "/" + "setup/install.inf";
-      _installInfo = new InstallInfo();
-      if (initDefaultConfig() == -1) {
-	    const char *guess_host = InstUtil::guessHostname();
-	    if (guess_host) {
-			PR_snprintf(errMsg, sizeof(errMsg), "ERROR: %s is not an addressable hostname\n",
-						guess_host);
-	    } else {
-			PR_snprintf(errMsg, sizeof(errMsg), "ERROR: cannot determine an addressable hostname\n");
-	    }
-            DialogAlert alert(errMsg);
-            alert.execute();
-	    return -1;
-      }
-      if (getDNSDomain() == NULL) {
-	    const char *guess_domain = InstUtil::guessDomain();	
-
-	    if (guess_domain == NULL) {
-			PR_snprintf(errMsg, sizeof(errMsg), "ERROR: cannot determine domainname\n");
-	    } else {
-			PR_snprintf(errMsg, sizeof(errMsg), "ERROR: domainname is not valid for DNS\n");
-	    }
-            DialogAlert alert(errMsg);
-            alert.execute();
-	    return -1;
-      }
-   }
-
-   setDefaultScript(_slapdInfo);
-
-   char *url = 0;
-   char *adminid = 0;
-   char *admin_domain = 0;
-   getDefaultLdapInfo(_serverRoot, &url, &adminid, &admin_domain);
-   if (url && admin_domain) // in some cases adminid is NULL
-   {
-	   if (!adminid)
-	   {
-		   // look up the admin ID in the config ds
-	   }
-	   // use these values as our default values
-	   _installInfo->set(SLAPD_KEY_K_LDAP_URL, url);
-	   if (adminid)
-	   {
-		   _installInfo->set(SLAPD_KEY_SERVER_ADMIN_ID, adminid);
-	   }
-	   _installInfo->set(SLAPD_KEY_ADMIN_DOMAIN, admin_domain);
-	   // since this server root is already configured to use
-	   // an existing configuration directory server, we will
-	   // not allow the user to install another one here, so
-	   // the directory server created here will be a user
-	   // directory; we will still need to ask for the admin
-	   // user password
-	   _slapdInfo->set(SLAPD_KEY_USE_EXISTING_MC, "Yes");
-	   _slapdInfo->set(SLAPD_KEY_USE_EXISTING_UG, "No");
-	   _slapdInfo->set(SLAPD_KEY_SLAPD_CONFIG_FOR_MC, "No");
-   }
-   else
-   {
-	   _slapdInfo->set(SLAPD_KEY_SLAPD_CONFIG_FOR_MC, "Yes");
-   }
-
-   return 0;
-}
-/*
- * PVO
- */
-
-int
-SlapdPreInstall::initDefaultConfig()
-{
-   // PVO - should read from DS instead
-   if (_adminInfo->isEmpty())
-   {
-      const char *guess_host = InstUtil::guessHostname();
-
-      if (guess_host) {
-#if defined(__sun) || defined(__hppa) || defined(__osf__) || defined(__linux__) || defined(linux)
-	static char test_host[BIG_BUF] = {0};
-	struct hostent *hp;
-	
-	PL_strncpyz(test_host,guess_host,sizeof(test_host));
-	hp = gethostbyname(test_host);
-	if (hp == NULL) {
-	  return -1;
-	}
-#endif
-      }
-      _installInfo->set(SLAPD_KEY_SERVER_ROOT, _serverRoot);
-      _installInfo->set(SLAPD_KEY_FULL_MACHINE_NAME, guess_host);
-      _installInfo->set(SLAPD_KEY_K_LDAP_URL, NSString("ldap://")
-						+ guess_host
-						+ "/"
-						+ DEFAULT_LDAP_SUFFIX);
-      _installInfo->set(SLAPD_KEY_SUITESPOT_USERID, DEFAULT_SSUSER);
-      _installInfo->set(SS_GROUP, DEFAULT_SSGROUP);
-   }
-   else
-   {
-      _configured = True;
-   }
-   return 0;
-}
-
-inline void
-changeIndex(int &ii, int incr, int min, int max)
-{
-	ii += incr;
-	if (ii < min)
-		ii = min;
-	if (ii > max)
-		ii = max;
-}
-	
-int
-SlapdPreInstall::start()
-{
-	// if we're in silent install mode, don't execute any of the dialogs, just
-	// assume the user knows what he/she is doing . . .
-	if (installMode() == Silent)
-	{
-		if (_reconfig)
-			shutdownServers();
-		return 0;
-	}
-
-   // only enable win mode if we are not doing a silent install because
-   // it messes up terminal settings
-   enableWinMode();
-
-   DialogAction action = DIALOG_NEXT;
-   int err = 0;
-   Dialog *advancedDialogList[] = {
-	   &askUseExistingMC,
-	   &askMCHost,
-	   &askMCPort,
-	   &askMCDN,
-	   &askMCAdminDomain,
-	   &askUseExistingUG,
-	   &askUGHost,
-	   &askUGPort,
-	   &askUGSuffix,
-	   &askUGDN,
-	   &askSlapdPort,
-	   &askSlapdServerID,
-	   &askMCAdminID,
-	   &askSlapdSuffix,
-	   &askSlapdRootDN,
-	   &askAdminDomain,
-	   /*
-	   &askReplication,
-	   &askSIR,
-	   &askChangeLogSuffix,
-	   &askChangeLogDir,
-	   &askConsumerDN,
-	   &askSIRHost,
-	   &askSIRPort,
-	   &askSIRDN,
-	   &askSIRSuffix,
-	   &askSIRDays,
-	   &askSIRTimes,
-	   &askCIR,
-	   &askCIRHost,
-	   &askCIRPort,
-	   &askCIRDN,
-	   &askCIRSuffix,
-	   &askCIRInterval,
-	   &askCIRDays,
-	   &askCIRTimes,
-	   &askReplicationDN,
-	   */
-	   &askSample,
-	   &askPopulate,
-	   &askDisableSchemaChecking
-   };
-   Dialog *advancediDSISolarisForceUGDialogList[] = {
-	   &askSlapdPort,
-	   &askSlapdServerID,
-	   &askMCHost,
-	   &askMCPort,
-	   &askMCDN,
-	   &askSlapdSuffix,
-	   &askSlapdRootDN,
-	   &askSample,
-	   &askPopulate,
-	   &askDisableSchemaChecking
-   };
-   Dialog *normalDialogList[] = {
-	   &askUseExistingMC,
-	   &askMCHost,
-	   &askMCPort,
-	   &askMCDN,
-	   &askUseExistingUG,
-	   &askUGHost,
-	   &askUGPort,
-	   &askUGSuffix,
-	   &askUGDN,
-	   &askSlapdPort,
-	   &askSlapdServerID,
-	   &askMCAdminID,
-	   &askSlapdSuffix,
-	   &askSlapdRootDN,
-	   &askAdminDomain
-   };
-   Dialog *normalForceUGDialogList[] = {
-	   &askSlapdPort,
-	   &askSlapdServerID,
-	   &askMCDN,
-	   &askSlapdSuffix,
-	   &askSlapdRootDN
-   };
-   Dialog *normaliDSISolarisForceUGDialogList[] = {
-	   &askSlapdPort,
-	   &askSlapdServerID,
-	   &askMCHost,
-	   &askMCPort,
-	   &askMCDN,
-	   &askSlapdSuffix,
-	   &askSlapdRootDN
-   };
-   Dialog *expressDialogList[] = {
-	   &askMCAdminID,
-	   &askSlapdRootDN
-   };
-   Dialog *expressForceUGDialogList[] = {
-	   &askMCDN,
-	   &askSlapdRootDN
-   };
-   Dialog *expressiDSISolarisForceUGDialogList[] = {
-	   &askMCHost,
-	   &askMCPort,
-	   &askMCDN,
-	   &askSlapdRootDN
-   };
-   Dialog *reconfigDialogList[] = {
-	   &askReconfigMCAdminPwd
-   };
-   const int nNormalDialogs = sizeof(normalDialogList) / sizeof(normalDialogList[0]);
-   const int nExpressDialogs = sizeof(expressDialogList) / sizeof(expressDialogList[0]);
-   const int nExpressForceUGDialogs = sizeof(expressForceUGDialogList) / sizeof(expressForceUGDialogList[0]);
-   const int nExpressiDSISolarisForceUGDialogs = sizeof(expressiDSISolarisForceUGDialogList) / sizeof(expressiDSISolarisForceUGDialogList[0]);
-   const int nAdvancedDialogs = sizeof(advancedDialogList) / sizeof(advancedDialogList[0]);
-   const int nAdvancediDSISolarisForceUGDialogs = sizeof(advancediDSISolarisForceUGDialogList) / sizeof(advancediDSISolarisForceUGDialogList[0]);
-   const int nReconfigDialogs = sizeof(reconfigDialogList) / sizeof(reconfigDialogList[0]);
-   const int nNormalForceUGDialogs = sizeof(normalForceUGDialogList) / sizeof(normalForceUGDialogList[0]);
-   const int nNormaliDSISolarisForceUGDialogs = sizeof(normaliDSISolarisForceUGDialogList) / sizeof(normaliDSISolarisForceUGDialogList[0]);
-
-   int nDialogs = nNormalDialogs;
-   Dialog** dialogList = normalDialogList;
-   if (_reconfig)
-   {
-	   nDialogs = nReconfigDialogs;
-	   dialogList = reconfigDialogList;
-   }
-   else if (installType() == Express)
-   {
-	   nDialogs = nExpressDialogs;
-	   dialogList = expressDialogList;
-   }
-   else if (installType() == Custom)
-   {
-	   nDialogs = nAdvancedDialogs;
-	   dialogList = advancedDialogList;
-   }
-   else if (!iDSISolaris && featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-   {
-	   if (installType() == Typical)
-	   {
-		   nDialogs = nNormalForceUGDialogs;
-		   dialogList = normalForceUGDialogList;
-	   }
-	   else if (installType() == Express)
-	   {
-		   nDialogs = nExpressForceUGDialogs;
-		   dialogList = expressForceUGDialogList;
-	   }
-   }
-
-   if (iDSISolaris && featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-   {
-	   if (installType() == Typical)
-	   {
-		   nDialogs = nNormaliDSISolarisForceUGDialogs;
-		   dialogList = normaliDSISolarisForceUGDialogList;
-	   }
-	   else if (installType() == Express)
-	   {
-		   nDialogs = nExpressiDSISolarisForceUGDialogs;
-		   dialogList = expressiDSISolarisForceUGDialogList;
-	   }
-	   else if (installType() == Custom)
-	   {
-	  	   nDialogs = nAdvancediDSISolarisForceUGDialogs;
-		   dialogList = advancediDSISolarisForceUGDialogList;
-	   }
-
-   }
-
-   getDefaultScript()->set(SLAPD_KEY_SECURITY_ON, "No");
-
-   int ii = 0;
-
-   // initialize all dialogs
-
-   if (!_reconfig)
-   {
-	   for (ii = 0; ii < nAdvancedDialogs; ++ii)
-	   {
-		   advancedDialogList[ii]->registerDialogNext(this);
-		   advancedDialogList[ii]->enable8BitInput();
-		   // this next bit of hackery allows us to use the dialog->setup()
-		   // method of each dialog to setup the default values for the
-		   // .inf file; if the SETUP_ONLY flag is set, each setup() method
-		   // will just return DIALOG_NEXT after setting up the default
-		   // values; pretty sneaky, huh?
-		   advancedDialogList[ii]->setUserData(SETUP_DEFAULTS, SETUP_ONLY);
-		   advancedDialogList[ii]->setUserData(ACTION, DIALOG_NEXT);
-		   advancedDialogList[ii]->execute();
-		   advancedDialogList[ii]->setUserData(SETUP_DEFAULTS, (long)0);
-	   }
-	   advancedDialogList[nAdvancedDialogs-1]->registerDialogLast(this);
-   }
-   else
-   {
-	   for (ii = 0; ii < nReconfigDialogs; ++ii)
-	   {
-		   reconfigDialogList[ii]->registerDialogNext(this);
-		   reconfigDialogList[ii]->enable8BitInput();
-	   }
-	   reconfigDialogList[nReconfigDialogs-1]->registerDialogLast(this);
-   }
-
-   ii = 0;
-   int min = 0;
-   // keep looping until we hit the end
-   while (ii < nDialogs)
-   {
-	   int incr = 1; // go to next by default
-	   Dialog *d = dialogList[ii];
-
-	   // tell the dialog what the action was that brought it here so that
-	   // the dialog knows if it was called as the result of a next or
-	   // a prev or whatever
-	   d->setUserData(ACTION, (long)action);
-//	   cerr << "set action in dialog " << ii << " to " << action << endl;
-//	   cerr << "DIALOG_PREV, SAME, NEXT = " << DIALOG_PREV << "," << DIALOG_SAME << "," << DIALOG_NEXT << endl;
-
-	   // execute the dialog
-//	   cerr << "executing dialog number " << ii << endl;
-	   action = d->execute();
-	   if (action == DIALOG_PREV)
-	   {
-		   incr = -1; // go to prev
-//		   cerr << "prev" << endl;
-	   }
-	   else if (action == DIALOG_SAME)
-	   {
-		   incr = 0; // repeat this state
-//		   cerr << "same" << endl;
-	   }
-	   else if (action != DIALOG_NEXT)
-	   {
-		   incr = nDialogs;
-		   err = -1; // could just break here, I suppose . . .
-	   }
-	   else
-	   {
-//		   cerr << "next" << endl;
-	   }
-
-	   changeIndex(ii, incr, min, nDialogs);
-   }
-
-   if (err == 0)
-   {
-	   if (!_reconfig)
-	   {
-		   _installInfo->addSection("slapd", _slapdInfo);
-		   if (!_installInfo->getSection("admin") && _adminInfo &&
-			   !_adminInfo->isEmpty())
-		   {
-			   _installInfo->addSection("admin", _adminInfo);
-			   delete _adminInfo;
-			   _adminInfo = 0;
-		   }
-
-		   if (!_installInfo->get(SLAPD_KEY_K_LDAP_HOST))
-		   {
-			   _installInfo->set(SLAPD_KEY_K_LDAP_HOST,
-								 _installInfo->get(SLAPD_KEY_FULL_MACHINE_NAME));
-		   }
-		   if (!_installInfo->get(SLAPD_KEY_K_LDAP_PORT))
-		   {
-			   _installInfo->set(SLAPD_KEY_K_LDAP_PORT,
-								 _slapdInfo->get(SLAPD_KEY_SERVER_PORT));
-		   }
-		   const char *test = 0;
-		   if (!(test = _installInfo->get(SLAPD_KEY_BASE_SUFFIX)) || !*test)
-		   {
-			   // if there's no config directory suffix we must use
-			   // o=NetscapeRoot
-			   _installInfo->set(SLAPD_KEY_BASE_SUFFIX, DEFAULT_ROOT_DN);
-		   }
-
-		   // only UG directories have a user base suffix . . .
-		   if (featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-			   _slapdInfo->remove(SLAPD_KEY_SUFFIX);
-
-		   // if there is no LdapURL and other ldap info in the installInfo, write
-		   // it
-		   if (!_installInfo->get(SLAPD_KEY_K_LDAP_URL))
-		   {
-			   // construct a new LdapURL based on host, port, and suffix
-			   const char *suffix = _installInfo->get(SLAPD_KEY_BASE_SUFFIX);
-			   if (!suffix || !*suffix)
-				   suffix = DEFAULT_ROOT_DN;
-			   NSString ldapURL = NSString("ldap://") +
-				   _installInfo->get(SLAPD_KEY_K_LDAP_HOST) + ":" +
-				   _installInfo->get(SLAPD_KEY_K_LDAP_PORT) + "/" +
-				   suffix;
-			   _installInfo->set(SLAPD_KEY_K_LDAP_URL, ldapURL);
-		   }
-
-		   if (!featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		   {
-			   // if this is to be both the MC and the UG host . . .
-			   if (!featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-			   {
-				   // use the MC admin ID for the UG admin ID
-				   if (!_installInfo->get(SLAPD_KEY_USER_GROUP_ADMIN_ID))
-					   _installInfo->set(SLAPD_KEY_USER_GROUP_ADMIN_ID,
-										 _installInfo->get(SLAPD_KEY_SERVER_ADMIN_ID));
-
-				   if (!_installInfo->get(SLAPD_KEY_USER_GROUP_ADMIN_PWD))
-					   _installInfo->set(SLAPD_KEY_USER_GROUP_ADMIN_PWD,
-										 _installInfo->get(SLAPD_KEY_SERVER_ADMIN_PWD));
-			   }
-		   }
-
-		   // set the ug ldap url if we need one
-		   if (!_installInfo->get(SLAPD_KEY_USER_GROUP_LDAP_URL))
-		   {
-			   if (featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-			   {
-				   NSString url = NSString("ldap://") +
-					   _installInfo->get(SLAPD_KEY_UG_HOST) + ":" +
-					   _installInfo->get(SLAPD_KEY_UG_PORT) + "/" +
-					   _installInfo->get(SLAPD_KEY_UG_SUFFIX);
-				   _installInfo->set(SLAPD_KEY_USER_GROUP_LDAP_URL, url);
-			   }
-			   else // the directory we're creating is the UG
-			   {
-				   NSString url = NSString("ldap://") +
-					   _installInfo->get(SLAPD_KEY_FULL_MACHINE_NAME) + ":" +
-					   _slapdInfo->get(SLAPD_KEY_SERVER_PORT) + "/" +
-					   _slapdInfo->get(SLAPD_KEY_SUFFIX);
-				   _installInfo->set(SLAPD_KEY_USER_GROUP_LDAP_URL, url);
-			   }
-		   }
-
-		   if (!_installInfo->get(SLAPD_KEY_USER_GROUP_ADMIN_ID))
-			   _installInfo->set(SLAPD_KEY_USER_GROUP_ADMIN_ID,
-								 _slapdInfo->get(SLAPD_KEY_ROOTDN));
-
-		   if (!_installInfo->get(SLAPD_KEY_USER_GROUP_ADMIN_PWD))
-			   _installInfo->set(SLAPD_KEY_USER_GROUP_ADMIN_PWD,
-								 _slapdInfo->get(SLAPD_KEY_ROOTDNPWD));
-	   } else {
-		   // for reconfigure, just shutdown the servers
-		   shutdownServers();
-	   }
-
-	   // remove the fields we don't need
-	   _installInfo->remove(SLAPD_KEY_K_LDAP_HOST);
-	   _installInfo->remove(SLAPD_KEY_K_LDAP_PORT);
-	   _installInfo->remove(SLAPD_KEY_BASE_SUFFIX);
-	   _installInfo->remove(SLAPD_KEY_UG_HOST);
-	   _installInfo->remove(SLAPD_KEY_UG_PORT);
-	   _installInfo->remove(SLAPD_KEY_UG_SUFFIX);
-
-	   // normalize and convert the DN valued attributes to LDAPv3 style
-	   normalizeDNs();
-
-	   // format for .inf file
-	   _installInfo->setFormat(1);
-
-	   // convert internally stored UTF8 to local
-	   _installInfo->toLocal();
-	   _installInfo->write(_infoFile);
-   }
-
-   disableWinMode();
-
-   return err;
-}
-
-int
-SlapdPreInstall::cont()
-{
-   return 0;
-}
-
-void
-SlapdPreInstall::clear()
-{
-}
-
-void
-SlapdPreInstall::add(Dialog *p)
-{
-	p = p;
-}
-void
-SlapdPreInstall::resetLast()
-{
-}
-
-void
-SlapdPreInstall::addLast(Dialog *p)
-{
-	p = p;
-}
-void
-SlapdPreInstall::setParent(void *parent)
-{
-	parent = parent;
-	return;
-}
-void *
-SlapdPreInstall::parent() const
-{
-   return (void *) this;
-}
-
-void
-SlapdPreInstall::setAdminScript(InstallInfo *script)
-{
-	_adminInfo = script;
-}
-
-InstallInfo *
-SlapdPreInstall::getAdminScript() const
-{
-	return _adminInfo;
-}
-
-InstallInfo *
-SlapdPreInstall::getBaseScript() const
-{
-	return _installInfo;
-}
-
-void
-SlapdPreInstall::showAlert(const char *msg)
-{
-	char *localMsg = UTF8ToLocal(msg);
-	DialogAlert alert(localMsg);
-	alert.execute();
-	nsSetupFree(localMsg);
-
-	return;
-}
-
-int
-SlapdPreInstall::verifyRemoteLdap(
-	const char *host,
-	const char *port,
-	const char *suffix,
-	const char *binddn,
-	const char *binddnpwd
-) const
-{
-	const char *myhost = getDefaultScript()->get(host);
-	if (!myhost)
-		myhost = getBaseScript()->get(host);
-	const char *myport = getDefaultScript()->get(port);
-	if (!myport)
-		myport = getBaseScript()->get(port);
-	const char *mysuffix = getDefaultScript()->get(suffix);
-	if (!mysuffix)
-		mysuffix = getBaseScript()->get(suffix);
-	if (!mysuffix)
-		mysuffix = DEFAULT_ROOT_DN;
-	const char *mydn = getDefaultScript()->get(binddn);
-	if (!mydn)
-		mydn = getBaseScript()->get(binddn);
-	const char *mypwd = getDefaultScript()->get(binddnpwd);
-	if (!mypwd)
-		mypwd = getBaseScript()->get(binddnpwd);
-
-	char *s = PR_smprintf("ldap://%s:%s/%s", myhost, myport, (suffix && mysuffix) ? mysuffix : "");
-	int status = authLdapUser(s, mydn, mypwd, NULL, NULL);
-	PR_smprintf_free(s);
-	return status;
-}
-
-int
-SlapdPreInstall::verifyAdminDomain(
-	const char *host,
-	const char *port,
-	const char *suffix,
-	const char *admin_domain,
-	const char *binddn,
-	const char *binddnpwd
-) const
-{
-	const char *myhost = getDefaultScript()->get(host);
-	if (!myhost)
-		myhost = getBaseScript()->get(host);
-	const char *myport = getDefaultScript()->get(port);
-	if (!myport)
-		myport = getBaseScript()->get(port);
-	const char *mysuffix = getDefaultScript()->get(suffix);
-	if (!mysuffix)
-		mysuffix = getBaseScript()->get(suffix);
-	if (!mysuffix)
-		mysuffix = DEFAULT_ROOT_DN;
-	const char *mydn = getDefaultScript()->get(binddn);
-	if (!mydn)
-		mydn = getBaseScript()->get(binddn);
-	const char *mypwd = getDefaultScript()->get(binddnpwd);
-	if (!mypwd)
-		mypwd = getBaseScript()->get(binddnpwd);
-	const char *myadmin_domain = getDefaultScript()->get(admin_domain);
-	if (!myadmin_domain)
-		myadmin_domain = getBaseScript()->get(admin_domain);
-
-	char *s = PR_smprintf("ldap://%s:%s/%s", myhost, myport, (suffix && mysuffix) ? mysuffix : "");
-	LdapError ldapErr;
-	Ldap ldap(ldapErr, s, mydn, mypwd);
-	int status = ldapErr;
-	if (!status && admin_domain && myadmin_domain && mysuffix)
-	{
-		LdapEntry ad(&ldap);
-		NSString dn = NSString("ou=") + myadmin_domain + ", " + mysuffix;
-		status = ad.retrieve(dn);
-	}
-		
-	PR_smprintf_free(s);
-	return status;
-}
-
-const char *
-SlapdPreInstall::getDNSDomain() const
-{
-	static char domain[BIG_BUF] = {0};
-
-	if (domain[0])
-		return domain;
-
-	const char *FQDN =
-		getBaseScript()->get(SLAPD_KEY_FULL_MACHINE_NAME);
-	if (!FQDN) {
-		FQDN = InstUtil::guessHostname();
-	}
-
-	const char *ptr = NULL;
-	if (FQDN != NULL) {
-	// copy the domain name part (not the hostname) into the suffix
-	// find the last '.' in the FQDN
-	  	ptr = strchr(FQDN, '.');
-	}
-
-	if (FQDN == NULL || ptr == NULL) {
-	  	const char *guess_domain = InstUtil::guessDomain();
-		
-		if (guess_domain) {
-		  	/* ensure domain is of at least 2 components */
-		  	const char *dptr = strchr(guess_domain, '.');
-			if (dptr == NULL) {
-			  	return NULL;
-			}
-			
-		  	PL_strncpyz(domain, guess_domain, sizeof(domain));
-			return domain;
-		} else {
-		  	return NULL;
-		}
-	}
-
-	++ptr;
-	PL_strncpyz(domain, ptr, sizeof(domain));
-
-	return domain;
-}
-
-const char *
-SlapdPreInstall::getDefaultSuffix() const
-{
-	const char *SUF = "dc=";
-	const int SUF_LEN = 3;
-	static char suffix[BIG_BUF] = {0};
-
-	if (suffix[0])
-		return suffix;
-
-	char *sptr = suffix;
-	PL_strcatn(sptr, sizeof(suffix), SUF);
-	sptr += SUF_LEN;
-	for (const char *ptr = getDNSDomain(); ptr && *ptr; *ptr++) {
-		if (*ptr == '.') {
-			PL_strcatn(sptr, sizeof(suffix), ", ");
-			sptr += 2;
-			PL_strcatn(sptr, sizeof(suffix), SUF);
-			sptr += SUF_LEN;
-		} else {
-			*sptr++ = *ptr;
-		}
-	}
-	*sptr = 0;
-	if (!*suffix)
-		PR_snprintf(suffix, sizeof(suffix), "%s%s", SUF, "unknown-domain");
-
-	return suffix;
-}
-
-const char *
-SlapdPreInstall::getConsumerDN() const
-{
-	static char dn[BIG_BUF];
-
-	dn[0] = 0;
-	const char *suffix = 
-		getDefaultScript()->get(SLAPD_KEY_SUFFIX);
-	if (suffix)
-		PR_snprintf(dn, sizeof(dn), "cn=Replication Consumer, %s", suffix);
-	else
-		PR_snprintf(dn, sizeof(dn), "cn=Replication Consumer");
-
-	return dn;
-}
-
-int
-SlapdPreInstall::featureIsEnabled(const char *which) const
-{
-	const char *val = getDefaultScript()->get(which);
-	if (!val)
-		val = getBaseScript()->get(which);
-	if (!val || !*val || !strncasecmp(val, "no", strlen(val)))
-		return 0; // feature is disabled
-
-	return 1; // feature is enabled
-}
-
-void
-SlapdPreInstall::shutdownServers()
-{
-	const char *nick = "slapd";
-	const char *script = "stop-slapd";
-	int len = strlen(nick);
-	const char *sroot = getBaseScript()->get(SLAPD_KEY_SERVER_ROOT);
-	if (!sroot)
-		return;
-
-	DIR* srootdir = opendir(sroot);
-	if (!srootdir)
-		return;
-
-	struct dirent* entry = 0;
-	while ((entry = readdir(srootdir)))
-	{
-		// look for instance directories
-		if (!strncasecmp(entry->d_name, nick, len))
-		{
-			NSString instanceDir = NSString(sroot) + "/" + entry->d_name;
-			if (InstUtil::dirExists(instanceDir))
-			{
-				NSString prog = instanceDir + "/" + script;
-				// call the stop-slapd script
-				if (InstUtil::fileExists(prog))
-				{
-					cout << "Shutting down server " << entry->d_name
-						 << " . . . " << flush;
-					int status = InstUtil::execProgram(prog);
-					if (status)
-						// attempt to determine cause of failure
-						cout << "Could not shutdown server: status=" << status
-							 << " error=" << errno << endl;
-					else
-						cout << "Done." << endl;
-				}
-			}
-		}
-	}
-	closedir(srootdir);
-
-	return;
-}
-
-void
-SlapdPreInstall::normalizeDNs()
-{
-	static const char *DN_VALUED_ATTRS[] = {
-		SLAPD_KEY_SUFFIX,
-		SLAPD_KEY_ROOTDN,
-		SLAPD_KEY_CIR_SUFFIX,
-		SLAPD_KEY_CIR_BINDDN,
-		SLAPD_KEY_REPLICATIONDN,
-		SLAPD_KEY_CONSUMERDN,
-		SLAPD_KEY_SIR_SUFFIX,
-		SLAPD_KEY_SIR_BINDDN
-	};
-	static const int N = sizeof(DN_VALUED_ATTRS)/sizeof(DN_VALUED_ATTRS[0]);
-	static const char *URL_ATTRS[] = {
-		SLAPD_KEY_K_LDAP_URL,
-		SLAPD_KEY_USER_GROUP_LDAP_URL
-	};
-	static const int NURLS = sizeof(URL_ATTRS)/sizeof(URL_ATTRS[0]);
-
-	int ii;
-	for (ii = 0; _slapdInfo && (ii < N); ++ii)
-	{
-		const char *attr = DN_VALUED_ATTRS[ii];
-		char *dn = my_strdup(_slapdInfo->get(attr));
-		if (dn)
-		{
-			_slapdInfo->remove(attr);
-			_slapdInfo->set(attr, dn_normalize_convert(dn));
-			fflush(stdout);
-			delete [] dn;
-		}
-	}
-
-	for (ii = 0; _installInfo && (ii < NURLS); ++ii)
-	{
-		const char *attr = URL_ATTRS[ii];
-		const char *url = _installInfo->get(attr);
-		LDAPURLDesc *desc = 0;
-		if (url && !ldap_url_parse((char *)url, &desc) && desc)
-		{
-			char *dn = dn_normalize_convert(my_strdup(desc->lud_dn));
-			if (dn)
-			{
-				char port[6];
-				PR_snprintf(port, sizeof(port), "%d", desc->lud_port);
-				NSString newurl = NSString("ldap://") + desc->lud_host +
-					":" + port + "/" + dn;
-				_installInfo->set(attr, newurl);
-				delete [] dn;
-			}
-		}
-		if (desc)
-			ldap_free_urldesc(desc);
-	}
-}
diff --git a/ldap/cm/newinst/ux-config.h b/ldap/cm/newinst/ux-config.h
deleted file mode 100644
index 5fb55c28..00000000
--- a/ldap/cm/newinst/ux-config.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-/*********************************************************************
-**
-**
-** NAME:
-**   ux-config.h
-**
-** DESCRIPTION:
-**   Fedora Directory Server Pre-installation Program
-**
-** NOTES:
-**
-** HISTORY:
-** $Log: ux-config.h,v $
-** Revision 1.7  2006/11/10 23:44:40  nhosoi
-** Resolves: #214533
-** Summary: configure needs to support --with-fhs (Comment #6)
-** Changes: Added the following include next to the end of the copyright block.
-** +
-** +#ifdef HAVE_CONFIG_H
-** +#  include <config.h>
-** +#endif
-** +
-**
-** Revision 1.6  2005/04/19 22:07:21  nkinder
-** Fixed licensing typo
-**
-** Revision 1.5  2005/04/15 22:40:11  nkinder
-** 155068 - Added license to source files
-**
-** Revision 1.4  2005/03/25 02:09:16  nhosoi
-** [Bug 146919] Directory Server rebranding
-** 1) Brandx -> Fedora
-** 2) Pick up new internal component set (Admin SDK, Setup SDK, Admin Server)
-** 3) Use JRE from the Admin Server package
-** 4) Docs
-**   a) Componentize Docs
-**   b) Rebrand Docs
-**   c) Drop packaging Administration Guide in the external version
-**
-** Revision 1.3  2005/02/28 23:37:49  nkinder
-** 149951 - Updated source code copyrights
-**
-** Revision 1.2  2005/02/02 19:35:43  nhosoi
-** [146919] De-brand the Directory Server as "brandx"
-**
-** Revision 1.1.1.1  2005/01/21 00:40:49  cvsadm
-** Moving NSCP Directory Server from DirectoryBranch to TRUNK, initial drop. (foxworth)
-**
-** Revision 1.1.2.6.8.9  2005/01/14 01:22:10  nhosoi
-** For the open-source project.
-** 1) eliminated 'netsite' level
-** 2) moved ns/config one level lower
-** 3) moved fasttime to lib/base
-**
-** Revision 1.1.2.6.8.8  2003/09/22 19:38:51  ulfw
-** Update copyright years from 2001 to 2001-2003
-**
-** Revision 1.1.2.6.8.7  2001/11/02 23:32:56  richm
-** XXX use new copyright XXX
-**
-** Revision 1.1.2.6.8.6  2001/10/06 20:01:04  richm
-** ldapserver/ldap/cm/newinst/ux-config.h
-** 1.1.2.6.8.5
-** 20010918
-**
-** Remove copyright caracter form copyright
-**
-**
-** ====================================================
-**
-** Revision 1.1.2.6.8.5  2001/09/21 15:25:29  richm
-** rebrand to Netscape and change version to 6.0
-**
-** Revision 1.1.2.6.8.4  2001/02/13 09:40:08  rmarco
-** copyrights
-**
-** Revision 1.1.2.6.8.3  2000/08/22 10:07:32  elp
-** First bunch of branding fixes.
-** Replaced 'Netscape Directory Server' by 'iPlanet Directory Server'.
-**
-** Revision 1.1.2.6.8.2  2000/08/08 19:34:10  mwahl
-** ensure domainname is valid before beginning install
-**
-** Revision 1.1.2.6.8.1  1999/02/23 02:14:08  ggood
-** Merge changes made on server4_directory_branch after 4.0 RTM to DirectoryBranch
-**
-** Revision 1.1.2.7  1998/11/25 02:07:59  rweltman
-** Merging from DS 4.0 RTM into server4_directory_branch
-**
-** Revision 1.1.2.6.4.2  1998/11/06 21:33:15  richm
-** added normalizeDNs
-**
-** Revision 1.1.2.6.4.1  1998/10/15 18:23:05  richm
-** check for bogus admin domain
-**
-** Revision 1.1.2.6  1998/07/23 21:32:39  richm
-** allow re-installation into existing server root
-**
-** Revision 1.1.2.5  1998/06/15 23:52:08  richm
-** added support for user/group separation, better flow control, and support for AS 0611
-**
-** Revision 1.1.2.4  1997/12/17 21:10:19  richm
-** updated for minor 19971216 changes to admin setup sdk
-**
-** Revision 1.1.2.3  1997/12/06 01:43:18  richm
-** upgraded to latest changes from 12.03 admin
-**
-** Revision 1.1.2.2  1997/11/12 23:42:57  richm
-** updates for unix installer
-**
-** Revision 1.1.2.1  1997/11/04 01:57:53  richm
-** Kingpin UNIX installation modules
-**
-** Revision 1.1.2.4  1997/10/22 02:46:08  pvo
-** Removed restore().
-**
-** Revision 1.1.2.3  1997/10/01 17:24:11  pvo
-** Changed include path.
-**
-** Revision 1.1.2.2  1997/09/27 02:43:39  pvo
-** Check in.
-**
-**
-*********************************************************************/
-#include "dialog.h"
-#include "ux-util.h"
-extern const char *DEFAULT_SYSUSER;
-extern const char *DEFAULT_OLDROOT;
-
-
-class SlapdPreInstall:public DialogManager
-{
-public:
-
-	SlapdPreInstall(int, char **);
-	~SlapdPreInstall();
-
-    int init();
-
-    int  start();
-    void add (Dialog *);
-    void addLast(Dialog *);
-	void resetLast();
-    void clear();
-    int  cont();
-    void setParent(void *);
-    void *parent() const;
-
-	void setAdminScript(InstallInfo *script);
-	InstallInfo *getAdminScript() const;
-
-	InstallInfo *getBaseScript() const;
-
-	int verifyRemoteLdap(const char *host, const char *port, const char *suffix,
-						 const char *binddn, const char *binddnpwd) const;
-
-	int verifyAdminDomain(const char *host, const char *port, const char *suffix,
-						  const char *admin_domain,
-						  const char *binddn, const char *binddnpwd) const;
-
-	const char *getDNSDomain() const;
-	const char *getDefaultSuffix() const;
-	const char *getConsumerDN() const;
-	int featureIsEnabled(const char *which) const;
-
-	static void showAlert(const char *msg);
-
-private:
-
-   NSString        _serverRoot;
-
-   NSString        _infoFile;
-   InstallInfo     *_installInfo;
-   InstallInfo     *_slapdInfo;
-   InstallInfo     *_adminInfo;
-
-   NSString        _logFile;
-   InstallLog      *_installLog;
-
-   Bool _configured;
-   Bool _reconfig;
-
-
-   void getOptions(int argc, char **argv);
-   int initDefaultConfig();
-
-   void shutdownServers();
-
-   void normalizeDNs();
-};
-
-typedef SlapdPreInstall DialogManagerType;
-
-inline DialogManagerType*
-getManager(Dialog *me)
-{
-	return (DialogManagerType*)me->manager();
-}
-
diff --git a/ldap/cm/newinst/ux-dialog.cc b/ldap/cm/newinst/ux-dialog.cc
deleted file mode 100644
index a66b5939..00000000
--- a/ldap/cm/newinst/ux-dialog.cc
+++ /dev/null
@@ -1,4346 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-/*********************************************************************
-**
-** NAME:
-**   ux-dialog.cc
-**
-** DESCRIPTION:
-**   Netscape Directory Server Pre-installation Program
-**   Definitions for UI dialogs.
-**
-** NOTES:
-**
-**
-*********************************************************************/
-
-#if !defined(HPUX) || defined(_HP_NAMESPACE_STD)
-#include <iostream>
-#include <strstream>
-#include <fstream>
-using namespace std;
-using std::ostrstream;
-#else
-/* older HP-UX compiler, using libstd 1 (no -AA) */
-#include <iostream.h> /* use old name on older systems */
-#include <strstream.h>
-#include <fstream.h>
-#endif
-
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <string.h>
-#include <strings.h>
-#include "utf8.h"
-#include "ux-util.h"
-#include "dialog.h"
-#include "ux-dialog.h"
-#include "ux-config.h"
-#include "install_keywords.h"
-extern "C" {
-#include "dsalib.h"
-#include "nspr.h"
-#include "plstr.h"
-}
-
-static const char *DEFAULT_SLAPDUSER = "cn=Directory Manager";
-
-// #define DEBUG 2
-
-/*
-** Forward References
-*/
-
-static DialogAction askSlapdPortSetup (Dialog *me);
-static DialogAction askSlapdPortNext(Dialog *me);
-static DialogAction askSlapdServerIDSetup (Dialog *me);
-static DialogAction askSlapdServerIDNext(Dialog *me);
-static DialogAction askSlapdRootDNSetup(Dialog *me);
-static DialogAction askSlapdRootDNNext (Dialog *me);
-static DialogAction askMCAdminIDSetup (Dialog *me);
-static DialogAction askMCAdminIDNext (Dialog *me);
-static DialogAction askReconfigMCAdminPwdSetup (Dialog *me);
-static DialogAction askReconfigMCAdminPwdNext (Dialog *me);
-static DialogAction askSlapdSuffixSetup (Dialog *me);
-static DialogAction askSlapdSuffixNext (Dialog *me);
-static DialogAction askSampleSetup (Dialog *me);
-static DialogAction askSampleNext (Dialog *me);
-static DialogAction askPopulateSetup (Dialog *me);
-static DialogAction askPopulateNext (Dialog *me);
-static DialogAction askOrgSizeSetup (Dialog *me);
-static DialogAction askOrgSizeNext (Dialog *me);
-static DialogAction askCIRSetup(Dialog *me);
-static DialogAction askCIRNext(Dialog *me);
-static DialogAction askCIRHostSetup(Dialog *me);
-static DialogAction askCIRHostNext(Dialog *me);
-static DialogAction askCIRPortSetup(Dialog *me);
-static DialogAction askCIRPortNext(Dialog *me);
-static DialogAction askCIRDNSetup(Dialog *me);
-static DialogAction askCIRDNNext(Dialog *me);
-static DialogAction askCIRSuffixSetup(Dialog *me);
-static DialogAction askCIRSuffixNext(Dialog *me);
-static DialogAction askCIRSSLSetup(Dialog *me);
-static DialogAction askCIRSSLNext(Dialog *me);
-static DialogAction askCIRIntervalSetup(Dialog *me);
-static DialogAction askCIRIntervalNext(Dialog *me);
-static DialogAction askCIRDaysSetup(Dialog *me);
-static DialogAction askCIRDaysNext(Dialog *me);
-static DialogAction askCIRTimesSetup(Dialog *me);
-static DialogAction askCIRTimesNext(Dialog *me);
-static DialogAction askSIRSetup(Dialog *me);
-static DialogAction askSIRNext(Dialog *me);
-static DialogAction askChangeLogSuffixSetup(Dialog *me);
-static DialogAction askChangeLogSuffixNext(Dialog *me);
-static DialogAction askChangeLogDirSetup(Dialog *me);
-static DialogAction askChangeLogDirNext(Dialog *me);
-static DialogAction askReplicationDNSetup(Dialog *me);
-static DialogAction askReplicationDNNext(Dialog *me);
-static DialogAction askReplicationSetup(Dialog *me);
-static DialogAction askReplicationNext(Dialog *me);
-static DialogAction askConsumerDNSetup(Dialog *me);
-static DialogAction askConsumerDNNext(Dialog *me);
-static DialogAction askSIRHostSetup(Dialog *me);
-static DialogAction askSIRHostNext(Dialog *me);
-static DialogAction askSIRPortSetup(Dialog *me);
-static DialogAction askSIRPortNext(Dialog *me);
-static DialogAction askSIRDNSetup(Dialog *me);
-static DialogAction askSIRDNNext(Dialog *me);
-static DialogAction askSIRSuffixSetup(Dialog *me);
-static DialogAction askSIRSuffixNext(Dialog *me);
-static DialogAction askSIRSSLSetup(Dialog *me);
-static DialogAction askSIRSSLNext(Dialog *me);
-static DialogAction askSIRDaysSetup(Dialog *me);
-static DialogAction askSIRDaysNext(Dialog *me);
-static DialogAction askSIRTimesSetup(Dialog *me);
-static DialogAction askSIRTimesNext(Dialog *me);
-static DialogAction askUseExistingMCSetup(Dialog *me);
-static DialogAction askUseExistingMCNext(Dialog *me);
-static DialogAction askMCHostSetup(Dialog *me);
-static DialogAction askMCHostNext(Dialog *me);
-static DialogAction askMCPortSetup(Dialog *me);
-static DialogAction askMCPortNext(Dialog *me);
-static DialogAction askMCDNSetup(Dialog *me);
-static DialogAction askMCDNNext(Dialog *me);
-static DialogAction askDisableSchemaCheckingSetup(Dialog *me);
-static DialogAction askDisableSchemaCheckingNext(Dialog *me);
-static DialogAction askMCAdminDomainSetup(Dialog *me);
-static DialogAction askMCAdminDomainNext(Dialog *me);
-static DialogAction askAdminDomainSetup(Dialog *me);
-static DialogAction askAdminDomainNext(Dialog *me);
-static DialogAction askUseExistingUGSetup(Dialog *me);
-static DialogAction askUseExistingUGNext(Dialog *me);
-static DialogAction askUGHostSetup(Dialog *me);
-static DialogAction askUGHostNext(Dialog *me);
-static DialogAction askUGPortSetup(Dialog *me);
-static DialogAction askUGPortNext(Dialog *me);
-static DialogAction askUGDNSetup(Dialog *me);
-static DialogAction askUGDNNext(Dialog *me);
-static DialogAction askUGSuffixSetup(Dialog *me);
-static DialogAction askUGSuffixNext(Dialog *me);
-
-static int
-isAValidDN(const char *dn_to_test)
-{
-	int ret = 1;
-
-	if (!dn_to_test || !*dn_to_test)
-	{
-		ret = 0;
-	}
-	else
-	{
-		char **rdnList = ldap_explode_dn(dn_to_test, 0);
-		char **rdnNoTypes = ldap_explode_dn(dn_to_test, 1);
-		if (!rdnList || !rdnList[0] || !rdnNoTypes || !rdnNoTypes[0] ||
-			!*rdnNoTypes[0] || !strcasecmp(rdnList[0], rdnNoTypes[0]))
-		{
-			ret = 0;
-		}
-		if (rdnList)
-			ldap_value_free(rdnList);
-		if (rdnNoTypes)
-			ldap_value_free(rdnNoTypes);
-	}
-
-	if ((ret == 1) && ds_dn_uses_LDAPv2_quoting(dn_to_test))
-	{
-		char *newdn = strdup(dn_to_test);
-		dn_normalize_convert(newdn);
-		char *oldlocaldn = UTF8ToLocal(dn_to_test);
-		char *newlocaldn = UTF8ToLocal(newdn);
-		free(newdn);
-		NSString msg = NSString(
-			"The given value [") + oldlocaldn + "] is quoted in the deprecated LDAPv2 style\n" +
-			"quoting format.  It will be automatically converted to use the\n" +
-			"LDAPv3 style escaped format [" + newlocaldn + "].";
-		DialogManagerType::showAlert(msg);
-		nsSetupFree(oldlocaldn);
-		nsSetupFree(newlocaldn);
-	}
-
-	return ret;
-}
-
-static int
-contains8BitChars(const char *s)
-{
-    int ret = 0;
-
-    if (s && *s)
-    {
-		for (; !ret && *s; ++s)
-		{
-			ret = (*s & 0x80);
-		}
-    }
-
-    return ret;
-}
-
-static int
-rootDNPwdIsValid(const char *pwd)
-{
-	if (!pwd || !*pwd || (strlen(pwd) < 8))
-		return 0;
-
-	return !contains8BitChars(pwd);
-}
-
-static int
-isValid(const char *s)
-{
-	if (!s)
-		return 1; // null is a valid response (means to accept default)
-
-	int ret = 1;
-
-	char *ncs = (char *)s; // cast away const-ness for ldaputf8 stuff
-	// trim spaces from the beginning of the string
-	while (*ncs && ldap_utf8isspace(ncs))
-		LDAP_UTF8INC(ncs);
-
-	if (!*ncs) // empty string or all spaces
-		ret = 0;
-
-    return ret;
-}
-
-static int
-isValidServerID(const char *s)
-{
-	if (!s || !*s)
-		return 0;
-
-	if (!isValid(s))
-		return 0;
-
-	if (contains8BitChars(s))
-		return 0;
-
-	// server ID should contain alphanum, _, -, . since it will
-	// be used for both a filename and a DN component
-	const char *badChars = "`~!@#$%^&*()[]|\\\"\':;,+=/<>?";
-	const char *p = s;
-	for (; *p && !strchr(badChars, *p); ++p)
-		;
-
-	if (!*p) // the string contains all valid chars
-		return 1;
-
-	return 0;
-}
-
-static int
-isValidYesNo(const char *s)
-{
-	if (!s)
-		return 1; // null means accept default
-
-	const char *msg = 0;
-	if (isValid(s))
-	{
-		int len = strlen(s);
-		if (strncasecmp(s, "yes", len) && strncasecmp(s, "no", len))
-		{
-			msg = "Please type yes or no.";
-		}
-	}
-	else
-	{
-		msg = "Please specify a valid string.";
-	}
-
-	if (msg)
-	{
-		DialogManagerType::showAlert(msg);
-		return 0;
-	}
-
-	return 1;
-}
-
-static int
-dialogSetup (Dialog *me, const char *which, const char *defaultAns)
-{
-	const char *ans = getManager(me)->getDefaultScript()->get(which);
-	if (!ans)
-		ans = getManager(me)->getAdminScript()->get(which);
-	if (!ans)
-		ans = getManager(me)->getBaseScript()->get(which);
-	
-	int status;
-	if (ans == NULL)
-		status = 0;
-	else
-		status = 1;
-/*
-	int status = (int)ans; // 0 - there was already a value in the script
-						   // not zero - no value already in script
-*/
-	if (ans)
-		me->setDefaultAns(ans);
-	else if (defaultAns)
-		me->setDefaultAns(defaultAns);
-
-	return status;
-}
-
-DialogInput askSlapdPort(
-"The standard directory server network port number is 389.  However, if\n"
-"you are not logged as the superuser, or port 389 is in use, the\n"
-"default value will be a random unused port number greater than 1024.\n"
-"If you want to use port 389, make sure that you are logged in as the\n"
-"superuser, that port 389 is not in use, and that you run the admin\n"
-"server as the superuser.\n",
-
-"Directory server network port",
-
-NULL,
-
-askSlapdPortSetup,
-askSlapdPortNext
-);
-
-static DialogAction
-askSlapdPortSetup(Dialog *me)
-{
-#if DEBUG > 1
-	cerr << "Entering askSlapdPortSetup" << endl;
-#endif
-	char tmp[10];
-	int port = 389;
-	const char *defPort =
-		getManager(me)->getDefaultScript()->get(SLAPD_KEY_SERVER_PORT);
-
-	if (defPort && *defPort && atoi(defPort) > 0)
-	{
-		PL_strncpyz(tmp, defPort, sizeof(tmp));
-		port = atoi(defPort);
-	}
-	else
-		PR_snprintf(tmp, sizeof(tmp), "%d", port);
-
-	// see if default port is available
-	if (InstUtil::portAvailable(port) == False)
-	{
-		// start with a random port number, and keep going until we find
-		// an available port
-		int origport = port = InstUtil::guessPort();
-		while (InstUtil::portAvailable(port) == False)
-		{
-			++port;
-			if (port > MAXPORT)
-				port = MINPORT;
-			if (port == origport)
-			{
-				port = -1; // NO AVAILABLE PORTS!!!!!!!
-				break;
-			}
-		}
-	}
-
-	if (port == -1) // NO AVAILABLE PORTS!!!!!!!
-	{
-#if DEBUG > 1
-		cerr << "Leaving askSlapdPortSetup DIALOG_ERROR" << endl;
-#endif
-		return DIALOG_ERROR;
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SERVER_PORT, (long)port);
-
-	dialogSetup(me, SLAPD_KEY_SERVER_PORT, tmp);
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-	{
-#if DEBUG > 1
-		cerr << "Leaving askSlapdPortSetup DIALOG_NEXT" << endl;
-#endif
-		return DIALOG_NEXT;
-	}
-
-#if DEBUG > 1
-	cerr << "Leaving askSlapdPortSetup DIALOG_SAME" << endl;
-#endif
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSlapdPortNext(Dialog *me)
-{
-#if DEBUG > 1
-	cerr << "Entering askSlapdPortNext" << endl;
-#endif
-	const char *buf = me->input();
-	const char *tmp;
-	char testbuf[1024];
-	int port, err = 0;
-
-	if (buf[0] == 0)
-	{
-		tmp = me->defaultAns();
-	}
-	else
-	{
-		tmp = buf;
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SERVER_PORT, tmp);
-
-	port = atoi(tmp);
-	PR_snprintf(testbuf, sizeof(testbuf), "%d", port);
-	if (strncmp(testbuf, tmp, 6) || port > MAXPORT || port < 1)
-	{
-		PR_snprintf(testbuf, sizeof(testbuf), "OVERFLOW ERROR: Unable to bind to port %d\n"
-				"Please choose another port between 1 and %d.\n\n",
-				port, MAXPORT);
-		err = -1;
-	} 
-	else if (InstUtil::portAvailable(port) == False)
-	{
-		PR_snprintf(testbuf, sizeof(testbuf), "ERROR: Unable to bind to port %d\n"
-				"Please choose another port.\n\n", port);
-		err = -1;
-	}
-
-	if (err)
-	{
-		DialogManagerType::showAlert(testbuf);
-		return DIALOG_SAME;
-	}
-
-#if DEBUG > 1
-	cerr << "Leaving askSlapdPortNext" << endl;
-#endif
-	return DIALOG_NEXT;
-}
-
-DialogInput askSlapdServerID(
-"Each instance of a directory server requires a unique identifier.\n"
-"Press Enter to accept the default, or type in another name and press\n"
-"Enter.\n",
-
-"Directory server identifier",
-
-NULL,
-
-askSlapdServerIDSetup,
-askSlapdServerIDNext
-);
-
-static DialogAction
-askSlapdServerIDSetup(Dialog *me)
-{
-#if DEBUG > 1
-	cerr << "Entering askSlapdServerIDSetup" << endl;
-#endif
-	// extract the hostname part of the FQDN
-	const char *tmp = 0;
-	char *basehost = 0;
-	if ((tmp = getManager(me)->getBaseScript()->get(SLAPD_KEY_FULL_MACHINE_NAME))) {
-		basehost = strdup(tmp);
-	} else {
-		basehost = strdup(InstUtil::guessHostname());
-	}
-	if (!basehost)
-		return DIALOG_ERROR;
-	char *ptr = strchr(basehost, '.');
-	if (ptr)
-	{
-		*ptr = 0;
-	}
-	else
-	{
-		free(basehost);
-		basehost = 0;
-	}
-
-	const char *ans =
-		getManager(me)->getDefaultScript()->get(SLAPD_KEY_SERVER_IDENTIFIER);
-
-	if (!ans && basehost)
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_SERVER_IDENTIFIER,
-												basehost);
-	else if (!ans && !basehost)
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_SERVER_IDENTIFIER,
-												InstUtil::guessHostname());
-
-	if (ans)
-	{
-		me->setDefaultAns(ans);
-	}
-	else if (basehost)
-	{
-		me->setDefaultAns(basehost);
-	}
-	else
-	{
-		me->setDefaultAns(InstUtil::guessHostname());
-	}
-
-	if (basehost)
-		free(basehost);
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-	{
-#if DEBUG > 1
-		cerr << "Leaving askSlapdServerIDSetup DIALOG_SAME" << endl;
-#endif
-		return DIALOG_NEXT;
-	}
-
-#if DEBUG > 1
-	cerr << "Leaving askSlapdServerIDSetup DIALOG_SAME" << endl;
-#endif
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSlapdServerIDNext(Dialog *me)
-{
-	const char *buf = me->input();
-	const char *tmp;
-	char testbuf[1024];
-	int err = 0;
-
-	if (buf[0] == 0)
-	{
-		tmp = me->defaultAns();
-	}
-	else
-	{
-		tmp = buf;
-	}
-
-	if (!tmp)
-	{
-		err = -1;
-		PR_snprintf(testbuf, sizeof(testbuf), "The name must not be empty");
-	}
-	else if (!isValid(tmp))
-	{
-		err = -1;
-		PR_snprintf(testbuf, sizeof(testbuf), "Please specify a valid value for the name.");
-	}
-	else if (contains8BitChars(tmp))
-	{
-		err = -1;
-		PR_snprintf(testbuf, sizeof(testbuf), "The server ID must contain 7 bit ascii only.");
-	}
-	else if (!isValidServerID(tmp))
-	{
-		err = -1;
-		PR_snprintf(testbuf, sizeof(testbuf), "The server ID must be a valid filename and DN component.");
-	}
-
-	if (!err)
-	{
-		// see if an instance by the same name already exists
-
-		NSString instanceDir = NSString(
-			getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ROOT)
-			) + "/slapd-" + tmp;
-		if (InstUtil::fileExists(instanceDir))
-		{
-			PR_snprintf(testbuf, sizeof(testbuf), "ERROR: a server instance named [%s] already exists."
-					"  Please choose a unique name.\n", tmp);
-			err = -1;
-		}
-	}				   
-
-	if (tmp)
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_SERVER_IDENTIFIER, tmp);
-
-	if (err)
-	{
-		DialogManagerType::showAlert(testbuf);
-		return DIALOG_SAME;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askMCAdminID(
-"Please enter the administrator ID for the Fedora configuration\n"
-"directory server.  This is the ID typically used to log in to the\n"
-"console.  You will also be prompted for the password.\n",
-
-"Fedora configuration directory server\nadministrator ID",
-
-"admin",
-
-askMCAdminIDSetup,
-askMCAdminIDNext
-);
-
-static DialogAction
-askMCAdminIDSetup(Dialog *me)
-{
-#if DEBUG > 1
-	cerr << "Entering askMCAdminIDSetup" << endl;
-#endif
-	if (getManager(me)->getAdminScript() &&
-		getManager(me)->getAdminScript()->get(SLAPD_KEY_ADMIN_SERVER_ID) &&
-		getManager(me)->getAdminScript()->get(SLAPD_KEY_ADMIN_SERVER_PWD))
-	{
-		// see if the MC Admin ID has been provided
-		if (getManager(me)->getBaseScript() &&
-			!(getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ADMIN_ID) &&
-			  getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ADMIN_PWD)))
-		{
-			getManager(me)->getBaseScript()->set(
-				SLAPD_KEY_SERVER_ADMIN_ID,
-				getManager(me)->getAdminScript()->get(SLAPD_KEY_ADMIN_SERVER_ID)
-			);
-			getManager(me)->getBaseScript()->set(
-				SLAPD_KEY_SERVER_ADMIN_PWD,
-				getManager(me)->getAdminScript()->get(SLAPD_KEY_ADMIN_SERVER_PWD)
-			);
-		}
-	}
-
-	dialogSetup(me, SLAPD_KEY_SERVER_ADMIN_ID, "admin");
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-	{
-#if DEBUG > 1
-		cerr << "Leaving askMCAdminIDSetup setup DIALOG_NEXT" << endl;
-#endif
-		return DIALOG_NEXT;
-	}
-
-	// this dialog is only used for creating the MC Admin; don't use it if
-	// we will be using an existing MC i.e. we are not creating the MC host
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-	{
-#if DEBUG > 1
-		cerr << "Leaving askMCAdminIDSetup DIALOG_NEXT" << endl;
-#endif
-		return action;
-	}
-
-#if DEBUG > 1
-	cerr << "Leaving askMCAdminIDSetup DIALOG_SAME" << endl;
-#endif
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askMCAdminIDNext(Dialog *me)
-{
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return DIALOG_NEXT;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-	{
-#if DEBUG > 1
-		cerr << "Leaving askMCAdminIDNext setup DIALOG_NEXT" << endl;
-#endif
-		return DIALOG_NEXT;
-	}
-
-	const char *adminUser;
-	const char *adminPwd;
-	const char *buf;
-
-	buf = me->input();
-	if (buf[0] == 0)
-	{
-		adminUser = me->defaultAns();
-	}
-	else
-	{
-		adminUser = buf;
-	}
-
-	if (!isValid(adminUser))
-	{
-		DialogManagerType::showAlert("Please enter a valid ID.");
-		return DIALOG_SAME;
-	}
-	else if (!isAValidDN(adminUser) && contains8BitChars(adminUser))
-	{
-		DialogManagerType::showAlert("The user ID value must be 7 bit ASCII only.");
-		return DIALOG_SAME;
-	}
-
-	getManager(me)->getBaseScript()->set(SLAPD_KEY_SERVER_ADMIN_ID, adminUser);
-
-	while (1)
-	{
-//		cerr << "before password in askMCAdminIDNext" << endl;
-		me->showString("Password: ");
-//		cerr << "after password in askMCAdminIDNext" << endl;
-		if (me->getPassword () == 0)
-		{
-			return DIALOG_PREV;
-		}
-		else
-		{
-			char *inp = strdup(me->input());
-
-			if (inp[0] == 0)
-			{
-				continue;
-			}
-			else if (contains8BitChars(inp))
-			{
-				DialogManagerType::showAlert("Password must contain 7 bit characters only.");
-				return DIALOG_SAME;
-			}
-			else if (!isValid(inp))
-			{
-				DialogManagerType::showAlert("Please enter a valid password.");
-				return DIALOG_SAME;
-			}
-			else
-			{
-				me->showString("Password (again): ");
-				if (me->getPassword() == 0)
-				{
-					return DIALOG_PREV;
-				}
-				else
-				{
-					adminPwd = me->input();
-					if (strcmp(inp,adminPwd))
-					{
-						DialogManagerType::showAlert("Passwords don't match.");
-						return DIALOG_SAME;
-					}
-					break;
-				}
-			}
-			free(inp);
-		}
-	}
-	getManager(me)->getBaseScript()->set(SLAPD_KEY_SERVER_ADMIN_PWD, adminPwd);
-	return DIALOG_NEXT;
-}
-
-DialogInput askSlapdSuffix(
-"The suffix is the root of your directory tree.  You may have more than\n"
-"one suffix.\n",
-
-"Suffix",
-
-NULL,
-
-askSlapdSuffixSetup,
-askSlapdSuffixNext
-);
-
-static DialogAction
-askSlapdSuffixSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-		return action;
-
-	if (!getManager(me)->getDefaultScript()->get(SLAPD_KEY_SUFFIX)) {
-		getManager(me)->getDefaultScript()->set(
-			SLAPD_KEY_SUFFIX, getManager(me)->getDefaultSuffix());
-	}
-
-	dialogSetup(me, SLAPD_KEY_SUFFIX, getManager(me)->getDefaultSuffix());
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSlapdSuffixNext(Dialog *me)
-{
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SUFFIX, val);
-
-	// check the value to see if it is a valid DN
-	if (!isAValidDN(val))
-	{
-	 	DialogManagerType::showAlert("A suffix must be a valid DN.");
-		return DIALOG_SAME;
-	}
-	else if (!isValid(val))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-		return DIALOG_SAME;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askSlapdRootDN(
-"Certain directory server operations require an administrative user.\n"
-"This user is referred to as the Directory Manager and typically has a\n"
-"bind Distinguished Name (DN) of cn=Directory Manager.  Press Enter to\n"
-"accept the default value, or enter another DN.  In either case, you\n"
-"will be prompted for the password for this user.  The password must\n"
-"be at least 8 characters long.\n",
-
-"Directory Manager DN",
-
-DEFAULT_SLAPDUSER,
-
-askSlapdRootDNSetup,
-askSlapdRootDNNext
-);
-
-static DialogAction
-askSlapdRootDNSetup(Dialog *me)
-{
-	if (!getManager(me)->getDefaultScript()->get(SLAPD_KEY_ROOTDN))
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_ROOTDN,
-												DEFAULT_SLAPDUSER);
-
-	dialogSetup(me, SLAPD_KEY_ROOTDN, DEFAULT_SLAPDUSER);
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSlapdRootDNNext(Dialog *me)
-{
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-	{
-#if DEBUG > 1
-		cerr << "Leaving askSlapdRootDNNext setup DIALOG_NEXT" << endl;
-#endif
-		return DIALOG_NEXT;
-	}
-
-	const char *slapdUser;
-	const char *slapdPwd;
-	const char *buf;
-
-	buf = me->input();
-	if (buf[0] == 0)
-	{
-		slapdUser = me->defaultAns();
-	}
-	else
-	{
-		slapdUser = buf;
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_ROOTDN, slapdUser);
-
-	// check the value to see if it is a valid DN
-	if (!isAValidDN(slapdUser))
-	{
-	 	DialogManagerType::showAlert("The Directory Manager must be a valid DN.");
-	 	return DIALOG_SAME;
-	}
-	else if (!isValid(slapdUser))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-	 	return DIALOG_SAME;
-	}
-
-	while (1)
-	{
-//		cerr << "before password in askSlapdRootDNNext" << endl;
-		me->showString("Password: ");
-//		cerr << "after password in askSlapdRootDNNext" << endl;
-		if (me->getPassword () == 0)
-		{
-			return DIALOG_PREV;
-		}
-		else
-		{
-			char *inp = strdup(me->input());
-
-			if (inp[0] == 0)
-			{
-				continue;
-			}
-			else if (contains8BitChars(inp))
-			{
-				DialogManagerType::showAlert("Password must contain 7 bit characters only.");
-				return DIALOG_SAME;
-			}
-			else if (!isValid(inp))
-			{
-				DialogManagerType::showAlert("Please enter a valid password.");
-				return DIALOG_SAME;
-			}
-			else
-			{
-				me->showString("Password (again): ");
-				if (me->getPassword() == 0)
-				{
-					return DIALOG_PREV;
-				}
-				else
-				{
-					slapdPwd = me->input();
-					if (strcmp(inp,slapdPwd))
-					{
-						DialogManagerType::showAlert("Passwords don't match.");
-						return DIALOG_SAME;
-					}
-					else if (!rootDNPwdIsValid(inp))
-					{
-						DialogManagerType::showAlert("Password must be at least 8 characters long");
-						return DIALOG_SAME;
-					}
-					break;
-				}
-			}
-			free(inp);
-		}
-	}
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_ROOTDNPWD, slapdPwd);
-	return DIALOG_NEXT;
-}
-
-DialogYesNo askSample(
-"You may install some sample entries in this directory instance.  These\n"
-"entries will be installed in a separate suffix and will not interfere\n"
-"with the normal operation of the directory server.\n",
-
-"Do you want to install the sample entries?",
-
-"No",
-
-askSampleSetup,
-askSampleNext
-);
-
-static DialogAction
-askSampleSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER))
-		return action;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSampleNext(Dialog *me)
-{
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "No";
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_ADD_SAMPLE_ENTRIES, buf);
-
-	if (!isValidYesNo(buf))
-		return DIALOG_SAME;
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askPopulate(
-"You may wish to populate your new directory instance with some data.\n"
-"You may already have a file in LDIF format to use or some suggested\n"
-"entries can be added.  If you want to import entries from an LDIF\n"
-"file, you may type in the full path and filename at the prompt.  If\n"
-"you want the install program to add the suggested entries, type the\n"
-"word suggest at the prompt.  The suggested entries are common\n"
-"container entries under your specified suffix, such as ou=People and\n"
-"ou=Groups, which are commonly used to hold the entries for the persons\n"
-"and groups in your organization.  If you do not want to add any of\n"
-"these entries, type the word none at the prompt.\n",
-
-"Type the full path and filename, the word suggest, or the word none\n",
-
-"none",
-
-askPopulateSetup,
-askPopulateNext
-);
-
-static DialogAction
-askPopulateSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER))
-		return action;
-
-	// if setting up a UG host, by default setup the suggested entries
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-	{
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_INSTALL_LDIF_FILE,
-												"suggest");
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_ADD_ORG_ENTRIES,
-												"Yes");
-	}
-
-	dialogSetup(me, SLAPD_KEY_INSTALL_LDIF_FILE, "none");
-    // max input buffer size is sizeof(Dialog::_buf)-1
-    // Dialog::_buf is defined as char[MED_BUF]
-	me->setInputLen(MED_BUF-1); // it seems to get reset somewhere . . .
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askPopulateNext(Dialog *me)
-{
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER))
-		return DIALOG_NEXT;
-
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "No";
-	}
-
-	if (buf && !strncasecmp(buf, "none", strlen(buf)))
-	{
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_ADD_ORG_ENTRIES, "No");
-		getManager(me)->getDefaultScript()->
-			set(SLAPD_KEY_INSTALL_LDIF_FILE, "none");
-	}
-	else if (buf && !strncasecmp(buf, "suggest", strlen(buf)))
-	{
-		getManager(me)->getDefaultScript()->
-			set(SLAPD_KEY_INSTALL_LDIF_FILE, "suggest");
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_ADD_ORG_ENTRIES, "Yes");
-	} else {
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_INSTALL_LDIF_FILE, buf);
-		if (!InstUtil::fileExists(buf))
-		{
-			NSString msg = NSString("The specified filename ") + buf + "\n" +
-				"does not exist.  Please try again.\n";
-			DialogManagerType::showAlert(msg);
-			return DIALOG_SAME;
-		}
-		else
-		{
-			getManager(me)->getDefaultScript()->
-				set(SLAPD_KEY_ADD_ORG_ENTRIES, "Yes");
-			getManager(me)->getDefaultScript()->
-				set(SLAPD_KEY_INSTALL_LDIF_FILE, buf);
-		}
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askOrgSize(
-"Your directory will be populated with entries based on the size of\n"
-"your organization.  The choices are small or large.  Please specify 1\n"
-"for small and 2 for large.\n",
-
-"Organization size (1 or 2)",
-
-"1",
-
-askOrgSizeSetup,
-askOrgSizeNext
-);
-
-static DialogAction
-askOrgSizeSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER))
-		return action;
-
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_ADD_ORG_ENTRIES))
-		return action;
-	else if (dialogSetup(me, SLAPD_KEY_ORG_SIZE, "1") &&
-			 getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askOrgSizeNext(Dialog *me)
-{
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER))
-		return DIALOG_NEXT;
-
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_ADD_ORG_ENTRIES))
-		return DIALOG_NEXT;
-	
-   const char *buf = me->input();
-   const char *tmp;
-   char testbuf[1024];
-   int num, err = 0;
-
-   if (buf[0] == 0)
-   {
-      tmp = me->defaultAns();
-   }
-   else
-   {
-      tmp = buf;
-   }
-
-   getManager(me)->getDefaultScript()->set(SLAPD_KEY_ORG_SIZE, tmp);
-
-   num = atoi(tmp);
-   if (num != 1 && num != 2)
-   {
-	   PR_snprintf(testbuf, sizeof(testbuf), "Please enter a 1 or a 2\n\n");
-	   err = -1;
-   }
-
-   if (err)
-   {
-      DialogManagerType::showAlert(testbuf);
-      return DIALOG_SAME;
-   }
-
-   return DIALOG_NEXT;
-}
-
-DialogYesNo askReplication(
-"Replication is used to duplicate all or part of a directory server to\n"
-"another directory server.  This can be used for failsafe purposes, to\n"
-"ensure that the directory data is always online and up-to-date in case\n"
-"one server goes down.  It is also useful for distributing directory\n"
-"data from a central main repository to remote directory servers.\n",
-
-"Do you want to configure this directory server\nto use replication?",
-
-"No",
-
-askReplicationSetup,
-askReplicationNext
-);
-
-static DialogAction
-askReplicationSetup(Dialog *me)
-{
-	me = me;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askReplicationNext(Dialog *me)
-{
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "No";
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_USE_REPLICATION, buf);
-
-	if (!isValidYesNo(buf))
-		return DIALOG_SAME;
-
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_REPLICATION))
-	{
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_SETUP_SUPPLIER, "No");
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_SETUP_CONSUMER, "No");
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogYesNo askCIR(
-"You may want to set up your directory server as a consumer server to\n"
-"receive replicated entries from another directory server.  The first\n"
-"two of the following methods configure this server as a consumer:\n\n"
-"1) The supplier server will push its entries to this server (SIR)\n"
-"2) This server will pull the entries from the supplier (CIR)\n"
-"3) This server will not be a consumer for replication (NONE)\n",
-
-"Do you want to set up this server as a consumer\n"
-"for replication? (1, 2, or 3)",
-
-"3",
-
-askCIRSetup,
-askCIRNext
-);
-
-static DialogAction
-askCIRSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_REPLICATION))
-		return action;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askCIRNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_REPLICATION))
-		return DIALOG_NEXT;
-
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "3";
-	}
-
-	int val = atoi(buf);
-	if (!val || val < 1 || val > 3)
-	{
-	   DialogManagerType::showAlert("Please enter a 1, 2, or 3.");
-	   return DIALOG_SAME;
-	}
-	else if (val == 3)
-	{
-		buf = "No";
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SETUP_CONSUMER, buf);
-
-	return DIALOG_NEXT;
-}
-
-DialogYesNo askSIR(
-"You may want to set up your directory server as a supplier server to\n"
-"replicate its entries to another directory server.  The first two of\n"
-"the following methods configure this server as a supplier:\n\n"
-"1) This server will push its entries to another one (SIR)\n"
-"2) Another server will pull entries from this one (CIR)\n"
-"3) This server will not be a supplier for replication (NONE)\n",
-
-"Do you want to set up this server as a supplier\n"
-"for replication? (1, 2, or 3)",
-
-"3",
-
-askSIRSetup,
-askSIRNext
-);
-
-static DialogAction
-askSIRSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_REPLICATION))
-		return action;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSIRNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_REPLICATION))
-		return DIALOG_NEXT;
-
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "3";
-	}
-
-	int val = atoi(buf);
-	if (!val || val < 1 || val > 3)
-	{
-	   DialogManagerType::showAlert("Please enter a 1, 2, or 3.");
-	   return DIALOG_SAME;
-	}
-	else if (val == 3)
-	{
-		buf = "No";
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SETUP_SUPPLIER, buf);
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askCIRHost(
-"Please specify the host name of the server from which the replicated\n"
-"entries will be copied.\n",
-
-"Supplier host name",
-
-0,
-
-askCIRHostSetup,
-askCIRHostNext
-);
-
-static DialogAction
-askCIRHostSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return action;
-	else if (dialogSetup(me, SLAPD_KEY_CIR_HOST, 0) &&
-			 getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askCIRHostNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return DIALOG_NEXT;
-	
-   const char *buf = me->input();
-   const char *tmp;
-
-   if (buf[0] == 0)
-   {
-      tmp = me->defaultAns();
-   }
-   else
-   {
-      tmp = buf;
-   }
-
-   getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_HOST, tmp);
-
-   if (!tmp || !isValid(tmp))
-   {
-	   DialogManagerType::showAlert("Please enter a valid hostname");
-	   return DIALOG_SAME;
-   }
-
-   return DIALOG_NEXT;
-}
-
-DialogInput askCIRPort(
-"Please specify the port of the server from which the replicated\n"
-"entries will be copied.\n",
-
-"Supplier port",
-
-"389",
-
-askCIRPortSetup,
-askCIRPortNext
-);
-
-static DialogAction
-askCIRPortSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return action;
-
-	const char *defaultPort = "389";
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_CIR_SECURITY_ON))
-		defaultPort = "636";
-
-	if (dialogSetup(me, SLAPD_KEY_CIR_PORT, defaultPort) &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askCIRPortNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return DIALOG_NEXT;
-
-   const char *buf = me->input();
-   const char *tmp;
-   char testbuf[1024];
-   int port, err = 0;
-
-   if (buf[0] == 0)
-   {
-      tmp = me->defaultAns();
-   }
-   else
-   {
-      tmp = buf;
-   }
-
-   getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_PORT, tmp);
-
-   port = atoi(tmp);
-   PR_snprintf(testbuf, sizeof(testbuf), "%d", port);
-   if (strncmp(testbuf, tmp, 6) || port > MAXPORT || port < 1)
-   {
-      PR_snprintf(testbuf, sizeof(testbuf), "OVERFLOW ERROR: Unable to bind to port %d\n"
-                 "Please choose another port between 1 and %d.\n\n",
-                   port, MAXPORT);
-      err = -1;
-   } 
-
-   if (err)
-   {
-      DialogManagerType::showAlert(testbuf);
-      return DIALOG_SAME;
-   }
-
-   return DIALOG_NEXT;
-}
-
-DialogInput askCIRDN(
-"Replication requires that this consumer has access to the portion of\n"
-"the remote directory to be replicated.  This requires a bind DN and\n"
-"password for access to the supplier.  You will first be asked for the\n"
-"bind DN, then the password.\n",
-
-"Replication DN",
-
-NULL,
-
-askCIRDNSetup,
-askCIRDNNext
-);
-
-static DialogAction
-askCIRDNSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return action;
-
-	if (dialogSetup(me, SLAPD_KEY_CIR_BINDDN, getManager(me)->getConsumerDN()) &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askCIRDNNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return DIALOG_NEXT;
-
-	const char *slapdUser;
-	char *slapdPwd = 0;
-	const char *buf;
-
-	buf = me->input();
-	if (buf[0] == 0)
-	{
-		slapdUser = me->defaultAns();
-	}
-	else
-	{
-		slapdUser = buf;
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_BINDDN, slapdUser);
-
-	// check to see if it is a valid DN
-	if (!isAValidDN(slapdUser))
-	{
-	 	DialogManagerType::showAlert("The consumer must be a valid DN.");
-	 	return DIALOG_SAME;
-	}
-	else if (!isValid(slapdUser))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-	 	return DIALOG_SAME;
-	}
-
-	while (1)
-	{
-		me->showString("Password: ");
-		if (me->getPassword () == 0)
-		{
-			return DIALOG_PREV;
-		}
-		else
-		{
-			char *inp = strdup(me->input());
-
-			if (inp[0] == 0)
-			{
-				free(inp);
-				continue;
-			}
-			else
-			{
-				slapdPwd = inp;
-				break;
-			}
-		}
-	}
-
-	if (slapdPwd)
-	{
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_BINDDNPWD, slapdPwd);
-		free(slapdPwd);
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askCIRSuffix(
-"Please enter the full DN of the part of the tree to replicate,\n"
-"including the suffix (e.g. ou=People, o=company.com).\n",
-
-"Enter the directory path",
-
-NULL,
-
-askCIRSuffixSetup,
-askCIRSuffixNext
-);
-
-static DialogAction
-askCIRSuffixSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return action;
-	
-	if (dialogSetup(me, SLAPD_KEY_CIR_SUFFIX, getManager(me)->getDefaultSuffix()) &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askCIRSuffixNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return DIALOG_NEXT;
-	
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_SUFFIX, val);
-
-	// check val to see if it is a valid DN
-	if (!isAValidDN(val))
-	{
-	 	DialogManagerType::showAlert("The suffix must be a valid DN.");
-	 	return DIALOG_SAME;
-	}
-	if (!isValid(val))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-	 	return DIALOG_SAME;
-	}
-
-	int status;
-	if ((status = getManager(me)->verifyRemoteLdap(
-								  SLAPD_KEY_CIR_HOST,
-								  SLAPD_KEY_CIR_PORT,
-								  SLAPD_KEY_CIR_SUFFIX,
-								  SLAPD_KEY_CIR_BINDDN,
-								  SLAPD_KEY_CIR_BINDDNPWD
-								  ))
-	   )
-	{
-		ostrstream msg;
-		msg << "Could not connect to ldap://"
-			<< getManager(me)->getDefaultScript()->get(SLAPD_KEY_CIR_HOST)
-			<< ":"
-			<< getManager(me)->getDefaultScript()->get(SLAPD_KEY_CIR_PORT)
-			<< "/"
-			<< getManager(me)->getDefaultScript()->get(SLAPD_KEY_CIR_SUFFIX)
-			<< endl << "for bind DN "
-			<< getManager(me)->getDefaultScript()->get(SLAPD_KEY_CIR_BINDDN)
-			<< " status = " << status << endl
-			<< "Please check your typing.  If you have mis-typed, you can backup"
-			<< endl
-			<< "and retype.  Otherwise, the remote server may be down at this time."
-			<< endl
-			<< "The replication agreement will be created anyway.  Proceeding..."
-			<< endl << ends;
-		DialogManagerType::showAlert(msg.str());
-		delete [] msg.str();
-		return DIALOG_NEXT;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogYesNo askCIRSSL(
-"You may use SSL authentication for replication if you have enabled it\n"
-"on the remote server.\n",
-
-"Do you want to use SSL?",
-
-"No",
-
-askCIRSSLSetup,
-askCIRSSLNext
-);
-
-static DialogAction
-askCIRSSLSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return action;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askCIRSSLNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return DIALOG_NEXT;
-	
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "No";
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_SECURITY_ON, buf);
-
-	if (!isValidYesNo(buf))
-		return DIALOG_SAME;
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askCIRInterval(
-"Please specify the time interval to check the remote server for new\n"
-"entries to be replicated.  Use the directory server console to set up\n"
-"more fine-grained control.  Specify the time in minutes.  Use a 0\n"
-"(zero) to indicate that changes should be propagated immediately all\n"
-"the time.\n",
-
-"Replication Sync Interval (in minutes)",
-
-"10",
-
-askCIRIntervalSetup,
-askCIRIntervalNext
-);
-
-static DialogAction
-askCIRIntervalSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return action;
-
-	if (dialogSetup(me, SLAPD_KEY_CIR_INTERVAL, "10") &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askCIRIntervalNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return DIALOG_NEXT;
-	
-	const char *buf = me->input();
-	const char *tmp;
-	char testbuf[1024];
-	int interval, err = 0;
-	
-	if (buf[0] == 0)
-	{
-		tmp = me->defaultAns();
-	}
-	else
-	{
-		tmp = buf;
-	}
-	
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_INTERVAL, tmp);
-	
-	interval = atoi(tmp);
-	if (!isdigit((*tmp)) || interval < 0)
-	{
-		PR_snprintf(testbuf, sizeof(testbuf), "Please specify an integer greater than or equal to 0");
-		err = -1;
-	} 
-	
-	if (err)
-	{
-		DialogManagerType::showAlert(testbuf);
-		return DIALOG_SAME;
-	}
-	
-	return DIALOG_NEXT;
-}
-
-DialogInput askChangeLogSuffix(
-"Changes to the database will be kept under a separate suffix in the\n"
-"directory tree.  These changes are used to replicate changes to other\n"
-"directory servers.\n",
-
-"Changelog suffix",
-
-"cn=changelog",
-
-askChangeLogSuffixSetup,
-askChangeLogSuffixNext
-);
-
-static DialogAction
-askChangeLogSuffixSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER))
-		return action;
-	
-	if (dialogSetup(me, SLAPD_KEY_CHANGELOGSUFFIX, "cn=changelog") &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askChangeLogSuffixNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER))
-		return DIALOG_NEXT;
-	
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CHANGELOGSUFFIX, val);
-
-	// check to see if val is a valid DN
-	if (!isAValidDN(val))
-	{
-	 	DialogManagerType::showAlert("The ChangeLog suffix must be a valid DN");
-	 	return DIALOG_SAME;
-	}
-	else if (!isValid(val))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-	 	return DIALOG_SAME;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askChangeLogDir(
-"Changes to the main database will be kept in a separate database\n"
-"stored in a separate directory path, usually under your server\n"
-"instance directory.\n",
-
-"Changelog database\n"
-"directory",
-
-NULL,
-
-askChangeLogDirSetup,
-askChangeLogDirNext
-);
-
-static DialogAction
-askChangeLogDirSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER))
-		return action;
-	
-	NSString dir = NSString(
-		getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ROOT)
-		) + "/slapd-" +
-		getManager(me)->getDefaultScript()->get(SLAPD_KEY_SERVER_IDENTIFIER) +
-		"/logs/changelogdb";
-	if (dialogSetup(me, SLAPD_KEY_CHANGELOGDIR, dir) &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askChangeLogDirNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER))
-		return DIALOG_NEXT;
-	
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CHANGELOGDIR, val);
-
-	if (InstUtil::dirExists(val) && !InstUtil::dirWritable(val))
-	{
-		DialogManagerType::showAlert("You do not have access to that directory.  Please try again.");
-		return DIALOG_SAME;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askReplicationDN(
-"In order to allow remote servers to replicate new entries to this\n"
-"server, the remote server must have the ability to bind to this server\n"
-"as some entity with permission to do so.  The Supplier DN is the DN of\n"
-"the entity the remote server will use to connect to this server to\n"
-"supply updates.  The Supplier DN also requires a password which you\n"
-"will be prompted for after the DN.\n",
-
-"Supplier Bind DN",
-
-"cn=supplier",
-
-askReplicationDNSetup,
-askReplicationDNNext
-);
-
-static DialogAction
-askReplicationDNSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "1"))
-		return action;
-	
-	if (dialogSetup(me, SLAPD_KEY_REPLICATIONDN, "cn=supplier") &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askReplicationDNNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "1"))
-		return DIALOG_NEXT;
-	
-	const char *replicationdn;
-	const char *replicationpw;
-	const char *buf;
-
-	buf = me->input();
-	if (buf[0] == 0)
-	{
-		replicationdn = me->defaultAns();
-	}
-	else
-	{
-		replicationdn = buf;
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_REPLICATIONDN, replicationdn);
-
-	// check to see if it is a valid DN
-	if (!isAValidDN(replicationdn))
-	{
-	 	DialogManagerType::showAlert("The Supplier Bind DN must be a valid DN");
-	 	return DIALOG_SAME;
-	}
-	if (!isValid(replicationdn))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-	 	return DIALOG_SAME;
-	}
-
-	while (1)
-	{
-		me->showString("Password: ");
-		if (me->getPassword () == 0)
-		{
-			return DIALOG_PREV;
-		}
-		else
-		{
-			char *inp = strdup(me->input());
-
-			if (inp[0] == 0)
-			{
-				continue;
-			}
-			else if (contains8BitChars(inp))
-			{
-				DialogManagerType::showAlert("Password must contain 7 bit characters only.");
-				return DIALOG_SAME;
-			}
-			else if (!isValid(inp))
-			{
-				DialogManagerType::showAlert("Please enter a valid password.");
-				return DIALOG_SAME;
-			}
-			else
-			{
-				me->showString("Password (again): ");
-				if (me->getPassword() == 0)
-				{
-					return DIALOG_PREV;
-				}
-				else
-				{
-					replicationpw = me->input();
-					if (strcmp(inp,replicationpw))
-					{
-						DialogManagerType::showAlert("Passwords don't match.");
-						return DIALOG_SAME;
-					}
-					break;
-				}
-			}
-			free(inp);
-		}
-	}
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_REPLICATIONPWD, replicationpw);
-	return DIALOG_NEXT;
-}
-
-DialogInput askConsumerDN(
-"In order to allow remote servers to replicate new entries from this\n"
-"server, the remote server must have the ability to bind to this server\n"
-"as some entity with permission to do so.  The Consumer DN is the DN of\n"
-"the entity the remote server will use to connect to this server to\n"
-"pull the new entries.  This entity will have access to the entire\n"
-"database as well as the changelog entries.  The Consumer DN also\n"
-"requires a password which you will be prompted for after the DN.  If\n"
-"you leave this entry blank, no consumer bind DN will be created.  The\n"
-"default is no consumer bind DN.\n",
-
-"Consumer Bind DN",
-
-NULL,
-
-askConsumerDNSetup,
-askConsumerDNNext
-);
-
-static DialogAction
-askConsumerDNSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "2"))
-		return action;
-	
-	if (dialogSetup(me, SLAPD_KEY_CONSUMERDN, 0) &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askConsumerDNNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "2"))
-		return DIALOG_NEXT;
-	
-	const char *consumerdn;
-	const char *consumerpw;
-	const char *buf;
-
-	buf = me->input();
-	if (buf[0] == 0)
-	{
-		consumerdn = me->defaultAns();
-	}
-	else
-	{
-		consumerdn = buf;
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CONSUMERDN, consumerdn);
-
-	if (!consumerdn || !*consumerdn ||
-		!strncasecmp(consumerdn, "none", strlen(consumerdn)))
-	{
-		getManager(me)->getDefaultScript()->remove(SLAPD_KEY_CONSUMERDN);
-		return DIALOG_NEXT;
-	}
-
-	// check to see if it is a valid dn
-	if (!isAValidDN(consumerdn))
-	{
-	 	DialogManagerType::showAlert("The Consumer Bind DN must be a valid DN");
-	 	return DIALOG_SAME;
-	}
-	else if (!isValid(consumerdn))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-	 	return DIALOG_SAME;
-	}
-
-	while (1)
-	{
-		me->showString("Password: ");
-		if (me->getPassword () == 0)
-		{
-			return DIALOG_PREV;
-		}
-		else
-		{
-			char *inp = strdup(me->input());
-
-			if (inp[0] == 0)
-			{
-				continue;
-			}
-			else if (contains8BitChars(inp))
-			{
-				DialogManagerType::showAlert("Password must contain 7 bit characters only.");
-				return DIALOG_SAME;
-			}
-			else if (!isValid(inp))
-			{
-				DialogManagerType::showAlert("Please enter a valid password.");
-				return DIALOG_SAME;
-			}
-			else
-			{
-				me->showString("Password (again): ");
-				if (me->getPassword() == 0)
-				{
-					return DIALOG_PREV;
-				}
-				else
-				{
-					consumerpw = me->input();
-					if (strcmp(inp,consumerpw))
-					{
-						DialogManagerType::showAlert("Passwords don't match.");
-						return DIALOG_SAME;
-					}
-					break;
-				}
-			}
-			free(inp);
-		}
-	}
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CONSUMERPWD, consumerpw);
-	return DIALOG_NEXT;
-}
-
-DialogInput askSIRHost(
-"Please specify the host name of the server to which the replicated\n"
-"entries will be pushed.\n",
-
-"Consumer host name",
-
-0,
-
-askSIRHostSetup,
-askSIRHostNext
-);
-
-static DialogAction
-askSIRHostSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return action;
-	else if (dialogSetup(me, SLAPD_KEY_SIR_HOST, 0) &&
-			 getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSIRHostNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return DIALOG_NEXT;
-	
-   const char *buf = me->input();
-   const char *tmp;
-
-   if (buf[0] == 0)
-   {
-      tmp = me->defaultAns();
-   }
-   else
-   {
-      tmp = buf;
-   }
-
-   getManager(me)->getDefaultScript()->set(SLAPD_KEY_SIR_HOST, tmp);
-
-   if (!tmp || !isValid(tmp))
-   {
-	   DialogManagerType::showAlert("Please enter a valid hostname");
-	   return DIALOG_SAME;
-   }
-
-   return DIALOG_NEXT;
-}
-
-DialogInput askSIRPort(
-"Please specify the port of the server to which the replicated entries\n"
-"will be pushed.\n",
-
-"Consumer port",
-
-"389",
-
-askSIRPortSetup,
-askSIRPortNext
-);
-
-static DialogAction
-askSIRPortSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return action;
-
-	const char *defaultPort = "389";
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_SIR_SECURITY_ON))
-		defaultPort = "636";
-
-	if (dialogSetup(me, SLAPD_KEY_SIR_PORT, defaultPort) &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSIRPortNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return DIALOG_NEXT;
-
-   const char *buf = me->input();
-   const char *tmp;
-   char testbuf[1024];
-   int port, err = 0;
-
-   if (buf[0] == 0)
-   {
-      tmp = me->defaultAns();
-   }
-   else
-   {
-      tmp = buf;
-   }
-
-   getManager(me)->getDefaultScript()->set(SLAPD_KEY_SIR_PORT, tmp);
-
-   port = atoi(tmp);
-   PR_snprintf(testbuf, sizeof(testbuf), "%d", port);
-   if (strncmp(testbuf, tmp, 6) || port > MAXPORT || port < 1)
-   {
-      PR_snprintf(testbuf, sizeof(testbuf), "OVERFLOW ERROR: Unable to bind to port %d\n"
-                 "Please choose another port between 1 and %d.\n\n",
-                   port, MAXPORT);
-      err = -1;
-   } 
-
-   if (err)
-   {
-      DialogManagerType::showAlert(testbuf);
-      return DIALOG_SAME;
-   }
-
-   return DIALOG_NEXT;
-}
-
-DialogInput askSIRDN(
-"Replication requires that this supplier has access to the portion of\n"
-"the remote directory to be replicated.  This requires a bind DN and\n"
-"password for access to the consumer.  You will first be asked for the\n"
-"bind DN, then the password.  This is the same as the Supplier DN on\n"
-"the consumer.\n",
-
-"Replication DN on the Consumer",
-
-"cn=supplier",
-
-askSIRDNSetup,
-askSIRDNNext
-);
-
-static DialogAction
-askSIRDNSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return action;
-
-	if (dialogSetup(me, SLAPD_KEY_SIR_BINDDN, "cn=supplier") &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSIRDNNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return DIALOG_NEXT;
-
-	const char *slapdUser;
-	char *slapdPwd = 0;
-	const char *buf;
-
-	buf = me->input();
-	if (buf[0] == 0)
-	{
-		slapdUser = me->defaultAns();
-	}
-	else
-	{
-		slapdUser = buf;
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SIR_BINDDN, slapdUser);
-
-	// check to see if it is a valid dn
-	if (!isAValidDN(slapdUser))
-	{
-	 	DialogManagerType::showAlert("The Consumer Replication DN must be a valid DN");
-	 	return DIALOG_SAME;
-	}
-	else if (!isValid(slapdUser))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-	 	return DIALOG_SAME;
-	}
-
-	while (1)
-	{
-		me->showString("Password: ");
-		if (me->getPassword () == 0)
-		{
-			return DIALOG_PREV;
-		}
-		else
-		{
-			char *inp = strdup(me->input());
-
-			if (inp[0] == 0)
-			{
-				free(inp);
-				continue;
-			}
-			else
-			{
-				slapdPwd = inp;
-				break;
-			}
-		}
-	}
-
-	if (slapdPwd)
-	{
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_SIR_BINDDNPWD, slapdPwd);
-		free(slapdPwd);
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askSIRSuffix(
-"Please enter the full DN of the part of the tree to replicate,\n"
-"including the suffix (e.g. ou=People, o=company.com).\n",
-
-"Directory path (DN)",
-
-NULL,
-
-askSIRSuffixSetup,
-askSIRSuffixNext
-);
-
-static DialogAction
-askSIRSuffixSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return action;
-
-	if (dialogSetup(me, SLAPD_KEY_SIR_SUFFIX, getManager(me)->getDefaultSuffix()) &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSIRSuffixNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return DIALOG_NEXT;
-
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SIR_SUFFIX, val);
-
-	// check to see if it is a valid dn
-	if (!isAValidDN(val))
-	{
-	 	DialogManagerType::showAlert("The suffix must be a valid DN");
-	 	return DIALOG_SAME;
-	}
-	else if (!isValid(val))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-	 	return DIALOG_SAME;
-	}
-
-	int status;
-	if ((status = getManager(me)->verifyRemoteLdap(
-								  SLAPD_KEY_SIR_HOST,
-								  SLAPD_KEY_SIR_PORT,
-								  SLAPD_KEY_SIR_SUFFIX,
-								  SLAPD_KEY_SIR_BINDDN,
-								  SLAPD_KEY_SIR_BINDDNPWD
-								  ))
-	   )
-	{
-		ostrstream msg;
-		msg << "Could not connect to ldap://"
-			<< getManager(me)->getDefaultScript()->get(SLAPD_KEY_SIR_HOST)
-			<< ":"
-			<< getManager(me)->getDefaultScript()->get(SLAPD_KEY_SIR_PORT)
-			<< "/"
-			<< getManager(me)->getDefaultScript()->get(SLAPD_KEY_SIR_SUFFIX)
-			<< endl << "for bind DN "
-			<< getManager(me)->getDefaultScript()->get(SLAPD_KEY_SIR_BINDDN)
-			<< " status = " << status << endl
-			<< "Please check your typing.  If you have mis-typed, you can backup"
-			<< endl
-			<< "and retype.  Otherwise, the remote server may be down at this time."
-			<< endl
-			<< "The replication agreement will be created anyway.  Proceeding..."
-			<< endl << ends;
-		DialogManagerType::showAlert(msg.str());
-		delete [] msg.str();
-		return DIALOG_NEXT;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogYesNo askSIRSSL(
-"You may use SSL authentication for replication if you have enabled it\n"
-"on the remote server.\n",
-
-"Do you want to use SSL?",
-
-"No",
-
-askSIRSSLSetup,
-askSIRSSLNext
-);
-
-static DialogAction
-askSIRSSLSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return action;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSIRSSLNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return DIALOG_NEXT;
-	
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "No";
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SIR_SECURITY_ON, buf);
-
-	if (!isValidYesNo(buf))
-		return DIALOG_SAME;
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askCIRDays(
-"Please enter the days of the week on which you would like replication\n"
-"to occur.  The days are specified by a number.  For example, use 0 for\n"
-"Sunday, 1 for Monday, etc.  Use 6 for Saturday.  You may not specify a\n"
-"number greater than 6 or less than 0.  The numbers should be entered\n"
-"one after another in a list.  For example, 0123 would be Sunday,\n"
-"Monday, Tuesday, and Wednesday.  06 would be Sunday and Saturday.  The\n"
-"default is everyday.\n",
-
-"Enter the replication days",
-
-"all",
-
-askCIRDaysSetup,
-askCIRDaysNext
-);
-
-static DialogAction
-askCIRDaysSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return action;
-
-	if (dialogSetup(me, SLAPD_KEY_CIR_DAYS, "all") &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	const char *tmp;
-	if ((tmp = getManager(me)->getDefaultScript()->get(SLAPD_KEY_SIR_DAYS)) &&
-		!*tmp)
-		me->setDefaultAns("all");
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askCIRDaysNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return DIALOG_NEXT;
-
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_DAYS, val);
-
-	int status = 0;
-	ostrstream msg;
-
-	char realval[8] = "-------";
-	if (!strncasecmp(val, "all", strlen(val)))
-		strcpy(realval, ""); // default is everyday
-	else
-	{
-		for (const char *ptr = val; *ptr; ++ptr)
-		{
-			if (!isdigit(*ptr))
-			{
-				msg << "The string [" << val << "] contains non-digit characters."
-					<< "  Please re enter the string." << ends;
-				status = 1;
-				break;
-			}
-
-			int ival = (int)(*ptr) - (int)'0';
-			if (ival > 6)
-			{
-				msg << "The string contains an invalid value [" << ival << "]."
-					<< "  Please re enter the string." << ends;
-				status = 2;
-				break;
-			}
-
-			// this step makes sure we get the numbers in order with no duplicates
-			realval[ival] = *ptr;
-		}
-
-		if (status)
-		{
-			DialogManagerType::showAlert(msg.str());
-			delete [] msg.str();
-			return DIALOG_SAME;
-		}
-
-		// realval now contains a string like
-		// 0---4-6, but we really want 046
-		int index = 0;
-		for (char *p2 = realval; *p2; ++p2)
-		{
-			if (*p2 != '-')
-				realval[index++] = *p2;
-		}
-		realval[index] = 0;
-
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_DAYS, realval);
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askSIRDays(
-"Please enter the days of the week on which you would like replication\n"
-"to occur.  The days are specified by a number.  For example, use 0 for\n"
-"Sunday, 1 for Monday, etc.  Use 6 for Saturday.  You may not specify a\n"
-"number greater than 6 or less than 0.  The numbers should be entered\n"
-"one after another in a list.  For example, 0123 would be Sunday,\n"
-"Monday, Tuesday, and Wednesday.  06 would be Sunday and Saturday.  The\n"
-"default is everyday.\n",
-
-"Enter the replication days",
-
-"all",
-
-askSIRDaysSetup,
-askSIRDaysNext
-);
-
-static DialogAction
-askSIRDaysSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return action;
-
-	if (dialogSetup(me, SLAPD_KEY_SIR_DAYS, "all") &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	const char *tmp;
-	if ((tmp = getManager(me)->getDefaultScript()->get(SLAPD_KEY_SIR_DAYS)) &&
-		!*tmp)
-		me->setDefaultAns("all");
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSIRDaysNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return DIALOG_NEXT;
-
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SIR_DAYS, val);
-
-	int status = 0;
-	ostrstream msg;
-
-	char realval[8] = "-------";
-	if (!strncasecmp(val, "all", strlen(val)))
-		strcpy(realval, ""); // default is everyday
-	else
-	{
-		for (const char *ptr = val; *ptr; ++ptr)
-		{
-			if (!isdigit(*ptr))
-			{
-				msg << "The string [" << val << "] contains non-digit characters."
-					<< "  Please re enter the string." << ends;
-				status = 1;
-				break;
-			}
-
-			int ival = (int)(*ptr) - (int)'0';
-			if (ival > 6)
-			{
-				msg << "The string contains an invalid value [" << ival << "]."
-					<< "  Please re enter the string." << ends;
-				status = 2;
-				break;
-			}
-
-			// this step makes sure we get the numbers in order with no duplicates
-			realval[ival] = *ptr;
-		}
-
-		if (status)
-		{
-			DialogManagerType::showAlert(msg.str());
-			delete [] msg.str();
-			return DIALOG_SAME;
-		}
-
-		// realval now contains a string like
-		// 0---4-6, but we really want 046
-		int index = 0;
-		for (char *p2 = realval; *p2; ++p2)
-		{
-			if (*p2 != '-')
-				realval[index++] = *p2;
-		}
-		realval[index] = 0;
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SIR_DAYS, realval);
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askCIRTimes(
-"Please enter the time of day you would like replication to occur.  The\n"
-"time is specified as a range in the form HHMM-HHMM in 24 hour time.\n"
-"HH represents the hour portion of the time, and MM the minutes.\n"
-"Numbers less than 10 should be preceeded by a 0.  For example, to\n"
-"enable replication between 1 am and 4:30 am, specify 0100-0430.  To\n"
-"specify 11 am to 9 pm, use 1100-2100.  12 am to 12:59 am is specified\n"
-"as 0000-0059.  The default is all day.\n",
-
-"Enter the replication times",
-
-"all day",
-
-askCIRTimesSetup,
-askCIRTimesNext
-);
-
-static DialogAction
-askCIRTimesSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return action;
-
-	if (dialogSetup(me, SLAPD_KEY_CIR_TIMES, "all day") &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askCIRTimesNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_CONSUMER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_CONSUMER), "2"))
-		return DIALOG_NEXT;
-
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	if (!strncasecmp(val, "all day", strlen(val)))
-	{
-		val = "";
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_CIR_TIMES, val);
-		return DIALOG_NEXT;
-	}
-
-	int status = 0;
-	ostrstream msg;
-
-	int pos = 0;
-	// format should be HHMM-HHMM
-	int maxvals[9] = {0, 23, 0, 59, 0, 0, 23, 0, 59};
-	char teststr[3]; // 2 digits plus \0
-	int testindex = 0;
-	for (const char *ptr = val; *ptr; ++ptr, ++pos)
-	{
-		// position 4 should contain the '-'
-		if (pos == 4 && *ptr != '-')
-		{
-			msg << "The time specification [" << val << "] is invalid.\n"
-				<< "Please re enter the string." << ends;
-			status = 1;
-			break;
-		}
-		else if (pos == 4)
-			continue;
-
-		if (!isdigit(*ptr) && pos != 4)
-		{
-			msg << "The time specification [" << val << "] contains non-digit characters.\n"
-				<< "Please re enter the string." << ends;
-			status = 2;
-			break;
-		}
-
-		teststr[testindex++] = *ptr;
-		if (pos == 1 || pos == 3 || pos == 6 || pos == 8)
-		{
-			teststr[testindex] = 0;
-			testindex = 0;
-			if (teststr[0] == '0')
-				teststr[0] = ' ';
-			int ival = atoi(teststr);
-			if (ival > maxvals[pos])
-			{
-				msg << "The string contains an invalid value [" << ival << "].\n"
-					<< "Please re enter the string." << ends;
-				status = 3;
-				break;
-			}
-		}
-	}
-
-	if (pos != 9)
-	{
-		msg << "The string [" << val << "] is invalid.\n"
-			<< "Please re enter the string." << ends;
-		status = 4;
-	}
-
-	if (status)
-	{
-		DialogManagerType::showAlert(msg.str());
-		delete [] msg.str();
-		return DIALOG_SAME;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askSIRTimes(
-"Please enter the time of day you would like replication to occur.  The\n"
-"time is specified as a range in the form HHMM-HHMM in 24 hour time.\n"
-"HH represents the hour portion of the time, and MM the minutes.\n"
-"Numbers less than 10 should be preceeded by a 0.  For example, to\n"
-"enable replication between 1 am and 4:30 am, specify 0100-0430.  To\n"
-"specify 11 am to 9 pm, use 1100-2100.  12 am to 12:59 am is specified\n"
-"as 0000-0059.  The default is all day.\n",
-
-"Enter the replication times",
-
-"all day",
-
-askSIRTimesSetup,
-askSIRTimesNext
-);
-
-static DialogAction
-askSIRTimesSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return action;
-
-	if (dialogSetup(me, SLAPD_KEY_SIR_TIMES, "all day") &&
-		getManager(me)->installMode() == Silent)
-		return DIALOG_ERROR;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askSIRTimesNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_SETUP_SUPPLIER) ||
-		strcmp(getManager(me)->getDefaultScript()->get(SLAPD_KEY_SETUP_SUPPLIER), "1"))
-		return DIALOG_NEXT;
-
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	if (!strncasecmp(val, "all day", strlen(val)))
-	{
-		val = "";
-		getManager(me)->getDefaultScript()->set(SLAPD_KEY_SIR_TIMES, val);
-		return DIALOG_NEXT;
-	}
-
-	int status = 0;
-	ostrstream msg;
-
-	int pos = 0;
-	// format should be HHMM-HHMM
-	int maxvals[9] = {0, 23, 0, 59, 0, 0, 23, 0, 59};
-	char teststr[3]; // 2 digits plus \0
-	int testindex = 0;
-	for (const char *ptr = val; *ptr; ++ptr, ++pos)
-	{
-		// position 4 should contain the '-'
-		if (pos == 4 && *ptr != '-')
-		{
-			msg << "The time specification [" << val << "] is invalid.\n"
-				<< "Please re enter the string." << ends;
-			status = 1;
-			break;
-		}
-		else if (pos == 4)
-			continue;
-
-		if (!isdigit(*ptr) && pos != 4)
-		{
-			msg << "The time specification [" << val << "] contains non-digit characters.\n"
-				<< "Please re enter the string." << ends;
-			status = 2;
-			break;
-		}
-
-		teststr[testindex++] = *ptr;
-		if (pos == 1 || pos == 3 || pos == 6 || pos == 8)
-		{
-			teststr[testindex] = 0;
-			testindex = 0;
-			if (teststr[0] == '0')
-				teststr[0] = ' ';
-			int ival = atoi(teststr);
-			if (ival > maxvals[pos])
-			{
-				msg << "The string contains an invalid value [" << ival << "].\n"
-					<< "Please re enter the string." << ends;
-				status = 3;
-				break;
-			}
-		}
-	}
-
-	if (pos != 9)
-	{
-		msg << "The string [" << val << "] is invalid.\n"
-			<< "Please re enter the string." << ends;
-		status = 4;
-	}
-
-	if (status)
-	{
-		DialogManagerType::showAlert(msg.str());
-		delete [] msg.str();
-		return DIALOG_SAME;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogYesNo askUseExistingMC(
-"Fedora server information is stored in the Fedora configuration\n"
-"directory server, which you may have already set up.  If so, you\n"
-"should configure this server to be managed by the configuration\n"
-"server.  To do so, the following information about the configuration\n"
-"server is required: the fully qualified host name of the form\n"
-"<hostname>.<domainname>(e.g. hostname.domain.com), the port number,\n"
-"the suffix, and the DN and password of a user having permission to\n"
-"write the configuration information, usually the Fedora\n"
-"configuration directory administrator.\n\n"
-"If you want to install this software as a standalone server, or if you\n"
-"want this instance to serve as your Fedora configuration directory\n"
-"server, press Enter.\n",
-
-"Do you want to register this software with an existing\n"
-"Fedora configuration directory server?",
-
-"No",
-
-askUseExistingMCSetup,
-askUseExistingMCNext
-);
-
-static DialogAction
-askUseExistingMCSetup(Dialog *me)
-{
-#if DEBUG > 1
-	cerr << "Entering askUseExistingMCSetup" << endl;
-#endif
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-
-	if (action != DIALOG_PREV)
-	{
-		if (getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_URL))
-		{
-			// tell the instance creator not to create the Config entries
-			// new instance
-			getManager(me)->getDefaultScript()->set(
-				SLAPD_KEY_USE_EXISTING_MC, "Yes");
-			getManager(me)->getDefaultScript()->set(
-				SLAPD_KEY_SLAPD_CONFIG_FOR_MC, "No");
-		}
-		else
-		{
-			getManager(me)->getDefaultScript()->set(
-				SLAPD_KEY_USE_EXISTING_MC, "No");
-			getManager(me)->getDefaultScript()->set(
-				SLAPD_KEY_SLAPD_CONFIG_FOR_MC, "Yes");
-		}
-	}
-
-	dialogSetup(me, SLAPD_KEY_USE_EXISTING_MC, "No");
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-	{
-#if DEBUG > 1
-		cerr << "Leaving askUseExistingMCSetup DIALOG_NEXT" << endl;
-#endif
-		return DIALOG_NEXT;
-	}
-
-#if DEBUG > 1
-	cerr << "Leaving askUseExistingMCSetup DIALOG_SAME" << endl;
-#endif
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askUseExistingMCNext(Dialog *me)
-{
-#if DEBUG > 1
-	cerr << "Entering askUseExistingMCNext" << endl;
-#endif
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "No";
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_USE_EXISTING_MC, buf);
-
-	if (!isValidYesNo(buf))
-		return DIALOG_SAME;
-
-#if DEBUG > 1
-	cerr << "Leaving askUseExistingMCNext" << endl;
-#endif
-	return DIALOG_NEXT;
-}
-
-DialogInput askMCHost(
-"Enter the fully qualified domain name of the Fedora configuration\n"
-"directory server host in the form <hostname>.<domainname>\n"
-"(e.g. hostname.domain.com).\n",
-
-"Fedora configuration directory server\nhost name",
-
-0,
-
-askMCHostSetup,
-askMCHostNext
-);
-
-static DialogAction
-askMCHostSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return action;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askMCHostNext(Dialog *me)
-{
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return DIALOG_NEXT;
-	
-   const char *buf = me->input();
-   const char *tmp;
-
-   if (buf[0] == 0)
-   {
-      tmp = me->defaultAns();
-   }
-   else
-   {
-      tmp = buf;
-   }
-
-   getManager(me)->getBaseScript()->set(SLAPD_KEY_K_LDAP_HOST, tmp);
-
-   if (!tmp || !isValid(tmp))
-   {
-	   DialogManagerType::showAlert("Please enter a valid hostname");
-	   return DIALOG_SAME;
-   }
-
-   return DIALOG_NEXT;
-}
-
-DialogInput askMCPort(
-"Please specify the port number on which the Fedora configuration\n"
-"directory server listens.\n",
-
-"Fedora configuration directory server\nport number",
-
-"389",
-
-askMCPortSetup,
-askMCPortNext
-);
-
-static DialogAction
-askMCPortSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return action;
-	
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askMCPortNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return DIALOG_NEXT;
-	
-   const char *buf = me->input();
-   const char *tmp;
-   char testbuf[1024];
-   int port, err = 0;
-
-   if (buf[0] == 0)
-   {
-      tmp = me->defaultAns();
-   }
-   else
-   {
-      tmp = buf;
-   }
-
-   getManager(me)->getBaseScript()->set(SLAPD_KEY_K_LDAP_PORT, tmp);
-
-   port = atoi(tmp);
-   PR_snprintf(testbuf, sizeof(testbuf), "%d", port);
-   if (strncmp(testbuf, tmp, 6) || port > MAXPORT || port < 1)
-   {
-      PR_snprintf(testbuf, sizeof(testbuf), "OVERFLOW ERROR: Unable to bind to port %d\n"
-                 "Please choose another port between 1 and %d.\n\n",
-                   port, MAXPORT);
-      err = -1;
-   } 
-
-   if (err)
-   {
-      DialogManagerType::showAlert(testbuf);
-      return DIALOG_SAME;
-   }
-
-   return DIALOG_NEXT;
-}
-
-DialogInput askMCDN(
-"To write configuration information into the Fedora configuration\n"
-"directory, you must bind to the server as an entity with the\n"
-"appropriate permissions.  Usually, the Fedora configuration\n"
-"directory administrator is used for this purpose, although you can\n"
-"give other directory accounts the proper access.\n",
-
-"Fedora configuration directory server\nadministrator ID",
-
-0,
-
-askMCDNSetup,
-askMCDNNext
-);
-
-static DialogAction
-askMCDNSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return action;
-
-	dialogSetup(me, SLAPD_KEY_SERVER_ADMIN_ID, "admin");
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askMCDNNext(Dialog *me)
-{
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return DIALOG_NEXT;
-
-	const char *slapdUser;
-	char *slapdPwd = 0;
-	const char *buf;
-
-	buf = me->input();
-	if (buf[0] == 0)
-	{
-		slapdUser = me->defaultAns();
-	}
-	else
-	{
-		slapdUser = buf;
-	}
-
-	getManager(me)->getBaseScript()->set(SLAPD_KEY_SERVER_ADMIN_ID, slapdUser);
-
-	if (!isValid(slapdUser))
-	{
-		DialogManagerType::showAlert("Please enter a valid string.");
-		return DIALOG_SAME;
-	}
-
-	while (1)
-	{
-		me->showString("Password: ");
-		if (me->getPassword () == 0)
-		{
-			return DIALOG_PREV;
-		}
-		else
-		{
-			char *inp = strdup(me->input());
-
-			if (inp[0] == 0)
-			{
-				free(inp);
-				continue;
-			}
-			else
-			{
-				slapdPwd = inp;
-				break;
-			}
-		}
-	}
-
-	if (slapdPwd)
-	{
-		getManager(me)->getBaseScript()->set(SLAPD_KEY_SERVER_ADMIN_PWD, slapdPwd);
-		free(slapdPwd);
-
-		int status;
-		if ((status = getManager(me)->verifyRemoteLdap(
-									  SLAPD_KEY_K_LDAP_HOST,
-									  SLAPD_KEY_K_LDAP_PORT,
-									  SLAPD_KEY_BASE_SUFFIX,
-									  SLAPD_KEY_SERVER_ADMIN_ID,
-									  SLAPD_KEY_SERVER_ADMIN_PWD
-									  ))
-		   )
-		{
-			ostrstream msg;
-			msg << "Could not connect to ldap://"
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_HOST)
-				<< ":"
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_PORT)
-				<< "/"
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_BASE_SUFFIX)
-				<< endl << "for bind DN "
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ADMIN_ID)
-				<< " status = " << status << endl
-				<< "Please check your typing.  If you have mis-typed, you can backup"
-				<< endl
-				<< "and retype.  Otherwise, the remote server may be down at this time."
-				<< endl
-				<< "The installation cannot proceed."
-				<< endl << ends;
-			DialogManagerType::showAlert(msg.str());
-			delete [] msg.str();
-			return DIALOG_SAME;
-		}
-		else if ((getManager(me)->installType() < Custom) &&
-				 (status = getManager(me)->verifyAdminDomain(
-									  SLAPD_KEY_K_LDAP_HOST,
-									  SLAPD_KEY_K_LDAP_PORT,
-									  SLAPD_KEY_BASE_SUFFIX,
-									  SLAPD_KEY_ADMIN_DOMAIN,
-									  SLAPD_KEY_SERVER_ADMIN_ID,
-									  SLAPD_KEY_SERVER_ADMIN_PWD
-					 ))
-			)
-		{
-			ostrstream msg;
-			msg << "Could not find the Admin Domain "
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_ADMIN_DOMAIN)
-				<< " in the server" << endl << "ldap://"
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_HOST)
-				<< ":"
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_PORT)
-				<< "/"
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_BASE_SUFFIX)
-				<< endl << "for bind DN "
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ADMIN_ID)
-				<< " status = " << status << endl
-				<< "You may need to re-run setup in Custom mode in order to specify"
-				<< endl
-				<< "the correct Admin Domain."
-				<< endl
-				<< "The installation cannot proceed."
-				<< endl << ends;
-			DialogManagerType::showAlert(msg.str());
-			delete [] msg.str();
-			return DIALOG_SAME;
-		}
-	}
-
-	// tell the instance creator not to create the config entries in the
-	// new instance
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_SLAPD_CONFIG_FOR_MC, "No");
-
-	return DIALOG_NEXT;
-}
-
-DialogYesNo askDisableSchemaChecking(
-"If you are going to import an old database immediately after or during\n"
-"installation, and you think you may have problems with your old\n"
-"schema, you may want to turn off schema checking until after the\n"
-"import.  If you choose to do this, schema checking will remain off\n"
-"until you manually turn it back on.  Fedora recommends that you turn\n"
-"it back on as soon as possible.\n",
-
-"Do you want to disable schema checking?",
-
-"No",
-
-askDisableSchemaCheckingSetup,
-askDisableSchemaCheckingNext
-);
-
-static DialogAction
-askDisableSchemaCheckingSetup(Dialog *me)
-{
-	me = me;
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askDisableSchemaCheckingNext(Dialog *me)
-{
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "No";
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_DISABLE_SCHEMA_CHECKING, buf);
-
-	if (!isValidYesNo(buf))
-		return DIALOG_SAME;
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askMCAdminDomain(
-"The Administration Domain is a part of the configuration directory\n"
-"server used to store information about Fedora software.  If you are\n"
-"managing multiple software releases at the same time, or managing\n"
-"information about multiple domains, you may use the Administration\n"
-"Domain to keep them separate.\n\n"
-"If you are not using administrative domains, press Enter to select the\n"
-"default.  Otherwise, enter some descriptive, unique name for the\n"
-"administration domain, such as the name of the organization responsible\n"
-"for managing the domain.\n",
-
-"Administration Domain",
-
-NULL,
-
-askMCAdminDomainSetup,
-askMCAdminDomainNext
-);
-
-static DialogAction
-askMCAdminDomainSetup(Dialog *me)
-{
-	if (!getManager(me)->getBaseScript()->get(SLAPD_KEY_ADMIN_DOMAIN)) {
-		getManager(me)->getBaseScript()->set(
-			SLAPD_KEY_ADMIN_DOMAIN, getManager(me)->getDNSDomain());
-	}
-
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-	{
-#if DEBUG > 1
-		cerr << "leaving askMCAdminDomainSetup " << action << endl;
-#endif
-		return action;
-	}
-
-	// if we are creating the Configuration server, the admin domain will not
-	// yet exist, and we need to ask the user to create one.  Otherwise, we are
-	// installing into an existing one
-
-	dialogSetup(me, SLAPD_KEY_ADMIN_DOMAIN, getManager(me)->getDNSDomain());
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askMCAdminDomainNext(Dialog *me)
-{
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return DIALOG_NEXT;
-
-	const char *buf;
-	int status = 0;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getBaseScript()->set(SLAPD_KEY_ADMIN_DOMAIN, val);
-
-	if (!isValid(val))
-	{
-		DialogManagerType::showAlert("Please enter a valid string.");
-		return DIALOG_SAME;
-	}
-	else if (isAValidDN(val))
-	{
-		DialogManagerType::showAlert("A DN is not allowed here.  Please enter a valid string.");
-		return DIALOG_SAME;
-	}
-	else if ((status = getManager(me)->verifyAdminDomain(
-									  SLAPD_KEY_K_LDAP_HOST,
-									  SLAPD_KEY_K_LDAP_PORT,
-									  SLAPD_KEY_BASE_SUFFIX,
-									  SLAPD_KEY_ADMIN_DOMAIN,
-									  SLAPD_KEY_SERVER_ADMIN_ID,
-									  SLAPD_KEY_SERVER_ADMIN_PWD
-									  ))
-		)
-	{
-		ostrstream msg;
-		msg << "Could not find the Admin Domain "
-			<< getManager(me)->getBaseScript()->get(SLAPD_KEY_ADMIN_DOMAIN)
-			<< " in the server" << endl << "ldap://"
-			<< getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_HOST)
-			<< ":"
-			<< getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_PORT)
-			<< "/"
-			<< getManager(me)->getBaseScript()->get(SLAPD_KEY_BASE_SUFFIX)
-			<< endl << "for bind DN "
-			<< getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ADMIN_ID)
-			<< " status = " << status << endl
-			<< "Please check your typing.  If you have mis-typed, you can backup"
-			<< endl
-			<< "and retype.  Otherwise, the remote server may be down at this time."
-			<< endl
-			<< "The installation cannot proceed."
-			<< endl << ends;
-		DialogManagerType::showAlert(msg.str());
-		delete [] msg.str();
-		return DIALOG_SAME;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askAdminDomain(
-"The Administration Domain is a part of the configuration directory\n"
-"server used to store information about Fedora software.  If you are\n"
-"managing multiple software releases at the same time, or managing\n"
-"information about multiple domains, you may use the Administration\n"
-"Domain to keep them separate.\n\n"
-"If you are not using administrative domains, press Enter to select the\n"
-"default.  Otherwise, enter some descriptive, unique name for the\n"
-"administration domain, such as the name of the organization responsible\n"
-"for managing the domain.\n",
-
-"Administration Domain",
-
-NULL,
-
-askAdminDomainSetup,
-askAdminDomainNext
-);
-
-static DialogAction
-askAdminDomainSetup(Dialog *me)
-{
-	if (!getManager(me)->getBaseScript()->get(SLAPD_KEY_ADMIN_DOMAIN)) {
-		getManager(me)->getBaseScript()->set(
-			SLAPD_KEY_ADMIN_DOMAIN, getManager(me)->getDNSDomain());
-	}
-
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return action;
-
-	// if we are creating the Configuration server, the admin domain will not
-	// yet exist, and we need to ask the user to create one.  Otherwise, we are
-	// installing into an existing one
-
-	dialogSetup(me, SLAPD_KEY_ADMIN_DOMAIN, getManager(me)->getDNSDomain());
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askAdminDomainNext(Dialog *me)
-{
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-		return DIALOG_NEXT;
-
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getBaseScript()->set(SLAPD_KEY_ADMIN_DOMAIN, val);
-
-	if (!isValid(val))
-	{
-		DialogManagerType::showAlert("Please enter a valid string.");
-		return DIALOG_SAME;
-	}
-
-	if (isAValidDN(val))
-	{
-		DialogManagerType::showAlert("A DN is not allowed here.  Please enter a valid string.");
-		return DIALOG_SAME;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogYesNo askUseExistingUG(
-"If you already have a directory server you want to use to store your\n"
-"data, such as user and group information, answer Yes to the following\n"
-"question.  You will be prompted for the host, port, suffix, and bind\n"
-"DN to use for that directory server.\n\n"
-"If you want this directory server to store your data, answer No.\n",
-
-"Do you want to use another directory to store your data?",
-
-"No",
-
-askUseExistingUGSetup,
-askUseExistingUGNext
-);
-
-static DialogAction
-askUseExistingUGSetup(Dialog *me)
-{
-#if DEBUG > 1
-	cerr << "Entering askUseExistingUGSetup" << endl;
-#endif
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	// if this server is not an MC host, it must be a UG host
-	if (getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_MC))
-	{
-		getManager(me)->getDefaultScript()->set(
-			SLAPD_KEY_USE_EXISTING_UG, "No");
-#if DEBUG > 1
-		cerr << "Leaving askUseExistingUGSetup DIALOG_NEXT" << endl;
-#endif
-		return action;
-	}
-	else if (getManager(me)->getBaseScript()->get(SLAPD_KEY_USER_GROUP_LDAP_URL))
-	{
-		getManager(me)->getDefaultScript()->set(
-			SLAPD_KEY_USE_EXISTING_UG, "Yes");
-	}
-	else
-	{
-		getManager(me)->getDefaultScript()->set(
-			SLAPD_KEY_USE_EXISTING_UG, "No");
-	}
-
-	dialogSetup(me, SLAPD_KEY_USE_EXISTING_UG, "No");
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-	{
-#if DEBUG > 1
-		cerr << "Leaving askUseExistingUGSetup DIALOG_NEXT" << endl;
-#endif
-		return DIALOG_NEXT;
-	}
-
-#if DEBUG > 1
-	cerr << "Leaving askUseExistingUGSetup DIALOG_SAME" << endl;
-#endif
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askUseExistingUGNext(Dialog *me)
-{
-#if DEBUG > 1
-	cerr << "Entering askUseExistingUGNext" << endl;
-#endif
-	const char *buf = me->input();
-	if (!buf || !*buf)
-	{
-		buf = me->defaultAns();
-		if (!buf || !*buf)
-			buf = "No";
-	}
-
-	getManager(me)->getDefaultScript()->set(SLAPD_KEY_USE_EXISTING_UG, buf);
-
-	if (!isValidYesNo(buf))
-		return DIALOG_SAME;
-
-#if DEBUG > 1
-	cerr << "Leaving askUseExistingUGNext DIALOG_NEXT" << endl;
-#endif
-	return DIALOG_NEXT;
-}
-
-DialogInput askUGHost(
-"Enter the fully qualified domain name of the user directory host of\n"
-"the form <hostname>.<domainname> (e.g. hostname.domain.com).\n",
-
-"User directory host name",
-
-0,
-
-askUGHostSetup,
-askUGHostNext
-);
-
-static DialogAction
-askUGHostSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-		return action;
-
-	dialogSetup(me, SLAPD_KEY_UG_HOST, 0);
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askUGHostNext(Dialog *me)
-{
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-		return DIALOG_NEXT;
-	
-   const char *buf = me->input();
-   const char *tmp;
-
-   if (buf[0] == 0)
-   {
-      tmp = me->defaultAns();
-   }
-   else
-   {
-      tmp = buf;
-   }
-
-   getManager(me)->getBaseScript()->set(SLAPD_KEY_UG_HOST, tmp);
-
-   if (!tmp || !isValid(tmp))
-   {
-	   DialogManagerType::showAlert("Please enter a valid hostname");
-	   return DIALOG_SAME;
-   }
-
-   return DIALOG_NEXT;
-}
-
-DialogInput askUGPort(
-"Please specify the port number on which the user directory listens.\n",
-
-"User directory port number",
-
-"389",
-
-askUGPortSetup,
-askUGPortNext
-);
-
-static DialogAction
-askUGPortSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-		return action;
-	
-	dialogSetup(me, SLAPD_KEY_UG_PORT, me->defaultAns());
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askUGPortNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-		return DIALOG_NEXT;
-	
-   const char *buf = me->input();
-   const char *tmp;
-   char testbuf[1024];
-   int port, err = 0;
-
-   if (buf[0] == 0)
-   {
-      tmp = me->defaultAns();
-   }
-   else
-   {
-      tmp = buf;
-   }
-
-   getManager(me)->getBaseScript()->set(SLAPD_KEY_UG_PORT, tmp);
-
-   port = atoi(tmp);
-   PR_snprintf(testbuf, sizeof(testbuf), "%d", port);
-   if (strncmp(testbuf, tmp, 6) || port > MAXPORT || port < 1)
-   {
-      PR_snprintf(testbuf, sizeof(testbuf), "OVERFLOW ERROR: Unable to bind to port %d\n"
-                 "Please choose another port between 1 and %d.\n\n",
-                   port, MAXPORT);
-      err = -1;
-   } 
-
-   if (err)
-   {
-      DialogManagerType::showAlert(testbuf);
-      return DIALOG_SAME;
-   }
-
-   return DIALOG_NEXT;
-}
-
-DialogInput askUGDN(
-"In order to add and modify information in the user directory, you must\n"
-"be able to bind to the server as an entity with the correct\n"
-"permissions.  This user is usually the Directory Manager, although\n"
-"other users may be given the proper access.  You will also be asked to\n"
-"provide the password.\n",
-
-"User directory administrator ID",
-
-0,
-
-askUGDNSetup,
-askUGDNNext
-);
-
-static DialogAction
-askUGDNSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-		return action;
-
-	dialogSetup(me, SLAPD_KEY_USER_GROUP_ADMIN_ID, DEFAULT_SLAPDUSER);
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askUGDNNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-		return DIALOG_NEXT;
-
-	const char *slapdUser;
-	char *slapdPwd = 0;
-	const char *buf;
-
-	buf = me->input();
-	if (buf[0] == 0)
-	{
-		slapdUser = me->defaultAns();
-	}
-	else
-	{
-		slapdUser = buf;
-	}
-
-	getManager(me)->getBaseScript()->set(SLAPD_KEY_USER_GROUP_ADMIN_ID, slapdUser);
-
-	if (!isValid(slapdUser))
-	{
-		DialogManagerType::showAlert("Please enter a valid string.");
-		return DIALOG_SAME;
-	}
-
-	while (1)
-	{
-		me->showString("Password: ");
-		if (me->getPassword () == 0)
-		{
-			return DIALOG_PREV;
-		}
-		else
-		{
-			char *inp = strdup(me->input());
-
-			if (inp[0] == 0)
-			{
-				free(inp);
-				continue;
-			}
-			else
-			{
-				slapdPwd = inp;
-				break;
-			}
-		}
-	}
-
-	if (slapdPwd)
-	{
-		getManager(me)->getBaseScript()->set(SLAPD_KEY_USER_GROUP_ADMIN_PWD, slapdPwd);
-		free(slapdPwd);
-
-		int status;
-		if ((status = getManager(me)->verifyRemoteLdap(
-									  SLAPD_KEY_UG_HOST,
-									  SLAPD_KEY_UG_PORT,
-									  SLAPD_KEY_UG_SUFFIX,
-									  SLAPD_KEY_USER_GROUP_ADMIN_ID,
-									  SLAPD_KEY_USER_GROUP_ADMIN_PWD
-									  ))
-		   )
-		{
-			ostrstream msg;
-			msg << "Could not connect to ldap://"
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_UG_HOST)
-				<< ":"
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_UG_PORT)
-				<< "/"
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_UG_SUFFIX)
-				<< endl << "for bind DN "
-				<< getManager(me)->getBaseScript()->get(SLAPD_KEY_USER_GROUP_ADMIN_ID)
-				<< " status = " << status << endl
-				<< "Please check your typing.  If you have mis-typed, you can backup"
-				<< endl
-				<< "and retype.  Otherwise, the remote server may be down at this time."
-				<< endl
-				<< "The installation cannot proceed."
-				<< endl << ends;
-			DialogManagerType::showAlert(msg.str());
-			delete [] msg.str();
-			return DIALOG_SAME;
-		}
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askUGSuffix(
-"Please specify the suffix for the user directory server.\n",
-
-"User directory server suffix",
-
-NULL,
-
-askUGSuffixSetup,
-askUGSuffixNext
-);
-
-static DialogAction
-askUGSuffixSetup(Dialog *me)
-{
-	DialogAction action = DIALOG_NEXT;
-	long actionval = 0;
-	me->getUserData(ACTION, actionval);
-	action = (DialogAction)actionval;
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-		return action;
-
-	dialogSetup(me, SLAPD_KEY_UG_SUFFIX, getManager(me)->getDefaultSuffix());
-
-	long setupval = 0;
-	if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY ||
-		setupval == SETUP_ONLY)
-		return DIALOG_NEXT;
-
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askUGSuffixNext(Dialog *me)
-{
-	if (!getManager(me)->featureIsEnabled(SLAPD_KEY_USE_EXISTING_UG))
-		return DIALOG_NEXT;
-
-	const char *buf;
-	NSString val;
-
-	buf = me->input();
-	if (buf[0] == 0)
-		val = me->defaultAns();
-	else
-		val = buf;
-
-	getManager(me)->getBaseScript()->set(SLAPD_KEY_UG_SUFFIX, val);
-
-	// check to see if it is a valid dn
-	if (!isAValidDN(val))
-	{
-	 	DialogManagerType::showAlert("The suffix must be a valid DN");
-	 	return DIALOG_SAME;
-	}
-	if (!isValid(val))
-	{
-	 	DialogManagerType::showAlert("Please enter a valid string.");
-	 	return DIALOG_SAME;
-	}
-
-	return DIALOG_NEXT;
-}
-
-DialogInput askReconfigMCAdminPwd(
-(const char*)0,
-"Fedora configuration directory server\nadministrator ID",
-
-(const char*)0,
-
-askReconfigMCAdminPwdSetup,
-askReconfigMCAdminPwdNext
-);
-
-static DialogAction
-askReconfigMCAdminPwdSetup(Dialog *me)
-{
-#if DEBUG > 1
-	cerr << "Entering askReconfigMCAdminPwdSetup" << endl;
-#endif
-	NSString msg = NSString(
-"In order to reconfigure your installation, the Configuration Directory\n"
-"Administrator password is required.  Here is your current information:\n\n"
-"Configuration Directory: ") +
-		getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_URL) + "\n" +
-"Configuration Administrator ID: " +
-		getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ADMIN_ID) + "\n" +
-"\nAt the prompt, please enter the password for the Configuration Administrator.\n";
-
-	me->setText(msg);
-
-	me->setDefaultAns(getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ADMIN_ID));
-#if DEBUG > 1
-	cerr << "Leaving askReconfigMCAdminPwdSetup" << endl;
-#endif
-	return DIALOG_SAME;
-}
-
-static DialogAction
-askReconfigMCAdminPwdNext(Dialog *me)
-{
-	const char *buf;
-
-	buf = me->input();
-	if (!buf || buf[0] == 0)
-	{
-		buf = me->defaultAns();
-	}
-
-	getManager(me)->getBaseScript()->set(SLAPD_KEY_SERVER_ADMIN_ID, buf);
-
-	if (!isValid(buf))
-	{
-		DialogManagerType::showAlert("Please enter a valid string.");
-		return DIALOG_SAME;
-	}
-
-	me->showString("Password: ");
-	while (1)
-	{
-		if (me->getPassword () == 0)
-		{
-			return DIALOG_PREV;
-		}
-		else
-		{
-			char *inp = strdup(me->input());
-
-			if (inp[0] == 0)
-			{
-				me->showString("Password: ");
-				continue;
-			}
-			else if (contains8BitChars(inp))
-			{
-				DialogManagerType::showAlert("Password must contain 7 bit characters only.");
-				return DIALOG_SAME;
-			}
-			else if (!isValid(inp))
-			{
-				DialogManagerType::showAlert("Please enter a valid password.");
-				return DIALOG_SAME;
-			}
-			else
-			{
-				int status;
-				if ((status = authLdapUser(
-					getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_URL),
-					getManager(me)->getBaseScript()->get(SLAPD_KEY_SERVER_ADMIN_ID),
-					inp, 0, 0)))
-				{
-					ostrstream msg;
-					msg << "Could not connect to "
-						<< getManager(me)->getBaseScript()->get(SLAPD_KEY_K_LDAP_URL)
-						<< endl << "for ID "
-						<< getManager(me)->getBaseScript()->get(SLAPD_KEY_USER_GROUP_ADMIN_ID)
-						<< " status = " << status << endl
-						<< "Please check your typing.  If you have mis-typed, you can backup"
-						<< endl
-						<< "and retype.  Otherwise, the remote server may be down at this time."
-						<< endl
-						<< "The reconfiguration cannot proceed."
-						<< endl << ends;
-					DialogManagerType::showAlert(msg.str());
-					delete [] msg.str();
-					return DIALOG_SAME;
-				}
-			}
-			getManager(me)->getBaseScript()->set(SLAPD_KEY_SERVER_ADMIN_PWD, inp);
-			free(inp);
-			break;
-		}
-	}
-
-	return DIALOG_NEXT;
-}
diff --git a/ldap/cm/newinst/ux-dialog.h b/ldap/cm/newinst/ux-dialog.h
deleted file mode 100644
index 51c899f5..00000000
--- a/ldap/cm/newinst/ux-dialog.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-
-#ifndef _UX_DIALOG_H_
-#define _UX_DIALOG_H_
-
-#include "dialog.h"
-extern DialogYesNo askReconfig;
-extern DialogInput askSlapdServerName;
-extern DialogInput askAdminPort;
-extern DialogInput askSlapdPort;
-extern DialogYesNo askSecurity;
-extern DialogInput askSlapdSecPort;
-extern DialogInput askSlapdServerID;
-extern DialogInput askSlapdSysUser;
-extern DialogYesNo askConfigForMC;
-extern DialogInput askMCAdminID;
-extern DialogInput askSlapdSuffix;
-extern DialogInput askSlapdRootDN;
-extern DialogYesNo askReplication;
-extern DialogYesNo askSample;
-extern DialogInput askPopulate;
-extern DialogInput askOrgSize;
-extern DialogYesNo askCIR;
-extern DialogInput askCIRHost;
-extern DialogInput askCIRPort;
-extern DialogInput askCIRDN;
-extern DialogInput askCIRSuffix;
-extern DialogYesNo askCIRSSL;
-extern DialogInput askCIRInterval;
-extern DialogInput askCIRDays;
-extern DialogInput askCIRTimes;
-extern DialogYesNo askSIR;
-extern DialogInput askChangeLogSuffix;
-extern DialogInput askChangeLogDir;
-extern DialogInput askReplicationDN;
-extern DialogInput askConsumerDN;
-extern DialogYesNo askSIR;
-extern DialogInput askSIRHost;
-extern DialogInput askSIRPort;
-extern DialogInput askSIRDN;
-extern DialogInput askSIRSuffix;
-extern DialogYesNo askSIRSSL;
-extern DialogInput askSIRDays;
-extern DialogInput askSIRTimes;
-extern DialogYesNo askUseExistingMC;
-extern DialogInput askMCHost;
-extern DialogInput askMCPort;
-extern DialogInput askMCDN;
-extern DialogYesNo askDisableSchemaChecking;
-extern DialogInput askMCAdminDomain;
-extern DialogInput askAdminDomain;
-extern DialogYesNo askUseExistingUG;
-extern DialogInput askUGHost;
-extern DialogInput askUGPort;
-extern DialogInput askUGDN;
-extern DialogInput askUGSuffix;
-extern DialogInput askReconfigMCAdminPwd;
-
-// these keywords and values are used in the Dialog::setUserData to
-// control the behavior of the dialogs
-#define SETUP_DEFAULTS "SETUP_DEFAULTS"
-const int SETUP_ONLY = 1;
-#define ACTION "ACTION"
-
-#endif // _UX_DIALOG_H_
diff --git a/ldap/cm/newinst/ux-dsalib_dn.c b/ldap/cm/newinst/ux-dsalib_dn.c
deleted file mode 100644
index 22ff7585..00000000
--- a/ldap/cm/newinst/ux-dsalib_dn.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <dsalib_dn.c>
-#ifdef __cplusplus
-}
-#endif
diff --git a/ldap/cm/newinst/ux-guesses.cc b/ldap/cm/newinst/ux-guesses.cc
deleted file mode 100644
index 5f79edb6..00000000
--- a/ldap/cm/newinst/ux-guesses.cc
+++ /dev/null
@@ -1,184 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-
-/* Print guesses of host and domain name as made by the setup SDK. */
-
-
-
-/* $RCSfile: ux-guesses.cc,v $ $Revision: 1.6 $ $Date: 2006/11/10 23:44:40 $ $State: Exp $ */
-/*
- * $Log: ux-guesses.cc,v $
- * Revision 1.6  2006/11/10 23:44:40  nhosoi
- * Resolves: #214533
- * Summary: configure needs to support --with-fhs (Comment #6)
- * Changes: Added the following include next to the end of the copyright block.
- * +
- * +#ifdef HAVE_CONFIG_H
- * +#  include <config.h>
- * +#endif
- * +
- *
- * Revision 1.5  2005/04/19 22:07:21  nkinder
- * Fixed licensing typo
- *
- * Revision 1.4  2005/04/15 22:40:11  nkinder
- * 155068 - Added license to source files
- *
- * Revision 1.3  2005/03/11 03:46:41  rmeggins
- * This one is mostly strcpy/strcat checking, checking for null strings before strlen, removing some dead code, other odds and ends.
- *
- * Revision 1.2  2005/02/28 23:37:49  nkinder
- * 149951 - Updated source code copyrights
- *
- * Revision 1.1.1.1  2005/01/21 00:40:49  cvsadm
- * Moving NSCP Directory Server from DirectoryBranch to TRUNK, initial drop. (foxworth)
- *
- * Revision 1.1.2.4  2004/07/14 01:39:20  dboreham
- * changes to make newer C++ compilers happy
- *
- * Revision 1.1.1.1  2004/06/03 22:32:45  telackey
- * Initial import Thu Jun  3 15:32:43 PDT 2004
- *
- * Revision 1.1.2.3  2003/09/22 19:38:52  ulfw
- * Update copyright years from 2001 to 2001-2003
- *
- * Revision 1.1.2.2  2001/11/02 23:33:04  richm
- * XXX use new copyright XXX
- *
- * Revision 1.1.2.1  2000/08/07 15:14:28  mwahl
- * rename functions
- *
- *
- */
-
-#include "dialog.h"
-
-extern "C" {
-#if defined(__sun) || defined(__hppa) || defined(__osf__) || defined(__linux__) || defined(linux)
-#include <netdb.h>
-#endif
-}
-
-
-class PrintGuessPreInstall:public DialogManager
-{
-public:
-
-        PrintGuessPreInstall(int, char **);
-        ~PrintGuessPreInstall();
-
-    int init();
-
-    int  start();
-
-
-  void setParent(void *) { }
-  void *parent() const { return 0;}
-  void resetLast() { }
-  void add (Dialog *) { }
-  void addLast(Dialog *) { }
-  void clear() { }
-  int  cont() { return -1;}
-
-
-private:
-  Bool _reconfig;
-  Bool _configured;
-};
-
-PrintGuessPreInstall::PrintGuessPreInstall(int argc, char **argv) : _reconfig(False)
-{
-   setInstallMode(Interactive);
-   setInstallType(Typical);
-   _configured = False;
-
-   /* getOptions(argc, argv); */
-
-}
-
-PrintGuessPreInstall::~PrintGuessPreInstall()
-{
-  
-}
-
-int PrintGuessPreInstall::init()
-{
-  return 0;
-}
-
-int PrintGuessPreInstall::start()
-{
-  const char *hno = InstUtil::guessHostname();
-  printf("hostname: %s\n",hno ? hno : "<unknown>");
-  if (hno) {
-#if defined(__sun) || defined(__hppa) || defined(__osf__) || defined(__linux__) || defined(linux)
-	static char test_host[BIG_BUF] = {0};
-	struct hostent *hp;
-	
-	PL_strncpyz(test_host,hno,sizeof(test_host));
-	hp = gethostbyname(test_host);
-	if (hp == NULL) {
-	  printf("addressable: no\n");
-	} else {
-	  printf("addressable: yes\n");
-	}
-#endif
-  }
-  const char *dno = InstUtil::guessDomain();
-  printf("domain: %s\n",dno ? dno : "<unknown>");
-  return 0;
-}
-
-
-
-int main(int argc,char **argv)
-{
-  PrintGuessPreInstall program(argc,argv);
-
-  int err = program.init();
-  if (!err) {
-    err = program.start();
-  } 
-  return err;
-  
-}
diff --git a/ldap/cm/newinstnt/Makefile b/ldap/cm/newinstnt/Makefile
deleted file mode 100644
index e05759d3..00000000
--- a/ldap/cm/newinstnt/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Makefile for Directory Server 40 installation plug-in 
-#
-#
-# XXXstevross: note change the makeclean to work
-#
-#
-
-BUILD_ROOT=../../..
-LDAP_SRC= $(BUILD_ROOT)/ldap
-
-NOSTDCLEAN=1
-
-include $(BUILD_ROOT)/nsconfig.mk
-include $(LDAP_SRC)/nsldap.mk
-
-OUTDIR=$(OBJDIR)/setup
-
-CFLAGS=/nologo /MD /W3 /Gm /GX /Zi /Od $(SETUPUTIL_INCLUDE) $(LDAPSDK_INCLUDE) \
- /I "$(LDAP_SRC)/admin/include" /I "$(LDAP_SRC)/admin/lib" \
- /I "$(LDAP_SRC)/admin/src" /D \
- "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(OUTDIR)/dsinst.pch" /YX \
- /Fo"$@" /Fd"$(OUTDIR)/" /c
-
-RCFLAGS=/l 0x409 /d "_DEBUG"
-
-LFLAGS= /nologo /subsystem:windows /dll /incremental:no\
-	/pdb:none /debug /machine:I386 
-
-DSLFLAGS= /out:"$(OUTDIR)/dsinst.dll" /implib:"$(OUTDIR)/dsinst.lib" 
-
-LIBS= \
-	kernel32.lib user32.lib gdi32.lib comdlg32.lib\
-	comctl32.lib advapi32.lib shell32.lib uuid.lib\
-	wsock32.lib\
-	$(SETUPUTILLINK) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK)
-
-DSOBJS= \
-	$(OUTDIR)/dsinst_dsalib_dn.obj \
-	$(OUTDIR)/dsinst.obj \
-	$(OUTDIR)/dsinst.res
-
-CONSOLOBJS= \
-	$(OUTDIR)/consolinst.obj
-
-LIBINSTOBJS = \
-	$(OUTDIR)/libinst.obj
-
-CFLAGS+= /I "$(BUILD_ROOT)/include/nt" /I "$(BUILD_ROOT)/ldap/include" /I "$(BUILD_ROOT)/include" $(ADMINUTIL_INCLUDE) $(NSPR_INCLUDE) /D "XP_WIN32"
-
-CC=cl.exe
-LD=link.exe
-RC=rc.exe
-RM=erase /F /Q
-FIXINF= ../newinst/fixINF.pl
-
-all: $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(ADMINUTIL_DEP) $(OUTDIR)/dsinst.dll $(OUTDIR)/slapd.inf
-
-clean:
-	-rm -rf "$(OUTDIR)"
-
-$(OUTDIR):
-	@mkdir "$(OUTDIR)"
-
-# dependencies only, no commands
-$(OUTDIR)/dsinst.obj: dsinst.c dsinst.h 
-
-$(OUTDIR)/dsinst_dsalib_dn.obj: dsinst_dsalib_dn.c
-
-$(OUTDIR)/consolinst.obj: consolinst.c consolinst.h 
-
-$(OUTDIR)/libinst.obj: libinst.c libinst.h 
-
-# now the commands
-$(OUTDIR)/dsinst.dll: $(OUTDIR) $(DSOBJS) $(CONSOLOBJS) $(LIBINSTOBJS) 
-	$(LD) $(LFLAGS) $(DSLFLAGS) $(DSOBJS) $(CONSOLOBJS) $(LIBINSTOBJS) $(LIBS) 
-
-$(OUTDIR)/%.obj: %.c
-	$(CC) $(CFLAGS) $<
-
-$(OUTDIR)/%.inf: %.inf
-	$(PERL) $(FIXINF) $(BUILD_MODULE) $(DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat $< $(SECURITY) "DoesntOnNT" $(IS_DIR_LITE) '$(INSTANCE_NAME_PREFIX)' $@ $(BUILD_BOMB)
-
-$(OUTDIR)/%.res: %.rc
-	$(RC) $(RCFLAGS) /fo"$@" $<
diff --git a/ldap/cm/newinstnt/consolinst.c b/ldap/cm/newinstnt/consolinst.c
deleted file mode 100644
index 9e08c6ab..00000000
--- a/ldap/cm/newinstnt/consolinst.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST.c - Fedora Directory Server Installation Plug-In 
-//
-//
-#include <windows.h>
-#include <commctrl.h>
-#include <nssetup.h>
-
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <process.h>
-#include <memory.h>
-#include <regstr.h>
-#include <ldap.h>
-#include "resource.h"
-#include "consolinst.h"
-
-#define NUM_PROP_PAGES 1
-
-#define INDEX_FIRST_PAGE 0
-#define INDEX_LAST_PAGE  0
-
-
-static MODULEINFO mi = {
-  NULL,           // m_hModule
-  NULL,           // m_hwndParent
-  NS_WIZERROR,    // m_nResult
-};
-
-//////////////////////////////////////////////////////////////////////////////
-// _DialogProcs
-//
-// The dialog procedure for a single property page.  You will need to create
-// one of these for each property page used in the property sheet.  This
-// procedure processes dialog messages sent to your property page by Windows.
-// See the Windows SDK documentation for more information about this function.
-//
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-// TMPL_PreInstall
-//
-// This function is called by the installation framework before asking the
-// user any questions.  Here you should determine if all of the requisites
-// for installing this component are being met.  If this operation succeeds
-// return TRUE, otherwise display an error message and return FALSE to abort
-// installation.
-//
-
-BOOL __declspec(dllexport)
-CONSOLINST_PreInstall(LPCSTR lpszInstallPath)
-{
-  // TODO: Add code to check for pre-installation requirements.
-  
-  
-  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST_AskOptions
-//
-// This function is called by the installation framework to query the user for
-// information about your component.  Here you should ask all of the questions
-// required to install your component as a series of wizard property sheets.
-//
-
-INT __declspec(dllexport)
-CONSOLINST_AskOptions(HWND hwndParent, INT nDirection)
-{
-  PROPSHEETPAGE psp[NUM_PROP_PAGES];
-  UINT uStartPage;
-  INT nNumPages;
-
-  // TODO: Initialize a property page for each dialog template/resource
-  // required to query the user for options related to your server
-  // installation.  Don't forget to increment the count of pages contained
-  // in NUM_PROP_PAGES at the top of this file.
-
-  
-
-  if( SILENTMODE == MODE)
-  {
-     mi.m_nResult = NS_WIZNEXT;
-  }else{
-
-  if(EXPRESSMODE == MODE)
-  {
-
-  }else if( (NORMALMODE == MODE) || (CUSTOMMODE == MODE) ){
-      /* ask for server settings, SuitespotID and Unrestricted User */
-  }
-
-  /* add additional pages for custom mode */
-  if( (CUSTOMMODE == MODE) )
-  {
- 
-  }
-
-  // Must initialize the result to an error code before calling WizardDialog
-  mi.m_nResult = NS_WIZERROR;
-
-  // Set the first page to display based on the direction we are travelling
-  uStartPage = (nDirection == NS_WIZBACK) ? INDEX_LAST_PAGE : INDEX_FIRST_PAGE;
-
-  // Call WizardDialog to display the set of property pages
-  if (WizardDialog(mi.m_hModule, hwndParent, psp, nNumPages, uStartPage) < 0)
-  {
-    mi.m_nResult = NS_WIZERROR;
-  }
-
-  }
-  return mi.m_nResult;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST_GetSummary
-//
-// This function is called by the installation framework after all questions,
-// for all components, have been asked.  Here you should provide a detailed
-// summary explaining all of the choices selected by the user.
-//
-// IMPORTANT NOTE: Each line MUST end in a carriage return/line feed
-// combination ("\r\n") as this string is placed in an edit control.  Edit
-// controls do not properly handle single "\n" end-of-line characters.
-//
-
-VOID __declspec(dllexport)
-CONSOLINST_GetSummary(LPSTR lpszSummary)
-{
-   
-  // TODO: Add code to fill in the summary information entered by the user
-    char *psz = lpszSummary;
-
-    *psz = '\0';
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST_WriteGlobalCache
-//
-// This function is called by the installation framework when the user clicks
-// Next at the summary screen.  Here you should write all information entered
-// by the user into the installation cache for use during silent installation.
-// Data written to this section of the file may be interpreted by the
-// framework.  If this operation succeeds return TRUE, otherwise display an
-// error message and return FALSE to indicate an error.
-//
-
-BOOL __declspec(dllexport)
-CONSOLINST_WriteGlobalCache(LPCSTR lpszCacheFileName, LPCSTR lpszSectionName)
-{
-  // TODO: Add code to write data to the cache file (INI format) under the
-  // specified section name.
- 
-
-  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST_WriteLocalCache
-//
-// This function is called by the installation framework when the user clicks
-// Next at the summary screen.  Here you should write all information entered
-// by the user into the installation cache for use during silent installation.
-// Data written to this file is not interpreted by the framework, and may
-// consist of any values that you will need to perform the installation (not
-// just values entered by the user). If this operation succeeds return TRUE,
-// otherwise display an error message and return FALSE to indicate an error.
-//
-
-BOOL __declspec(dllexport)
-CONSOLINST_WriteLocalCache(LPCSTR lpszCacheFileName, LPCSTR lpszSectionName)
-{
-  // TODO: Add code to write data to the cache file (INI format) under the
-  // specified section name.
-  
-  
-  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST_ReadGlobalCache
-//
-// This function is called by the installation framework during silent install
-// to initialize your data from the cache file you created above. Here you
-// should read any information stored in the installation cache's global
-// section that you need. If this operation succeeds return TRUE, otherwise
-// display an error message and return FALSE to indicate an error.
-//
-
-BOOL __declspec(dllexport)
-CONSOLINST_ReadGlobalCache(LPCSTR lpszCacheFileName, LPCSTR lpszSectionName)
-{
- 
-
-  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST_ReadLocalCache
-//
-// This function is called by the installation framework during silent install
-// to intialize your data from the local section of the cache created above.
-// Here you should read any information stored in the installation cache's
-// local section that you need.  If this operation succeeds return TRUE,
-// otherwise display an error message and return FALSE to indicate an error.
-//
-
-BOOL __declspec(dllexport)
-CONSOLINST_ReadLocalCache(LPCSTR lpszCacheFileName, LPCSTR lpszSectionName)
-{
-  // TODO: Add code to read data from the cache file (INI format) under the
-  // specified section name.
-
-  
-	return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST_Install
-//
-// The framework calls this function to perform installation.  Here you should
-// define the file sets that are required to place your files on the
-// destination disk.  You should not however perform the extraction, as the
-// calling level will do that once the file sets for all products have been
-// defined.  This ensures that the progress indicator shows the results for
-// the entire range of user selections as a whole.  If the function
-// successfully defines the file set return TRUE, otherwise return FALSE to
-// indicate an error.
-//
-
-BOOL __declspec(dllexport)
-CONSOLINST_Install(VOID)
-{
-   	HFILESET hfs;
-    UINT uFlags;
-    CHAR szSavedPath[MAX_PATH];
-    CHAR szDirName[MAX_PATH];
-    BOOL bResult = FALSE;
-
-    hfs = FileSetCreate(CON_ID_DIR);
-
-    if (hfs == INVALID_FILESET_HANDLE)
-        return FALSE;
-
-	uFlags = FS_UPDATE_VERSION | FS_SHAREDFILE;
-	FileSetAddArchive(hfs, CON_JAR, "*.*", CON_MESSAGE,
-					  uFlags);
-
-    FileSetClose(hfs);
-
- return TRUE;
-   
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST_PostInstall
-//
-// The framework calls this function to perform post-installation
-// configuration.  Here you should set values in any product configuration
-// files, install services, add registry keys, start servers, and anything
-// else that can only be done once the binaries are layed down on the disk.
-// If the function succeeds return TRUE, otherwise return FALSE to indicate
-// an error.
-//
-
-BOOL __declspec(dllexport)
-CONSOLINST_PostInstall(VOID)
-{
-  // TODO: Add code to perform configuration.
-    BOOL bRC = TRUE;
-
-    return bRC;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-// PreUninst
-//
-// 
-// Do things before uninstalling like turn off the server
-// 
-// 
-// 
-//
-
-BOOL __declspec(dllexport)
-CONSOLINST_PreUnInstall(LPCSTR pszServerRoot)
-{
-    BOOL bRC = TRUE;				 
-
-    return bRC;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// PostUninst
-//
-// 
-// Clean up registry keys etc
-// 
-//
-//
-//
-BOOL __declspec(dllexport)
-CONSOLINST_PostUnInstall(LPCSTR pszServerRoot)
-{
-
-    BOOL bRC = TRUE;
-	return bRC;
-}
-
-
diff --git a/ldap/cm/newinstnt/consolinst.h b/ldap/cm/newinstnt/consolinst.h
deleted file mode 100644
index c013016a..00000000
--- a/ldap/cm/newinstnt/consolinst.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST.h - Netscape SuiteSpot Installation Plug-In Directory Server
-//
-//
-
-#ifndef __CONSOLINST_H
-#define __CONSOLINST_H
-
-
-extern __declspec(dllexport) INT  __cdecl CONSOLINST_AskOptions(HWND hwndParent, INT nDirection);
-extern __declspec(dllexport) VOID __cdecl CONSOLINST_GetSummary(LPSTR lpszSummary);
-extern __declspec(dllexport) BOOL __cdecl CONSOLINST_WriteCacheGlobal(LPCSTR lpszCacheFileName, LPCSTR lpszSection);
-extern __declspec(dllexport) BOOL __cdecl CONSOLINST_WriteCacheLocal(LPCSTR lpszCacheFileName, LPCSTR lpszSection);
-extern __declspec(dllexport) BOOL __cdecl CONSOLINST_ReadCacheGlobal(LPCSTR lpszCacheFileName, LPCSTR lpszSection);
-extern __declspec(dllexport) BOOL __cdecl CONSOLINST_ReadCacheLocal(LPCSTR lpszCacheFileName, LPCSTR lpszSection);
-extern __declspec(dllexport) BOOL __cdecl CONSOLINST_PreInstall(LPCSTR lpszInstallPath);
-extern __declspec(dllexport) BOOL __cdecl CONSOLINST_Install(void);
-extern __declspec(dllexport) BOOL __cdecl CONSOLINST_PostInstall(void);
-extern __declspec(dllexport) BOOL __cdecl CONSOLINST_PreUnInstall(LPCSTR pszServerRoot);
-extern __declspec(dllexport) BOOL __cdecl CONSOLINST_PostUnInstall(LPCSTR pszServerRoot);
-
-
-typedef struct tagMODULEINFO {
-  HINSTANCE m_hModule;
-  HWND      m_hwndParent;
-  INT       m_nResult;
-} MODULEINFO;
-
-#define MAX_STR_SIZE 512
-#define CON_ID_DIR   "slapd-client"
-#define CON_TARGET   "java"
-#define CON_JAR		 "ds40jars.z"
-#define CON_MESSAGE  "Installing Directory Server Management Console..."
-#endif // __CONSOLINST_H
diff --git a/ldap/cm/newinstnt/dsinst.aps b/ldap/cm/newinstnt/dsinst.aps
deleted file mode 100644
index 685e4910..00000000
--- a/ldap/cm/newinstnt/dsinst.aps
+++ /dev/null
diff --git a/ldap/cm/newinstnt/dsinst.c b/ldap/cm/newinstnt/dsinst.c
deleted file mode 100644
index 178714c1..00000000
--- a/ldap/cm/newinstnt/dsinst.c
+++ /dev/null
@@ -1,8377 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// dsinst.c - Fedora Directory Server Installation Plug-In 
-//
-#include <windows.h>
-#include <commctrl.h>
-#include <nssetup.h>
-#include <ldapu.h>
-
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <process.h>
-#include <regstr.h>
-#include <ldap.h>
-#include <wingdi.h>
-#include "resource.h"
-#include "dsinst.h"
-#include "install_keywords.h"
-#include "libinst.h"
-
-#ifdef TARGETDIR
-#undef TARGETDIR
-#endif
-
-#define NUM_PROP_PAGES 16
-
-// this is the path to perl, relative to the server root directory
-#define PERL_EXE "bin\\slapd\\admin\\bin\\perl.exe"
-// this is the keyword to lookup in slapd.inf
-#define NSPERL_POST_INSTALL_PROG "NSPerlPostInstall"
-
-#define INDEX_FIRST_PAGE 0
-#define INDEX_LAST_PAGE  14
-
-#define NUM_CIR_ATTR 12
-#define NUM_ORC_ATTR 1
-#define NUM_SIR_ATTR 10
-static MODULEINFO mi = {
-  NULL,           // m_hModule
-  NULL,           // m_hwndParent
-  NS_WIZERROR,    // m_nResult
-  0,			  // m_nReInstall
-  NULL,			  // m_szMCCBindAs
-};
-
-static INFDATA cd;
-
-static void normalizeDNs();
-
-extern int ds_dn_uses_LDAPv2_quoting(const char *utf8dn);
-extern char *dn_normalize_convert(char *dn);
-static void fixDN(char *dn);
-static char *dialogMessage; /* used by shutdownDialogProc */
-#define OLD_VERSION_SIZE 32
-static char oldVersion[OLD_VERSION_SIZE]; /* used by reinstall */
-
-static int
-my_snprintf(char *s, size_t size, const char *fmt, ...)
-{
-	int rc;
-	va_list ap;
-
-	va_start(ap, fmt);
-	rc = _vsnprintf(s, size, fmt, ap);
-	va_end(ap);
-	s[size-1] = (char)0;
-
-	return rc;
-}
-
-static void
-my_strncpy(char *dst, const char *src, size_t size)
-{
-	strncpy(dst, src, size-1);
-	dst[size-1] = (char)0;
-}
-
-static void
-storeUserDirectoryInfo()
-{
-	char *utf8UserGroupAdmin = NULL;
-	char *utf8UserGroupAdminPW = NULL;
-	char *utf8UserGroupURL = NULL;
-
-	if (mi.m_nReInstall == 1)
-		return; // do nothing if reinstall
-
-	if(mi.m_nExistingUG == 0)
-	{
-		/* the user is creating a new UG with this instance */
-		if(mi.m_nExistingMCC == 0)
-		{
-			/* the user is also creating a new MCC so set UG admin to MCC admin */
-			my_strncpy(mi.m_szUserGroupAdmin, mi.m_szMCCBindAs, sizeof(mi.m_szUserGroupAdmin));
-			my_strncpy(mi.m_szUserGroupAdminPW, mi.m_szMCCPw, sizeof(mi.m_szUserGroupAdminPW));
-
-		}else{
-			/* user is using an existing MCC so only creating UG, make UG user same as
-			   Root DN */
-			my_strncpy(mi.m_szUserGroupAdmin, mi.m_szInstanceUnrestrictedUser, sizeof(mi.m_szUserGroupAdmin));
-			my_strncpy(mi.m_szUserGroupAdminPW, mi.m_szInstancePassword, sizeof(mi.m_szUserGroupAdminPW));
-
-		}
-		my_snprintf(mi.m_szUserGroupURL, sizeof(mi.m_szUserGroupURL), "ldap://%s:%d/%s", mi.m_szInstanceHostName,
-				mi.m_nInstanceServerPort, mi.m_szInstanceSuffix);	
-	}
-
-	SetLdapUserDirInit(TRUE);
-
-	utf8UserGroupAdmin = localToUTF8(mi.m_szUserGroupAdmin);
-	utf8UserGroupAdminPW = localToUTF8(mi.m_szUserGroupAdminPW);
-	utf8UserGroupURL = localToUTF8(mi.m_szUserGroupURL);
-	SetLdapUserDirID(utf8UserGroupAdmin);
-	SetLdapUserDirPWD(utf8UserGroupAdminPW);
-	SetLdapUserDirURL(utf8UserGroupURL);
-	nsSetupFree(utf8UserGroupAdmin);
-	nsSetupFree(utf8UserGroupAdminPW);
-	nsSetupFree(utf8UserGroupURL);
-}
-
-/* converts server ID of the form slapd-foo to foo, and NULL to "" */
-static const char *
-getShortName(const char *serverID)
-{
-	const char *retval = serverID;
-	const char *prefix = "slapd-";
-	int preflen = strlen(prefix);
-
-	if (serverID && !strncmp(serverID, prefix, preflen))
-		retval = serverID + preflen;
-
-	if (!retval)
-		retval = "";
-
-	return retval;
-}
-
-static FILE*
-getLogFileP()
-{
-	static FILE* logfp = 0;
-
-	if (!getenv("USE_LOGFILE"))
-		return logfp;
-
-	if (!logfp)
-		logfp = fopen("c:\\debug.out", "w");
-
-	return logfp;
-}
-
-static void
-myLogData(const char *s, ...)
-{
-	FILE* logfp = getLogFileP();
-	va_list ap;
-
-	if (!logfp)
-		return;
-
-	va_start(ap, s);
-	vfprintf(logfp, s, ap);
-	va_end(ap);
-	fprintf(logfp, "\n");
-	fflush(logfp);
-}
-
-/* Will return a malloc'd "" if no error - so caller should always use LocalFree() with
-   the returned value
-*/
-static LPVOID
-getLastErrorMessage()
-{
-	LPVOID lpMsgBuf = NULL;
-
-	FormatMessage( 
-		FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-		NULL,
-		GetLastError(),
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-		(LPTSTR) &lpMsgBuf,
-		0,
-		NULL);
-
-	/* always return something . . . */
-	if (lpMsgBuf == NULL) {
-		lpMsgBuf = strdup("");
-	}
-
-	return lpMsgBuf;
-}	
-
-static void
-myLogError(const char *s, ...)
-{
-	va_list ap;
-	LPVOID lpMsgBuf;
-	FILE* logfp = getLogFileP();
-
-	if (!logfp)
-		return;
-
-	if (lpMsgBuf = getLastErrorMessage()) {
-		fprintf(logfp, "Error: %d (%s): at ", GetLastError(), lpMsgBuf);
-		// Free the buffer.
-		LocalFree( lpMsgBuf );
-	}
-
-	va_start(ap, s);
-	vfprintf(logfp, s, ap);
-	va_end(ap);
-}
-
-/*
-  prints a message if the given dn uses LDAPv2 style quoting
-*/
-void
-checkForLDAPv2Quoting(const char *dn_to_test)
-{
-	char *utf8dn = localToUTF8(dn_to_test);
-    if (ds_dn_uses_LDAPv2_quoting(utf8dn))
-    {
-		char *newdn = strdup(dn_to_test);
-		fixDN(newdn);
-		DSMessageBoxOK(WARN_USING_LDAPV2_QUOTES_TITLE,
-					   WARN_USING_LDAPV2_QUOTES,
-					   dn_to_test, dn_to_test, newdn);
-		free(newdn);
-    }
-	if (utf8dn)
-		nsSetupFree(utf8dn);
-
-    return;
-}
-
-int
-IsValidAdminDomain(
-	const char *host,
-	int port,
-	const char *suffix,
-	const char *admin_domain,
-	const char *binddn,
-	const char *binddnpwd
-)
-{
-	char ldapurl[4096];
-	int status = FALSE;
-	Ldap *ldap = NULL;
-
-	my_snprintf(ldapurl, sizeof(ldapurl), "ldap://%s:%d/%s", host, port, suffix);
-	if (createLdap(&ldap, ldapurl, binddn, binddnpwd, 0, 0) == OKAY)
-	{
-		LdapEntry *le = createLdapEntry(ldap);
-		char *dn = formAdminDomainDN(admin_domain);
-		if (le && dn && entryExists(le, dn))
-			status = TRUE;
-		if (dn)
-			nsSetupFree(dn);
-		if (le)
-			destroyLdapEntry(le);
-	}
-
-	if (ldap)
-		destroyLdap(ldap);
-
-	return status;
-}
-
-void ControlSlapdInstance(char *pszServiceName, BOOL bOn);
-static void ConvertPasswordToPin(char *pszServerRoot, char *pszServiceName);
-static void ReinstallUpgradeServer(char *pszServerRoot, char *pszServiceName);
-
-char *getGMT()
-{
-	static char		buf[20];
-	time_t		curtime;
-	struct tm	ltm;
-
-	curtime = time( (time_t *)0 );
-#ifdef _WIN32
-	ltm = *gmtime( &curtime );
-#else
-	gmtime_r( &curtime, &ltm );
-#endif
-	strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", &ltm );
-	return buf;
-}
-
-char *onezero2yesno(int value)
-{
-
-	if (1 == value)
-	{ 
-		return "yes";
-	}else{
-		return "no";
-	}
-
-}
-
-int yesno2onezero(char *value)
-{
-
-	if(!lstrcmpi("yes", value) )
-	{
-		return 1;
-	}else{
-		return 0;
-	}
-
-}
-
-////////////////
-///
-//	determine whether a string contains 8 bit characters 
-//
-static int
-contains8BitChars(const char *s)
-{
-    int ret = 0;
-
-    if (s && *s)
-    {
-                for (; !ret && *s; ++s)
-                {
-                        ret = (*s & 0x80);
-                }
-    }
-
-    return ret;
-}
-
-////////////////
-///
-//	determine whether a dn is valid or not 
-//
-static int
-isAValidDN(const char *dn_to_test)
-{
-	int ret = 1;
-
-	if (!dn_to_test || !*dn_to_test)
-	{
-		ret = 0;
-	}
-	else
-	{
-		char *utf8dn = localToUTF8(dn_to_test);
-		char **rdnList = ldap_explode_dn(utf8dn, 0);
-		char **rdnNoTypes = ldap_explode_dn(utf8dn, 1);
-		if (!rdnList || !rdnList[0] || !rdnNoTypes || !rdnNoTypes[0] ||
-			!*rdnNoTypes[0] || !stricmp(rdnList[0], rdnNoTypes[0]))
-		{
-			ret = 0;
-		}
-		if (rdnList)
-			ldap_value_free(rdnList);
-		if (rdnNoTypes)
-			ldap_value_free(rdnNoTypes);
-		if (utf8dn)
-			nsSetupFree(utf8dn);
-	}
-
-	if ((ret == 1) && dn_to_test)
-		checkForLDAPv2Quoting(dn_to_test);
-
-	return ret;
-}
-
-
-////////////////
-///
-//	check if DN is valid, display error if not 
-//  returns 1 if dn is valid
-//          0 if dn is invalid
-int isValidDN(char *dn)
-{
-	int nReturn;
-
-	if( 0 == (nReturn = isAValidDN(dn)) )
-		DSMessageBoxOK(ERR_INVALID_DN_TITLE, ERR_INVALID_DN, dn, dn);
-
-	return nReturn;
-}
-
-////////////////
-///
-//	check if port is valid, display error if not 
-//  returns 1 if port is valid
-//          0 if port is invalid
-int isValidPort(int port)
-{
-	int nReturn = 1;
-	if (port <= 0 || port > MAXPORT)
-	{
-		DSMessageBoxOK(ERR_INVALID_PORT_TITLE, ERR_INVALID_PORT, 0,
-					   port);
-		nReturn = 0;
-	}
-
-	return nReturn;
-}
-
-////////////////
-///
-//	get the components out of an ldapurl 
-//  
-//         
-
-int GetURLComponents(char *szURL, char *szHost, int *nPort, char *szBase)
-{
-
-	LDAPURLDesc *ludpp;
-
-	int res;
-
-	if ( ( res = ldap_url_parse( szURL, &ludpp ) ) != 0 )
-	{ 
-		return res;
-	}
-
-	if( NULL != ludpp->lud_host)
-	{
-	   my_strncpy(szHost, ludpp->lud_host, MAX_STR_SIZE);
-	}else{
-	   strcpy(szHost, "\0");
-	}
-
-	*nPort = ludpp->lud_port;
-
-	if( NULL != ludpp->lud_dn)
-	{
-	   my_strncpy(szBase, ludpp->lud_dn, MAX_STR_SIZE);
-	}else{
-	   strcpy(szBase, "\0");
-	}
-
-
-	ldap_free_urldesc( ludpp );
-
-	return 0;
-
-}
-
-////////////////
-///
-//
-//
-void StartWSA()
-{
-WORD wVersionRequested;
-WSADATA wsaData;
-int err;
- 
-wVersionRequested = MAKEWORD( 2, 0 );
- 
-err = WSAStartup( wVersionRequested, &wsaData );
-if ( err != 0 ) {
-    /* Tell the user that we couldn't find a usable */
-    /* WinSock DLL.                                  */
-	DSMessageBoxOK(ERR_NO_WINSOCK_TITLE, ERR_NO_WINSOCK, 0);
-    return;
-}
- 
-/* Confirm that the WinSock DLL supports 2.0.*/
-/* Note that if the DLL supports versions greater    */
-/* than 2.0 in addition to 2.0, it will still return */
-/* 2.0 in wVersion since that is the version we      */
-/* requested.                                        */
- 
-if ( LOBYTE( wsaData.wVersion ) != 2 ||
-        HIBYTE( wsaData.wVersion ) != 0 ) {
-    /* Tell the user that we couldn't find a usable */
-    /* WinSock DLL.                                  */
-	DSMessageBoxOK(ERR_NO_WINSOCK_VER_TITLE, ERR_NO_WINSOCK_VER, 0);
-    WSACleanup( );
-    return; 
-}
- 
-/* The WinSock DLL is acceptable. Proceed. */
-
-}
-
-////////////////
-//
-//
-//
-
-BOOL FullyQualifyHostName(char * HostName) 
-{ 
-    static char * domain = 0; 
-    struct hostent * hptr; 
-    BOOL bRC = TRUE;
-
- hptr = (struct hostent*)gethostbyname(HostName); 
- if (hptr) { 
-  /* See if h_name is fully-qualified */ 
-  if (hptr->h_name) { 
-   domain = strchr(hptr->h_name, '.'); 
-   sprintf(HostName,"%s",hptr->h_name); 
-   return bRC;
-  } 
-
-  /* Otherwise look for a fully qualified alias */ 
-  if ((domain == 0) && 
-   (hptr->h_aliases && hptr->h_aliases[0])) { 
-   char **p; 
-   for (p = hptr->h_aliases; *p; ++p) { 
-    domain = strchr(*p, '.'); 
-    if (domain) break; 
-   } 
-  } 
- } 
-
- if (domain != 0) 
- { 
-     if (domain[0] == '.') 
-     { 
-  ++domain; 
-     } 
-     sprintf(HostName,"%s.%s", HostName, domain); 
- } else 
- { 
-     bRC = FALSE;
- } 
-
- return bRC;
-} 
-
-/////////////////
-//
-//  UTF8IsValidLdapUser
-//
-//	converts necessary things to UTF8 before calling server
-//
-
-BOOL UTF8IsValidLdapUser(char *szHost, int nPort, char *szSuffix, char *szBindAs, char *szPw, BOOL bParam)
-{
-
-	char *utf8Host=NULL;
-	char *utf8Suffix=NULL;
-	char *utf8BindAs=NULL;
-	char *utf8Pw=NULL;
-	BOOL bReturn;
-	
-	/* convert to UTF8 first incase international data */
-	utf8Host = localToUTF8(szHost);
-	utf8Suffix = localToUTF8(szSuffix);
-	utf8BindAs = localToUTF8(szBindAs);
-	utf8Pw     = localToUTF8(szPw);
-
-	bReturn = IsValidLdapUser(utf8Host, nPort, utf8Suffix, &utf8BindAs, utf8Pw, bParam);
-
-	if( utf8Host)     nsSetupFree(utf8Host);
-	if( utf8Suffix)   nsSetupFree(utf8Suffix);
-	if( utf8BindAs)   nsSetupFree(utf8BindAs);
-	if( utf8Pw)       nsSetupFree(utf8Pw);
-
-	return bReturn;
-
-}
-					 
-/////////////////
-//
-//  UTF8IsValidAdminDomain
-//
-//	converts necessary things to UTF8 before calling server
-//
-
-BOOL UTF8IsValidAdminDomain(char *szHost, int nPort, char *szSuffix, char *szAdminDomain, char *szBindAs, char *szPw)
-{
-
-	char *utf8Host=NULL;
-	char *utf8Suffix=NULL;
-	char *utf8BindAs=NULL;
-	char *utf8Pw=NULL;
-	char *utf8AdminDomain=NULL;
-	BOOL bReturn;
-	
-	/* convert to UTF8 first incase international data */
-	utf8Host = localToUTF8(szHost);
-	utf8Suffix = localToUTF8(szSuffix);
-	utf8BindAs = localToUTF8(szBindAs);
-	utf8Pw     = localToUTF8(szPw);
-	utf8AdminDomain     = localToUTF8(szAdminDomain);
-
-	bReturn = IsValidAdminDomain(utf8Host, nPort, utf8Suffix, utf8AdminDomain, utf8BindAs, utf8Pw);
-
-	if( utf8Host)     nsSetupFree(utf8Host);
-	if( utf8Suffix)   nsSetupFree(utf8Suffix);
-	if( utf8BindAs)   nsSetupFree(utf8BindAs);
-	if( utf8Pw)       nsSetupFree(utf8Pw);
-	if( utf8AdminDomain)       nsSetupFree(utf8AdminDomain);
-
-	return bReturn;
-
-}
-					 
-
-void getAdminServInfo() 
-{
-  char *pszAdminSection="admin";
-  char szTempDir[MAX_PATH];
-  char szCacheFile[MAX_PATH];
-
-  GetEnvironmentVariable("TEMP", szTempDir, sizeof(szTempDir));
-
-  my_snprintf(szCacheFile, sizeof(szCacheFile), "%s\\install.inf", szTempDir);
-
-  mi.m_nAdminServerPort = GetPrivateProfileInt(pszAdminSection, SLAPD_KEY_ADMIN_SERVER_PORT, 
-					       -1, szCacheFile);
-  if (mi.m_nAdminServerPort == -1) {
-      myLogData("Warning: Could not determine admin server port for Directory Server Gateway and Orgchart configuration files. Please update them manually.");
-      mi.m_nAdminServerPort = DEFAULT_ADMIN_PORT;
-  }
-  
-}
-
-BOOL writeINFfile(const char *filename)
-{
-   FILE *fp = fopen(filename, "wb");
-
-   
-   if (NULL == fp)
-	   return FALSE;
-
-
-   if(0 == lstrcmp("\0", mi.m_szInstallDN) )
-   {
-      char * szAdminDN = NULL;
-      szAdminDN = formAdminDomainDN(mi.m_szAdminDomain);
-      if (szAdminDN)
-      {
-        my_snprintf(mi.m_szInstallDN, sizeof(mi.m_szInstallDN), szAdminDN);
-        nsSetupFree(szAdminDN);
-      }
-      else
-      {
-        //note probably should fail. 
-        LogData(NULL, "Warning: Slapd unable to Form Admin Domain, guessing");
-        my_snprintf(mi.m_szInstallDN, sizeof(mi.m_szInstallDN), "ou=%s, o=NetscapeRoot", mi.m_szAdminDomain);
-      }
-   }
- 
-   // write global section header
-   fprintf(fp, "[General]\n");
-   fprintf(fp, "%s= %s\n", GLOBAL_INF_LDAP_USED, "TRUE");
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SERVER_ADMIN_ID, mi.m_szMCCBindAs);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SERVER_ADMIN_PWD, mi.m_szMCCPw);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_FULL_MACHINE_NAME, mi.m_szInstanceHostName);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SERVER_ROOT, TARGETDIR);
-  
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_K_LDAP_URL, mi.m_szLdapURL);
-
-
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_ADMIN_DOMAIN, mi.m_szAdminDomain);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_USER_GROUP_LDAP_URL, mi.m_szUserGroupURL);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_USER_GROUP_ADMIN_ID, mi.m_szUserGroupAdmin);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_USER_GROUP_ADMIN_PWD, mi.m_szUserGroupAdminPW);
-
-   // write Admin section header.
-   getAdminServInfo(); /* Right now this only gets the admin port. If you want more,
-			  you'll have to change getAdminServInfo.*/
-   fprintf(fp, "\n[admin]\n");
-   fprintf(fp, "%s= %d\n", SLAPD_KEY_ADMIN_SERVER_PORT, mi.m_nAdminServerPort);
-
- 
-   // write DS section header
-   fprintf(fp, "\n[slapd]\n");
-   fprintf(fp, "%s= %d\n", SLAPD_KEY_SERVER_PORT, mi.m_nInstanceServerPort);
-   if(0 == mi.m_nExistingUG)
-   {
-		/* don't write this key when config only directory */
-	    /* config only directory when using existing data store */
-		fprintf(fp, "%s= %s\n", SLAPD_KEY_SUFFIX, mi.m_szInstanceSuffix);
-   }
-
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_USE_EXISTING_MC,
-		   onezero2yesno(mi.m_nExistingMCC));
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_USE_EXISTING_UG,
-		   onezero2yesno(mi.m_nExistingUG));
-
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_ROOTDN, mi.m_szInstanceUnrestrictedUser);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_ROOTDNPWD, mi.m_szInstancePassword);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SERVER_IDENTIFIER, mi.m_szServerIdentifier);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SLAPD_CONFIG_FOR_MC, onezero2yesno(mi.m_nCfgSspt) );	      
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_ADD_SAMPLE_ENTRIES, onezero2yesno(mi.m_nPopulateSampleEntries));
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_ADD_ORG_ENTRIES, onezero2yesno(mi.m_nPopulateSampleOrg));
-
-
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_USE_REPLICATION, onezero2yesno(
-		   (mi.m_nSetupConsumerReplication || mi.m_nSetupSupplierReplication) ));
-  
-   /* consumer replication settings */
-   fprintf(fp, "%s= %d\n", SLAPD_KEY_SETUP_CONSUMER, mi.m_nSetupConsumerReplication);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_CIR_HOST, mi.m_szConsumerHost);
-   fprintf(fp, "%s= %d\n", SLAPD_KEY_CIR_PORT, mi.m_nConsumerPort);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_CIR_SUFFIX, mi.m_szConsumerRoot);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_CIR_BINDDN, mi.m_szConsumerBindAs);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_CIR_BINDDNPWD, mi.m_szConsumerPw);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_CIR_SECURITY_ON, onezero2yesno(mi.m_nConsumerSSL));
-   fprintf(fp, "%s= %d\n", SLAPD_KEY_CIR_INTERVAL, mi.m_nCIRInterval);
-
-   if(!strcmp(DEFAULT_CIR_DAYS, mi.m_szCIRDays) )
-   {
-	   /* if default of all days write null to inf file as that is what cgi wants */
-		fprintf(fp, "%s=\n", SLAPD_KEY_CIR_DAYS);
-   }else{
-		fprintf(fp, "%s= %s\n", SLAPD_KEY_CIR_DAYS, mi.m_szCIRDays);
-   }
-
-   if(!strcmp(DEFAULT_CIR_TIMES, mi.m_szCIRTimes) )
-   {
-   	   /* if default of all times write null to inf file as that is what cgi wants */
-	   fprintf(fp, "%s=\n", SLAPD_KEY_CIR_TIMES);
-   }else{
-	   fprintf(fp, "%s= %s\n", SLAPD_KEY_CIR_TIMES, mi.m_szCIRTimes);
-   }
-   
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_REPLICATIONDN, mi.m_szSupplierDN);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_REPLICATIONPWD, mi.m_szSupplierPW);
-
- 
-   /* Supplier replication settings */
-   fprintf(fp, "%s= %d\n", SLAPD_KEY_SETUP_SUPPLIER, mi.m_nSetupSupplierReplication);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_CHANGELOGDIR,	mi.m_szChangeLogDbDir);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_CHANGELOGSUFFIX, mi.m_szChangeLogSuffix);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SIR_HOST, mi.m_szSupplierHost);
-   fprintf(fp, "%s= %d\n", SLAPD_KEY_SIR_PORT, mi.m_nSupplierPort);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SIR_SUFFIX, mi.m_szSupplierRoot);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SIR_BINDDN, mi.m_szSupplierBindAs);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SIR_BINDDNPWD, mi.m_szSupplierPw);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SIR_SECURITY_ON, onezero2yesno(mi.m_nSupplierSSL));
-
-   if(!strcmp(DEFAULT_SIR_DAYS, mi.m_szSIRDays) )
-   {
-	   /* if default of all days write null to inf file as that is what cgi wants */
-		fprintf(fp, "%s=\n", SLAPD_KEY_SIR_DAYS);
-   }else{
-		fprintf(fp, "%s= %s\n", SLAPD_KEY_SIR_DAYS, mi.m_szSIRDays);
-   }
-
-   if(!strcmp(DEFAULT_SIR_TIMES, mi.m_szSIRTimes) )
-   {
-   	   /* if default of all times write null to inf file as that is what cgi wants */
-	   fprintf(fp, "%s=\n", SLAPD_KEY_SIR_TIMES);
-   }else{
-	   fprintf(fp, "%s= %s\n", SLAPD_KEY_SIR_TIMES, mi.m_szSIRTimes);
-   }
-
-   fprintf(fp, "%s= %s\n", LOCAL_INF_CONFIG_CONSUMER_DN, onezero2yesno(mi.m_nConfigConsumerDN));
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_CONSUMERDN, mi.m_szConsumerDN);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_CONSUMERPWD, mi.m_szConsumerPW);
-  
-   
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_INSTALL_LDIF_FILE, mi.m_szPopLdifFile);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_DISABLE_SCHEMA_CHECKING, onezero2yesno(mi.m_nDisableSchemaChecking));
-
-   fprintf(fp, "%s= %d\n", LOCAL_INF_SNMP_ON, mi.m_nSNMPOn);
-   fprintf(fp, "%s= %s\n", SLAPD_INSTALL_LOG_FILE_NAME,	LOGFILE );
-
-   fclose(fp);
-
-   return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// isValidServerID(char *pszServerIdentifier)
-//
-// check if valid serverid, for n
-//
-
-BOOL isValidServerID(char *pszServerIdentifier)
-{
-
-	char *fullId;
-	char  line[MAX_PATH];
-	DWORD Result;
-    HKEY  hServerKey;
-	BOOL  bRC = TRUE;
-
-	/* first check that it only contains 7 bit characters */
-	if( contains8BitChars(pszServerIdentifier) )
-	{
-	    DSMessageBoxOK(ERR_8BIT_SERVID_TITLE, ERR_8BIT_SERVID, 0);	
-		bRC = FALSE;
-	}else{
-		/* looks ok, now check if it already exists */
-
-		/* for now just check registry to see if this server ID exists,
-			in future add might want to add more sanity checks */
-
-		size_t len = strlen(DS_ID_SERVICE) + strlen(pszServerIdentifier) + 2;
-		fullId = malloc(len);
-		sprintf(fullId, "%s-%s", DS_ID_SERVICE, pszServerIdentifier);
-
-		my_snprintf(line, sizeof(line), "%s\\%s", KEY_SERVICES, fullId); 
-   
-		Result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, 
-		                      line,
-			                  0,
-				              KEY_ALL_ACCESS,
-					          &hServerKey);
-
-
-		if (Result == ERROR_SUCCESS) 
-		{
-			/* it already exists */
-			DSMessageBoxOK(ERR_SERVER_ID_EXISTS_TITLE, ERR_SERVER_ID_EXISTS,
-						   getShortName(pszServerIdentifier),
-						   getShortName(pszServerIdentifier));	
-			bRC = FALSE;
-
-		}
-
-		free(fullId);
-	}
-
-	return bRC;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-// set_default_ldap_settings()
-//
-// hostname = getHostName
-// serverid = hostname up to first period  
-// suffix   = o=(rest of hostname) ie o=mcom.com
-// port     = 389
-// rootDn = DirectoryManager
-
-
-int set_default_ldap_settings()
-{
-
-    int i, j = 0;
-
-    DSGetHostName(mi.m_szInstanceHostName, MAX_STR_SIZE);
-    /* assumption: hostname up to first period for serverid */
-    for( i = 0; !(   (mi.m_szInstanceHostName[i] == '\0') 
-                  || (mi.m_szInstanceHostName[i] == '.' ) ); 
-         i++)
-    {
-        mi.m_szServerIdentifier[i] = mi.m_szInstanceHostName[i];
-    }
-    /* null terminate it */
-    mi.m_szServerIdentifier[i]='\0';
-	if (mi.m_szInstanceHostName[0] && strchr(mi.m_szInstanceHostName, '.'))
-	{
-		DSGetDefaultSuffix(mi.m_szInstanceSuffix, mi.m_szInstanceHostName);
-	}
-	else
-	{
-		strcpy(mi.m_szInstanceSuffix, "dc=example, dc=com");
-	}
-
-	/* default admin domain is also derived from the FQDN */
-	++i;
-	my_snprintf(mi.m_szAdminDomain, sizeof(mi.m_szAdminDomain), "%s", mi.m_szInstanceHostName+i);
-	
-    mi.m_nInstanceServerPort=DEFAULT_SERVER_PORT;
-                                    
-    my_snprintf(mi.m_szInstanceUnrestrictedUser, sizeof(mi.m_szInstanceUnrestrictedUser), DEFAULT_UNRESTRICTED_USER);
-
-    mi.m_nCfgSspt = DEFAULT_CONFIG_SSPT;
-
-	my_snprintf(mi.m_szSsptUid, sizeof(mi.m_szSsptUid), DEFAULT_SSPT_USER);
-
-    /* stevross: don't want default for these in silent mode, user must specify them */
-    if( SILENTMODE != MODE)
-    {
-        my_snprintf(mi.m_szSupplierDN, sizeof(mi.m_szSupplierDN), DEFAULT_SUPPLIER_DN);
-        my_snprintf(mi.m_szChangeLogSuffix, sizeof(mi.m_szChangeLogSuffix), DEFAULT_CHANGELOGSUFFIX);
-
-    }
-
-
-
-    /* don't want to use these unless they were asked in dialog, then this flag will be
-       changed */
-	mi.m_nSetupSupplierReplication = NO_REPLICATION;
-	mi.m_nSetupConsumerReplication = NO_REPLICATION;
-
-    mi.m_nUseSupplierSettings  = 0;
-    mi.m_nUseChangeLogSettings = 0;
-
-	
-	my_strncpy(mi.m_szSIRDays, DEFAULT_SIR_DAYS, sizeof(mi.m_szSIRDays));
-	my_strncpy(mi.m_szSIRTimes, DEFAULT_SIR_TIMES, sizeof(mi.m_szSIRTimes));
-	mi.m_nSupplierPort = DEFAULT_SERVER_PORT;
-
-    my_strncpy(mi.m_szCIRDays, DEFAULT_CIR_DAYS, sizeof(mi.m_szCIRDays));
-    my_strncpy(mi.m_szCIRTimes, DEFAULT_CIR_TIMES, sizeof(mi.m_szCIRTimes));
-	mi.m_nConsumerPort = DEFAULT_SERVER_PORT;
-
-	mi.m_nCIRInterval = DEFAULT_CIR_INTERVAL;
-
-	
-	/* default MCC settings */
-	my_strncpy(mi.m_szMCCSuffix, NS_DOMAIN_ROOT, sizeof(mi.m_szMCCSuffix));
-	mi.m_nMCCPort=DEFAULT_SERVER_PORT;
-
-	mi.m_szMCCBindAs = malloc(MAX_STR_SIZE);
-	my_snprintf(mi.m_szMCCBindAs, MAX_STR_SIZE, "%s", DEFAULT_SSPT_USER);
-
-	my_strncpy(mi.m_szUGSuffix, mi.m_szInstanceSuffix, sizeof(mi.m_szUGSuffix));
-	mi.m_nUGPort=DEFAULT_SERVER_PORT;
-	my_strncpy(mi.m_szUserGroupAdmin, DEFAULT_UNRESTRICTED_USER, sizeof(mi.m_szUserGroupAdmin));
-
-	mi.m_nPopulateSampleEntries = DEFAULT_POPULATE_SAMPLE_ENTRIES;
-	mi.m_nDisableSchemaChecking = DEFAULT_DISABLE_SCHEMA_CHECKING;
- 
-    return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-// verify_ldap_settings()
-// 
-// verifys that ldap settings are valid before installing instance  
-// 
-//
-int verify_ldap_settings()
-{
-    /* XXX stevross: may want to add checks for other things later */
-
-    /* for now just make sure port is valid */
-    if( IsValidNetworkPort( mi.m_nInstanceServerPort ) )
-    {
-        return 0;
-    }else{
-		DSMessageBoxOK(ERR_SERV_RUN_ON_PORT_TITLE, ERR_SERV_RUN_ON_PORT,
-					   0, mi.m_nInstanceServerPort);
-        return -1;
-    }
-
-
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-// set_ldap_settings()
-// 
-//  registers ldap settings with framework for use by other installers
-// 
-//
-
-void set_ldap_settings()
-{
-	
-	char *utf8MCCHost=NULL;
-	char *utf8MCCSuffix=NULL;
-	char *utf8MCCBindAs=NULL;
-	char *utf8MCCPw=NULL;
-	char *utf8AdminDomain=NULL;
-    char szFullAdminDN[MAX_STR_SIZE];
-
-	if(1 != mi.m_nExistingMCC && SILENTMODE != MODE)
-    {
-		/* this new instance will be MCC, but only copy over things
-			if not silent mode, in silent mode it will read correct
-			mcc stuff from the cache */
-		my_strncpy(mi.m_szMCCHost, mi.m_szInstanceHostName, sizeof(mi.m_szMCCHost));
-		mi.m_nMCCPort = mi.m_nInstanceServerPort;
-		my_strncpy(mi.m_szMCCSuffix, NS_DOMAIN_ROOT, sizeof(mi.m_szMCCSuffix));
-		my_snprintf(mi.m_szMCCBindAs, MAX_STR_SIZE, "%s", mi.m_szSsptUid);
-		my_strncpy(mi.m_szMCCPw, mi.m_szSsptUidPw, sizeof(mi.m_szMCCPw));
-
-	}
-
-	/* use existing MCC stuff we read in */
-
-	/* convert to UTF8 first for international stuff */
-	utf8MCCHost = localToUTF8(mi.m_szMCCHost);
-	utf8MCCSuffix = localToUTF8(mi.m_szMCCSuffix);
-	utf8MCCBindAs = localToUTF8(mi.m_szMCCBindAs);
-	utf8MCCPw     = localToUTF8(mi.m_szMCCPw);
-  
-    wsprintf(szFullAdminDN, NS_ADMIN_DOMAIN, mi.m_szAdminDomain);
-	utf8AdminDomain = localToUTF8(szFullAdminDN);
-	SetLdapHost(utf8MCCHost);
-	SetLdapPort(mi.m_nMCCPort);
-	SetLdapSuffix(utf8MCCSuffix);
-	SetLdapUser(utf8MCCBindAs);
-	SetLdapPassword(utf8MCCPw);
-	SetLdapInstallDN(utf8AdminDomain);
-
-	if( utf8MCCHost)     nsSetupFree(utf8MCCHost);
-	if( utf8MCCSuffix)   nsSetupFree(utf8MCCSuffix);
-	if( utf8MCCBindAs)   nsSetupFree(utf8MCCBindAs);
-	if( utf8MCCPw)       nsSetupFree(utf8MCCPw);
-	if( utf8AdminDomain) nsSetupFree(utf8AdminDomain);
-
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-// _DialogProcs
-//
-// The dialog procedure for a single property page.  You will need to create
-// one of these for each property page used in the property sheet.  This
-// procedure processes dialog messages sent to your property page by Windows.
-// See the Windows SDK documentation for more information about this function.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Setup8bitInputDisplay
-//
-// sets up dialog components to handle 8bit entry/display for I18n requirement
-//  
-// 
-//
-
-void Setup8bitInputDisplay(HWND hwndDlg, INT hControls[])
-{
-	INT i;
-
-	for(i=0; hControls[i] != -1; i++)
-	{
-		SendDlgItemMessage (hwndDlg, hControls[i], WM_SETFONT, 
-							(WPARAM) GetStockObject(DEFAULT_GUI_FONT) , MAKELPARAM(TRUE, 0)); 
-
-	}
-
-}
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// EnableControls
-//
-// toggles editable state of Fields
-//  
-// 
-//
-
-BOOL EnableControls(INT Controls[], HWND hwndDlg, BOOL bEnable)
-{
-	INT i;
-	HWND hControl;
-
-	for(i=0; Controls[i] != -1; i++)
-	{
-
-		hControl = GetDlgItem(hwndDlg,  Controls[i]);
-		EnableWindow(hControl, bEnable);
-	}
-
-	return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// EnableLDAPURLSettingsFields
-//
-// toggles editable state of MCC Settings Fields
-//  
-// 
-//
-
-BOOL EnableLDAPURLSettingsFields(HWND hwndDlg, BOOL bEnable)
-{
-	INT LDAPURL_Controls[]={IDC_EDIT_HOST,
-						IDC_EDIT_PORT,
-						IDC_EDIT_SUFFIX,
-						IDC_EDIT_BIND_AS,
-						IDC_EDIT_PW, -1};
-
-	EnableControls(LDAPURL_Controls, hwndDlg, bEnable);
-
-	return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// EnableConsumerDNFields
-//
-// toggles editable state of Consumer DN Fields
-//  
-// 
-//
-
-BOOL EnableConsumerDNFields(HWND hwndDlg, BOOL bEnable)
-{
-	INT Consumer_DN_Controls[]={IDC_EDIT_CONSUMER_DN,
-								IDC_EDIT_PASSWORD,
-								IDC_EDIT_PASSWORD_AGAIN,
-								-1};
-
-	EnableControls(Consumer_DN_Controls, hwndDlg, bEnable);
-
-	return TRUE;
-}
-
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-// SaveDlgServerInfo
-// 
-// Gets host, port, suffix, bind as, pw from dialog
-//  used for MCC Settings, UG Settings, Replication Agreement Dialogs
-//  
-
-void SaveDlgServerInfo(HWND hwndDlg, 
-					  PSZ pszHost, 
-					  INT *pnPort,
-					  PSZ pszSuffix,
-					  PSZ pszBindAs,
-					  PSZ pszPw)
-{
-	BOOL bTrans;
-
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_HOST,
-				   pszHost,
-				   MAX_STR_SIZE);
-
-	*pnPort = GetDlgItemInt(hwndDlg, 
-							IDC_EDIT_PORT,
-							&bTrans, 
-							FALSE);
-
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_SUFFIX,
-				   pszSuffix,
-				   MAX_STR_SIZE);
-
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_BIND_AS,
-				   pszBindAs,
-				   MAX_STR_SIZE);
-
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_PW,
-				   pszPw,
-				   MAX_STR_SIZE);
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-// LoadDlgServerInfo
-// 
-// Sets host, port, suffix, bind as, pw from dialog
-//  used for MCC Settings, UG Settings, Replication Agreement Dialogs
-//  
-
-void LoadDlgServerInfo(HWND hwndDlg, 
-					  PSZ pszHost, 
-					  INT nPort,
-					  PSZ pszSuffix,
-					  PSZ pszBindAs,
-					  PSZ pszPw)
-{
-	BOOL bResult;
-
-		  bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_HOST,
-				                   pszHost);
-		  if(FALSE == bResult)
-		  {
-			DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-	  
-		  bResult = SetDlgItemInt(hwndDlg,
-			                     IDC_EDIT_PORT,
-								 nPort,
-					             TRUE);
-		  if(FALSE == bResult)
-		  {
-			DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-
-		  bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_SUFFIX,
-				                   pszSuffix);
-		  if(FALSE == bResult)
-		  {
-			DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-		  bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_BIND_AS,
-				                   pszBindAs);
-		  if(FALSE == bResult)
-		  {
-			DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-		  bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_PW,
-				                   pszPw);
-		  if(FALSE == bResult)
-		  {
-			DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// VerifyServerInfo
-//
-// verifies Server settings are ok
-//  
-// Returns TRUE if there is an invalid setting
-// Returns FALSE if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
- 
-BOOL VerifyServerInfo(   PSZ pszHost, 
-						 INT *pnPort,
-						 PSZ pszSuffix,
-						 PSZ pszBindAs,
-						 PSZ pszPw,
-						 BOOL bVerifyBindAs)
-{
-	BOOL bValueReturned = TRUE;
-
-	if ( 0 == strlen( pszHost) )
-	{
-		DSMessageBoxOK(ERR_NO_HOST_TITLE, ERR_NO_HOST, 0);
-	} else if (  0 == *pnPort )
-	{
-		DSMessageBoxOK(ERR_NO_PORT_TITLE, ERR_NO_PORT, 0);
-	} else if ( 0 == strlen( pszSuffix) )
-	{
-		DSMessageBoxOK(ERR_NO_SUFFIX_TITLE, ERR_NO_SUFFIX, 0);
-	} else if ( !isValidDN(pszSuffix) )
-	{
-		/* error message displayed by isvalidDN */
-	} else if ( 0 == strlen( pszBindAs) )
-	{
-		DSMessageBoxOK(ERR_NO_BIND_DN_TITLE, ERR_NO_BIND_DN, 0);
-    }else if ( 0 == strlen( pszPw) )
-	{
-		DSMessageBoxOK(ERR_NO_PW_TITLE, ERR_NO_PW, 0);
-	} else if (contains8BitChars(pszPw) )
-	{
-
-		DSMessageBoxOK(ERR_8BIT_PW_TITLE, ERR_8BIT_PW, 0);  
-	} else
-	{
-		/* all settings look good */
-		bValueReturned = FALSE;
-	}
-
-	/* try to verify valid dn if need to and no 
-	   previous invalid fields */
-
-	if( !bValueReturned && bVerifyBindAs )
-	{
-		/* error message displayed by isvalidDN */
-		if ( !isValidDN(pszBindAs) )
-		{
-		    /* dn is invalid return true from here */
-			bValueReturned = TRUE;
-		}
-	} 
-
-	return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// SaveDialogInput_MCC_Settings
-//
-// save MCC settings entered on Dialog on back and next
-//  
-// 
-//
-
-void SaveDialogInput_MCC_Settings(HWND hwndDlg)
-{
-   
-	if( 1 == mi.m_nExistingMCC )
-	{
-	   SaveDlgServerInfo(hwndDlg,
-					     mi.m_szMCCHost, 
-						 &mi.m_nMCCPort,
-					     mi.m_szMCCSuffix,
-						 mi.m_szMCCBindAs,
-					     mi.m_szMCCPw);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// VerifyDialogInput_MCC_Settings
-//
-// verify MCC settings entered on Dialog on back and next
-//  
-// 
-// Returns TRUE if there is an invalid setting
-// Returns FALSE if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
-
-
-BOOL Verify_MCC_Settings()
-{
-   BOOL bValueReturned = FALSE;
-
-    /* only check if configuring to use existing MCC */
-	if (1 == mi.m_nExistingMCC)
-	{
-		if( FALSE == ( bValueReturned = VerifyServerInfo(mi.m_szMCCHost, 
-								   &mi.m_nMCCPort,
-								   mi.m_szMCCSuffix,
-								   mi.m_szMCCBindAs,
-								   mi.m_szMCCPw,
-								   FALSE) ) )
-		{
-		   /* server info ok, now check rest of the settigns */
-			if (FALSE == FullyQualifyHostName(mi.m_szMCCHost) )
-			{
-			    /* can't qualify host name, must be invalid */
-             	DSMessageBoxOK(ERR_INVALID_HOST_TITLE, ERR_INVALID_HOST,
-							   mi.m_szMCCHost, mi.m_szMCCHost);
-				bValueReturned = TRUE;               
-			} else
-			{
-				/* now that all settings entered, check to see if valid user */
-				if (FALSE == (UTF8IsValidLdapUser( mi.m_szMCCHost, 
-												   mi.m_nMCCPort, 
-												   mi.m_szMCCSuffix, 
-												   mi.m_szMCCBindAs, 
-												   mi.m_szMCCPw, 
-												   FALSE) ) )
-				{
-					DSMessageBoxOK(ERR_CANT_FIND_DS_TITLE,
-								   ERR_CANT_FIND_DS, 0,
-								   mi.m_szMCCHost,
-								   mi.m_nMCCPort,
-								   mi.m_szMCCBindAs);
-					bValueReturned = TRUE;
-				}
-				/* now that all settings entered, find admin domain */
-				else if ((CUSTOMMODE != MODE) &&
-						 (FALSE == (UTF8IsValidAdminDomain( mi.m_szMCCHost, 
-												   mi.m_nMCCPort, 
-												   mi.m_szMCCSuffix, 
-												   mi.m_szAdminDomain, 
-												   mi.m_szMCCBindAs, 
-												   mi.m_szMCCPw) ) ) )
-				{
-					DSMessageBoxOK(ERR_CANT_FIND_ADMIN_DOMAIN_TITLE,
-								   ERR_CANT_FIND_ADMIN_DOMAIN, mi.m_szAdminDomain,
-								   mi.m_szAdminDomain,
-								   mi.m_szMCCHost,
-								   mi.m_nMCCPort,
-								   mi.m_szMCCBindAs);
-					bValueReturned = TRUE;
-				}
-
-				/* all settings good */
-
-				/* don't want to cfg sspt if already have mcc user */
-				mi.m_nCfgSspt = 0;
-			}
-
-		}
-
-	}
-
-	return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// MCC_Settings_DialogProc
-//
-// dialog proc to choose MCC server settings
-//  
-// 
-//
-
-static BOOL CALLBACK
-MCC_Settings_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-
-  /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_HOST,
-						IDC_EDIT_SUFFIX,
-						IDC_EDIT_BIND_AS,
-						IDC_EDIT_PW, -1};
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-
-		 Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-		 ShowWindow(GetDlgItem(hwndDlg, IDC_EDIT_SUFFIX), FALSE);
-		 ShowWindow(GetDlgItem(hwndDlg, IDC_STATIC_MCC_SUFFIX), FALSE);
-
-         break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-	
-		if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_USE_EXISTING_SERVER) )
-		{
-			EnableLDAPURLSettingsFields(hwndDlg, TRUE);
-			mi.m_nExistingMCC = 1;
-		}else if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_USE_THIS_SERVER) ){
-			EnableLDAPURLSettingsFields(hwndDlg, FALSE);
-			mi.m_nExistingMCC = 0;
-		}
-
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-		  LoadDlgServerInfo(hwndDlg,
-							mi.m_szMCCHost,
-							mi.m_nMCCPort,
-							mi.m_szMCCSuffix,
-							mi.m_szMCCBindAs,
-							mi.m_szMCCPw);
-		  
-		  CheckRadioButton(hwndDlg, IDC_RADIO_USE_THIS_SERVER, 
-									IDC_RADIO_USE_EXISTING_SERVER, 
-							( (1 == mi.m_nExistingMCC) ? IDC_RADIO_USE_EXISTING_SERVER : 
-									IDC_RADIO_USE_THIS_SERVER));
-
-	      if(1 == mi.m_nExistingMCC)
-		  {
-			EnableLDAPURLSettingsFields(hwndDlg, TRUE);
-		  }else{
-			EnableLDAPURLSettingsFields(hwndDlg, FALSE);
-		  }
-
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-
-		   SaveDialogInput_MCC_Settings(hwndDlg);
-  
-		   /* first dialog, so send wizback to previous module */
-		   mi.m_nResult = NS_WIZBACK;
-           SendMessage(GetParent(hwndDlg), WM_CLOSE, 0, 0);
-
-          break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-
-  	      SaveDialogInput_MCC_Settings(hwndDlg);
-          if( TRUE == (bValueReturned = Verify_MCC_Settings() ) )
-		  {
-			  // one of the settings was invalid so stay on this page
-			  SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-		  }
-
-	      break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-// SaveDialogInput_ReInstall
-// 
-// saves settings entered in ReInstall Dlg
-//  
-
-void SaveDialogInput_ReInstall(HWND hwndDlg)
-{
-
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_BIND_AS,
-				   mi.m_szMCCBindAs,
-				   MAX_STR_SIZE);
-
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_PW,
-				   mi.m_szMCCPw,
-				   MAX_STR_SIZE);
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Verify_ReInstall
-//
-// verify ReInstall settings entered on Dialog on back and next
-//  
-// 
-// Returns TRUE if there is an invalid setting
-// Returns FALSE if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
-
-
-BOOL Verify_ReInstall()
-{
-	BOOL bValueReturned = FALSE;
-
-	/* Get URL components so we can verify all MCC settings */
-	if( GetURLComponents(mi.m_szLdapURL, mi.m_szMCCHost, 
-						 &mi.m_nMCCPort, mi.m_szMCCSuffix) != 0)
-	{
-		/* error Getting URL Components*/
-		DSMessageBoxOK(ERR_NO_CONFIG_URL_TITLE, ERR_NO_CONFIG_URL, 0);
-		bValueReturned = TRUE;
-	}else{
-
-	    /* since we have all MCC info, 
-		   pass it thorugh Verify_MCC_Settings 
-		   to do all the same verifications.*/
-
-		/* set this to one so MCC Settings get checked */
-	    mi.m_nExistingMCC = 1;
-
-		bValueReturned = Verify_MCC_Settings();
-	}
-
-	return bValueReturned;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// ReInstall Dialog Proc
-//
-// ask configuration information needed on reinstall
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-ReInstall_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-    
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_BIND_AS,
-					   -1}; 
-  
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-          char * szLdapUrl;
-
-        case PSN_SETACTIVE:
-          
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-			/* This dialog is displayed in the following ways */
-			/*		Creating MCC Custom & normal mode ( after MCC admin page) */
-			/*	or															  */
-			/*		Using existing MCC Custom Mode Only  (after MCC Settings Page ) */
-      
-      szLdapUrl = stripConfigLdapURL(mi.m_szLdapURL);
-			bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_CONFIG_URL_VAL,
-		                           szLdapUrl);
-		    if(FALSE == bResult)
-			{
-		        DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-			}
-
-			bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_BIND_AS,
-		                           mi.m_szMCCBindAs);
-		    if(FALSE == bResult)
-			{
-				DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-			}
-
-			bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_PW,
-		                           mi.m_szMCCPw);
-		    if(FALSE == bResult)
-			{
-				DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-			}
-		
-			CenterWindow(GetParent(hwndDlg));
-            PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		  
-		  SaveDialogInput_ReInstall(hwndDlg);
-			
-		  // this is only dialog, so set back to go to other module */
-
-		  mi.m_nResult = NS_WIZBACK;
-		  SendMessage(GetParent(hwndDlg), WM_CLOSE, 0, 0);
-			
-		  break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-		
-			SaveDialogInput_ReInstall(hwndDlg);
-		    if (TRUE == (bValueReturned = Verify_ReInstall() ) )
-			{  
-			    /* setting is invalid stay on this page */
-				SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			}else{
-
-				/* everything looks ok */
- 		   
-				// this is only dialog, so set back to go to other module */
-				mi.m_nResult = NS_WIZNEXT;
-				SendMessage(GetParent(hwndDlg), WM_CLOSE, 0, 0);
-			}
-
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-//	SaveDialogInput_AdminDomain
-// 
-// 
-//  save settings entered in admin domain dialog proc
-// 
-//
-
-void SaveDialogInput_AdminDomain(HWND hwndDlg)
-{
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_ADMIN_DOMAIN,
-				   mi.m_szAdminDomain,
-				   MAX_STR_SIZE);
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-//	Verify_AdminDomain
-// 
-// 
-// verify and save settings entered in admin domain dialog proc
-// 
-// Returns TRUE if there is an invalid setting
-// Returns False if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
-
-BOOL VerifyAdminDomain()
-{
-	BOOL bValueReturned = TRUE;
-
-	if(0 == strlen(mi.m_szAdminDomain) ) 
-	{
-		DSMessageBoxOK(ERR_NO_ADMIN_DOMAIN_TITLE, ERR_NO_ADMIN_DOMAIN, 0);
-	}else if(isAValidDN(mi.m_szAdminDomain) ){
-		/* admin domain is not allowed to be a DN, so if it is
-			prompt user and return error */
-		DSMessageBoxOK(ERR_ADMIN_DOMAIN_DN_TITLE, ERR_ADMIN_DOMAIN_DN,
-					   mi.m_szAdminDomain, mi.m_szAdminDomain);
-	}else if (0 == mi.m_nExistingMCC){
-		/* we are creating the Config Directory, so we don't need to check if
-		   the admin domain is present */
-		bValueReturned = FALSE;
-	/* now that all settings entered, find admin domain */
-	}else if (FALSE == (UTF8IsValidAdminDomain( mi.m_szMCCHost, 
-												mi.m_nMCCPort, 
-												mi.m_szMCCSuffix, 
-												mi.m_szAdminDomain, 
-												mi.m_szMCCBindAs, 
-												mi.m_szMCCPw) ) )
-	{
-		DSMessageBoxOK(ERR_CANT_FIND_ADMIN_DOMAIN_TITLE,
-					   ERR_CANT_FIND_ADMIN_DOMAIN, mi.m_szAdminDomain,
-					   mi.m_szAdminDomain,
-					   mi.m_szMCCHost,
-					   mi.m_nMCCPort,
-					   mi.m_szMCCBindAs);
-		bValueReturned = TRUE;
-	}else{
-	   /* all settings ok, return false */
-	   bValueReturned = FALSE;
-	}
-
-	return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Admin Domain Dialog Proc
-//
-// dialog proc to ask for admin domain
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-AdminDomain_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-    
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_ADMIN_DOMAIN
-					   -1}; 
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-	  case PSN_SETACTIVE:
-		  // This notification is sent upon activation of the property page.
-		  // The property sheet should be centered each time it is activated
-		  // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-		  /* This dialog is displayed in the following ways */
-		  /*		Creating MCC Custom & normal mode ( after MCC admin page) */
-		  /*	or															  */
-		  /*		Using existing MCC Custom Mode Only  (after MCC Settings Page ) */
-
-		
-		  if(1 == mi.m_nExistingMCC )
-		  {
-			  /* not creating an MCC so don't ask this page */
-			  SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			  return TRUE;
-		  }
-		
-		  bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_ADMIN_DOMAIN,
-		                           mi.m_szAdminDomain);
-		  if(FALSE == bResult)
-		  {
-			  DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-
-		  CenterWindow(GetParent(hwndDlg));
-		  PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-	  case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-	  case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		  SaveDialogInput_AdminDomain(hwndDlg);
-
-		  break;
-
-	  case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-		  SaveDialogInput_AdminDomain(hwndDlg);
-		  if (TRUE == (bValueReturned = VerifyAdminDomain() ) )
-		  {  
-			  /* setting is invalid stay on this page */
-			  SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-		  }
-
-		  break;
-
-	  case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-			  if (QueryExit(hwndDlg)) 
-			  {
-				  mi.m_nResult = NS_WIZCANCEL;
-			  }
-			  else
-			  {
-				  SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-				  bValueReturned = TRUE;
-			  }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Admin Domain Custom Dialog Proc
-//
-// dialog proc to ask for admin domain in custom mode when we are installing
-// into existing MCC
-// 
-// basically the same as Admin Domain with some added code to lookup domain
-// kind of lame to duplicate code, but this was the best way to get flow to match unix
-//
-
-static BOOL CALLBACK
-AdminDomainCustom_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-    
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_ADMIN_DOMAIN
-					   -1}; 
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-	  case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-		  /* This dialog is displayed in the following ways */
-		  /*		Creating MCC Custom & normal mode ( after MCC admin page) */
-		  /*	or															  */
-		  /*		Using existing MCC Custom Mode Only  (after MCC Settings Page ) */
-
-		
-		  /* only display this page in Custom Mode if installing into existing MCC */
-		  if( (0 == mi.m_nExistingMCC) || CUSTOMMODE != MODE)
-		  {
-			  /* dont display this page */
-			  SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			  return TRUE;
-		  }
-	
-		  /* since we are installing into existing mcc we can search it for admin domains */
-			
-		  /* stevross: add code to search for admin domains here */
-
-		
-		  bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_ADMIN_DOMAIN,
-		                           mi.m_szAdminDomain);
-		  if(FALSE == bResult)
-		  {
-			  DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-
-		  CenterWindow(GetParent(hwndDlg));
-		  PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-	  case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-	  case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-   		  SaveDialogInput_AdminDomain(hwndDlg);
-		  break;
-
-	  case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-   		  SaveDialogInput_AdminDomain(hwndDlg);
-  		  if (TRUE == (bValueReturned = VerifyAdminDomain() ) )
-		  {
-			  /* setting is invalid stay on this page */
-			  SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-	      }
-		  break;
-
-	  case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-			  if (QueryExit(hwndDlg)) 
-			  {
-				  mi.m_nResult = NS_WIZCANCEL;
-			  }
-			  else
-			  {
-				  SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-				  bValueReturned = TRUE;
-			  }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-//  SaveDialogInput_UG_Settings(HWND hwndDlg)
-// 
-//  Save values entered in UG dialog on back and next
-// 
-//
-
-void SaveDialogInput_UG_Settings(HWND hwndDlg)
-{
-
-	if (1 == mi.m_nExistingUG)
-	{
-		SaveDlgServerInfo(hwndDlg,
-						 mi.m_szUGHost, 
-						 &mi.m_nUGPort,
-						 mi.m_szUGSuffix,
-						 mi.m_szUserGroupAdmin,
-						 mi.m_szUserGroupAdminPW);
-	}
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-// Verify_UG_Settings()
-// 
-//  verify values entered in UG dialog on back and next
-// 
-//
-
-BOOL Verify_UG_Settings()
-{
-	BOOL bValueReturned = FALSE;
-
-	/* only verify if installing into existing UG */
-	if (1 == mi.m_nExistingUG)
-	{
-		bValueReturned = VerifyServerInfo(mi.m_szUGHost, 
-										  &mi.m_nUGPort,
-										  mi.m_szUGSuffix,
-										  mi.m_szUserGroupAdmin,
-										  mi.m_szUserGroupAdminPW,
-										  FALSE);
-
-		if (FALSE == bValueReturned)
-		{
-			/* server info looks ok, now check the rest of the stuff */
-
-			if (FALSE == FullyQualifyHostName(mi.m_szUGHost) )
-			{
-				/* failed to fully qualify host name */
-				DSMessageBoxOK(ERR_INVALID_HOST_TITLE,
-							   ERR_INVALID_HOST,
-							   mi.m_szUGHost, mi.m_szUGHost);
-				bValueReturned = TRUE;                   
-			} else
-			{
-				/* now that all settings entered, check to see if valid user */
-				if (FALSE == UTF8IsValidLdapUser(mi.m_szUGHost, mi.m_nUGPort, 
-												 mi.m_szUGSuffix,
-												 mi.m_szUserGroupAdmin,
-												 mi.m_szUserGroupAdminPW,
-												 FALSE) )
-				{
-
-					DSMessageBoxOK(ERR_CANT_FIND_DS_TITLE,
-								   ERR_CANT_FIND_DS, 0, mi.m_szUGHost,
-								   mi.m_nUGPort, mi.m_szUserGroupAdmin);
-					bValueReturned = TRUE;
-				} else
-				{
-					/* all settings good */
-					/* set UG LDAP URL */
-					my_snprintf(mi.m_szUserGroupURL, sizeof(mi.m_szUserGroupURL), "ldap://%s:%d/%s",
-							mi.m_szUGHost, mi.m_nUGPort, mi.m_szUGSuffix);
-				}
-			}
-		}
-	}
-	return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// UG_Settings_DialogProc
-//
-// dialog proc to choose User Group server settings
-//  
-// 
-//
-
-static BOOL CALLBACK
-UG_Settings_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  CHAR szTemp[MAX_STR_SIZE]	= {0};
-
-  /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_HOST,
-						IDC_EDIT_SUFFIX,
-						IDC_EDIT_BIND_AS,
-						IDC_EDIT_PW, -1};
-
-  
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-
-		 Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-         break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-	
-		if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_USE_EXISTING_SERVER) )
-		{
-			EnableLDAPURLSettingsFields(hwndDlg, TRUE);
-			mi.m_nExistingUG = 1;
-		}else if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_USE_THIS_SERVER) ){
-			EnableLDAPURLSettingsFields(hwndDlg, FALSE);
-			mi.m_nExistingUG = 0;
-		}
-
-
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-	
-		  /* setup static text with user and group strings */		
-
-		  /* don't want to show this page if not installing into an existing MCC */
-		  if( 1 == mi.m_nExistingMCC)
-		  {
-		      /* dont display this page */
-			  SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			  return TRUE;
-		  }
-
-	      LoadString( mi.m_hModule, IDS_UG_DESC, szTemp, MAX_STR_SIZE);
-		 		  
-		  bResult = SetDlgItemText(hwndDlg, 
-		                           IDC_STATIC_DESC,
-		                           szTemp);
-		  if(FALSE == bResult)
-		  {
-	          DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-	      LoadString( mi.m_hModule, IDS_UG_GB_DESC, szTemp, MAX_STR_SIZE);
-		 		  
-		  bResult = SetDlgItemText(hwndDlg, 
-		                           IDC_STATIC_SETTINGS,
-		                           szTemp);
-		  if(FALSE == bResult)
-		  {
-	          DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-		  
-
-	      LoadString( mi.m_hModule, IDS_UG_RADIO_CREATE, szTemp, MAX_STR_SIZE);
-		 		  
-		  bResult = SetDlgItemText(hwndDlg, 
-		                           IDC_RADIO_USE_THIS_SERVER,
-		                           szTemp);
-		  if(FALSE == bResult)
-		  {
-	          DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-	      LoadString( mi.m_hModule, IDS_UG_RADIO_EXIST, szTemp, MAX_STR_SIZE);
-		 		  
-		  bResult = SetDlgItemText(hwndDlg, 
-		                           IDC_RADIO_USE_EXISTING_SERVER,
-		                           szTemp);
-		  if(FALSE == bResult)
-		  {
-	          DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-		  /* set defaults for text edit fields in this dialog */
-		  LoadDlgServerInfo(hwndDlg,
-							mi.m_szUGHost,
-							mi.m_nUGPort,
-							mi.m_szUGSuffix,
-							mi.m_szUserGroupAdmin,
-							mi.m_szUserGroupAdminPW);
-	
-				
-		  CheckRadioButton(hwndDlg, IDC_RADIO_USE_THIS_SERVER, 
-									IDC_RADIO_USE_EXISTING_SERVER, 
-							( (1 == mi.m_nExistingUG) ? IDC_RADIO_USE_EXISTING_SERVER : 
-									IDC_RADIO_USE_THIS_SERVER));
-		  
-	      if(1 == mi.m_nExistingUG)
-		  {
-			EnableLDAPURLSettingsFields(hwndDlg, TRUE);
-		  }else{
-			EnableLDAPURLSettingsFields(hwndDlg, FALSE);
-		  }
-
-
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-          SaveDialogInput_UG_Settings(hwndDlg);
-          break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-          SaveDialogInput_UG_Settings(hwndDlg);
-		  if(TRUE == (bValueReturned = Verify_UG_Settings() ) )
-		  {
-			 /* one of the settings was invalid */
-             SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-  	      }
-	      break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// SaveDialogInput_Server_Settings
-//
-// save settings entered in Server_Setting_DialogProc 
-//  called on back and next
-// 
-// 
-//
-void SaveDialogInput_Server_Settings(HWND hwndDlg)
-{
-   	BOOL bResult        = FALSE;
-
-	GetDlgItemText(hwndDlg,
-				   IDC_EDIT_SERVER_IDENTIFIER,
-				   mi.m_szServerIdentifier,
-				   MAX_STR_SIZE);
-
-	/* get the suffix */
-	GetDlgItemText(hwndDlg,
-				   IDC_EDIT_SUFFIX,
-				   mi.m_szInstanceSuffix,
-				   MAX_STR_SIZE);
-
-	mi.m_nInstanceServerPort = (int ) GetDlgItemInt(hwndDlg,
-													IDC_EDIT_SERVER_PORT,
-													&bResult,
-													TRUE);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Verify_Server_Settings
-//
-// verify settings entered in Server_Setting_DialogProc
-// 
-// Returns TRUE if there is an invalid setting
-// Returns FALSE if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
-
-BOOL Verify_Server_Settings()
-{
-	BOOL bValueReturned = TRUE;
-
-	if ( 0 == strlen(mi.m_szServerIdentifier) )
-	{
-		/* no value entered for server id */
-		DSMessageBoxOK(ERR_NO_SERVER_ID_TITLE, ERR_NO_SERVER_ID, 0);
-	} else if (FALSE == isValidServerID(mi.m_szServerIdentifier) )
-	{
-		/* server id is invalid */
-		/* error reported by isValidServerID */   
-	} else if (0 == strlen(mi.m_szInstanceSuffix) && !mi.m_nExistingUG )
-	{
-		/* ok not to specify suffix when using existing UG hence above
-		   otherwise it must be specified */
-	    /* no value entered for suffix */
-		DSMessageBoxOK(ERR_NO_SUFFIX_TITLE, ERR_NO_SUFFIX, 0);
-    }else if (!mi.m_nExistingUG && !isValidDN(mi.m_szInstanceSuffix) )
-	{
-		/* don't check dn if ExistingUG since suffix is null */
-		/* error message displayed by isValidDN */
-	} else if ( !isValidPort(mi.m_nInstanceServerPort))
-	{
-		/* error displayed by isValidPort */
-	}else{
-       	/* all items in this dialogue look good */
-		bValueReturned = FALSE;
-	}
-
-	return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Server_Settings_DialogProc
-//
-// dialog proc to choose server settings
-// 
-// used by typical mode 
-// 
-//
-
-static BOOL CALLBACK
-Server_Settings_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  HWND hCtrl; 
-
-  /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_SERVER_IDENTIFIER, 
-					   IDC_EDIT_SUFFIX, 
-					   -1}; 
-  INT nCmdShow = SW_SHOW;
-  static CHAR szSavedSuffix[MAX_STR_SIZE]="\0";
-
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-
-	  SendDlgItemMessage(hwndDlg, IDC_SPIN_SERVER_PORT, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_EDIT_SERVER_PORT), 0);
-	  SendDlgItemMessage(hwndDlg, IDC_SPIN_SERVER_PORT, UDM_SETRANGE, 0, MAKELONG((short)UD_MAXVAL, (short)1));
-
-	  my_strncpy(szSavedSuffix, mi.m_szInstanceSuffix, sizeof(szSavedSuffix));
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-		  if(mi.m_nExistingUG)
-		  {
-  			/* hide suffix when creating config only directory */
-			if( 0 != strlen(mi.m_szInstanceSuffix) )
-			{
-				my_strncpy(szSavedSuffix, mi.m_szInstanceSuffix, sizeof(szSavedSuffix));
-				memset(mi.m_szInstanceSuffix, '\0', MAX_STR_SIZE);
-			}
-			nCmdShow = SW_HIDE;
-		  }else{
-			my_strncpy(mi.m_szInstanceSuffix, szSavedSuffix, sizeof(mi.m_szInstanceSuffix));
-			nCmdShow = SW_SHOW;
-		  }
-
-		  hCtrl = GetDlgItem(hwndDlg, IDC_EDIT_SUFFIX);
-		  ShowWindow(hCtrl,nCmdShow);
-
-		  hCtrl = GetDlgItem(hwndDlg, IDC_STATIC_SUFFIX);
-		  ShowWindow(hCtrl,nCmdShow);
-
-
-	      bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_SERVER_IDENTIFIER,
-			                       mi.m_szServerIdentifier);
-		  if(FALSE == bResult)
-		  {
-		      DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-  		  bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_SUFFIX,
-				                   mi.m_szInstanceSuffix);
-		  if(FALSE == bResult)
-		  {
-		  	  DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-		  bResult = SetDlgItemInt(hwndDlg,
-			                      IDC_EDIT_SERVER_PORT,
-			                      mi.m_nInstanceServerPort,
-					              TRUE);
-		  if(FALSE == bResult)
-		  {
-		  	  DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-		  
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		  SaveDialogInput_Server_Settings(hwndDlg);
-		  // save the suffix typed in by the user
-		  my_strncpy(szSavedSuffix, mi.m_szInstanceSuffix, sizeof(szSavedSuffix));
-          break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-   		  SaveDialogInput_Server_Settings(hwndDlg);
-		  // save the suffix typed in by the user
-		  my_strncpy(szSavedSuffix, mi.m_szInstanceSuffix, sizeof(szSavedSuffix));
-		  if( TRUE == (bValueReturned =  Verify_Server_Settings()) )
-		  {
-			  /* one of the settings was invalid stay on this page */
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-		  }
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// BOOL SaveDialogPasswords
-//
-// helper for ROOTDN and SUITESPOTDN Dialogs
-// 
-// 
-// saves passwords entered into dialog
-//
-// 
-
-void SaveDialogPasswords(HWND hwndDlg, PSZ pszPassword, PSZ pszPasswordAgain)
-{
-
-	GetDlgItemText(hwndDlg,
-				   IDC_EDIT_PASSWORD,
-				   pszPassword,
-				   MAX_STR_SIZE);
-
-
-	GetDlgItemText(hwndDlg,
-				   IDC_EDIT_PASSWORD_AGAIN,
-				   pszPasswordAgain,
-				   MAX_STR_SIZE);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// BOOL LoadDialogPasswords
-//
-// helper for ROOTDN and SUITESPOTDN Dialogs
-// 
-// 
-// loads passwords entered into dialog
-//
-// 
-void LoadDialogPasswords(HWND hwndDlg, PSZ pszPassword, PSZ pszPasswordAgain)
-{
-
-   BOOL bResult;
-
-   bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_PASSWORD,
-			                       pszPassword);
-   if(FALSE == bResult)
-   {
-	  DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-   }
-
-   if (pszPasswordAgain)
-   {
-	   bResult = SetDlgItemText(hwndDlg, 
-								IDC_EDIT_PASSWORD_AGAIN,
-								pszPasswordAgain);
-	   if(FALSE == bResult)
-	   {
-		   DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-	   }
-   }
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// BOOL VerifyPasswords
-//
-// helper for ROOTDN and SUITESPOTDN Dialogs
-// 
-// 
-// check that passwords are valid
-//
-// Returns TRUE if there is an invalid setting
-// Returns False if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
- 
-
-BOOL VerifyPasswords(PSZ pszPassword, PSZ pszPasswordAgain, UINT min_pw_len)
-{
-	BOOL bValueReturned = TRUE;
-
-	if (min_pw_len > strlen(pszPassword))
-	{
-		/* password failed minimum length check */
-		DSMessageBoxOK(ERR_PW_TOO_SHORT_TITLE, ERR_PW_TOO_SHORT, 0,
-					   min_pw_len);
-		
-	} else if ( contains8BitChars(pszPassword) )
-	{
-		/* check to make sure pw doesn't contain any 8bit chars */
-		DSMessageBoxOK(ERR_8BIT_PW_TITLE, ERR_8BIT_PW, 0);  
-
-	} else if ( 0 == strlen(pszPasswordAgain) )
-	{
-		/* second password to verify missing */
-
-		DSMessageBoxOK(ERR_NO_PW_AGAIN_TITLE, ERR_NO_PW_AGAIN, 0);
-	} else if ( 0 != lstrcmp(pszPassword, pszPasswordAgain) )
-	{
-		/* passwords don't match */
-		DSMessageBoxOK(ERR_PW_DIFFER_TITLE, ERR_PW_DIFFER, 0);
-	}else{
-	    /* passwords satisfied all checks so return false */
-		bValueReturned = FALSE;
-	}
-
-	return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// SaveDialogInput_RootDN
-//
-// saves input in root dn DialogProc
-// 
-// 
-// 
-//
-
-void SaveDialogInput_ROOTDN(HWND hwndDlg)
-{
-	BOOL bValueReturned = FALSE;
-	UINT uResult        = 0;
-	BOOL bResult        = FALSE;
-
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_UNRESTRICTED_USER,
-				   mi.m_szInstanceUnrestrictedUser,
-				   MAX_STR_SIZE);
-
-
-	SaveDialogPasswords(hwndDlg, 
-						mi.m_szInstancePassword,
-						mi.m_szInstancePasswordAgain);
-			
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Verify_RootDN
-//
-// verifies input in root dn DialogProc
-// 
-
-//
-// Returns TRUE if there is an invalid setting
-// Returns FALSE if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
-
-BOOL Verify_ROOTDN()
-{
-	BOOL bValueReturned = FALSE;
-
-	if (  0 == strlen(mi.m_szInstanceUnrestrictedUser) )
-	{
-		/* no value entered */
-		DSMessageBoxOK(ERR_NO_ROOT_DN_TITLE, ERR_NO_ROOT_DN, 0);
-		bValueReturned = TRUE;
-	}else if ( !isValidDN(mi.m_szInstanceUnrestrictedUser) )
-	{
-	    /* error message displayed by isvalidDN */
-		bValueReturned = TRUE;
-	} else
-	{
-		/* only bother to check passwords if username is valid */
-		bValueReturned = VerifyPasswords(mi.m_szInstancePassword,
-									     mi.m_szInstancePasswordAgain,
-										 SLAPD_MIN_PW_LEN);
-    }
-	return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// RootDN_DialogProc
-//
-// dialog proc for the RootDN install page
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-RootDN_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_UNRESTRICTED_USER, 
-					   IDC_EDIT_PASSWORD, 
-					   IDC_EDIT_PASSWORD_AGAIN,
-					   -1}; 
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-	      bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_UNRESTRICTED_USER,
-			                       mi.m_szInstanceUnrestrictedUser);
-		  if(FALSE == bResult)
-		  {
-			  DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-		  LoadDialogPasswords(hwndDlg, 
-							  mi.m_szInstancePassword,
-							  mi.m_szInstancePasswordAgain);
-
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		  SaveDialogInput_ROOTDN(hwndDlg);
-          break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-			SaveDialogInput_ROOTDN(hwndDlg);
-			if ( FALSE == (bValueReturned = Verify_ROOTDN() ) )
-			{
-
-				/* all settings on this dialogue look good */
-
-				/* verify ldap settings */
-				if (0 != verify_ldap_settings() )
-				{
-					/* dont allow next until settings corrected */
-					SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-					bValueReturned = TRUE;
-
-				} else
-				{
-					/* set ldap settings for other installs */
-					set_ldap_settings();
-
-				}
-                
-				/* if not advanced mode move on to other installs */
-				if (CUSTOMMODE != MODE)
-				{
-					mi.m_nResult = NS_WIZNEXT;
-					SendMessage(GetParent(hwndDlg), WM_CLOSE, 0, 0);                
-				}
-			} else
-			{
-				/* one of the settings was invalid, stay on this page */
-				SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			}
-
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  SaveDialogInput_SuitespotId
-//
-// 
-
-//
-void SaveDialogInput_SuitespotId(HWND hwndDlg)
-{
-
-
-
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_SUITESPOT_USER,
-				   mi.m_szSsptUid,
-				   MAX_STR_SIZE);
-
-
-	SaveDialogPasswords(hwndDlg, 
-						mi.m_szSsptUidPw,
-						mi.m_szSsptUidPwAgain);
-
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  Verify_SuitespotId
-//
-// Returns TRUE if there is an invalid setting
-// Returns FALSE if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
-
-BOOL Verify_SuitespotId()
-{
-
-	BOOL bValueReturned = FALSE;
-
-	if ( 0 == strlen(mi.m_szSsptUid) )
-	{
-		/* no value entered for sspt user */
-		DSMessageBoxOK(ERR_NO_SS_ADMIN_TITLE, ERR_NO_SS_ADMIN, 0);
-		bValueReturned = TRUE;
-	} else if (!isAValidDN(mi.m_szSsptUid) &&
-			   contains8BitChars(mi.m_szSsptUid))
-	{
-		/* admin uid value not 7 bit */
-		DSMessageBoxOK(ERR_8BIT_UID_TITLE, ERR_8BIT_UID, 0);
-		bValueReturned = TRUE;		
-	} else
-	{
-		/* only bother to check passwords if username is valid */
-		bValueReturned = VerifyPasswords(mi.m_szSsptUidPw,
-									     mi.m_szSsptUidPwAgain,
-										 SSPT_MIN_PW_LEN);
-	}
-
-	return bValueReturned;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// SuitespotID_DialogProc
-//
-// dialog proc for the SUITESPOTID install page
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-SuitespotID_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-    
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_SUITESPOT_USER, 
-					   IDC_EDIT_PASSWORD, 
-					   IDC_EDIT_PASSWORD_AGAIN,
-					   -1}; 
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-		  if(1 == mi.m_nExistingMCC)
-		  {
-		      /* don't display this dialog if using existing MCC since asked for it 
-			     there */
-	          SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              return TRUE;
-		  }
-
-          bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_SUITESPOT_USER,
-		                           mi.m_szSsptUid);
-		  if(FALSE == bResult)
-		  {
-		      DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-		  LoadDialogPasswords(hwndDlg, 
-							  mi.m_szSsptUidPw,
-							  mi.m_szSsptUidPwAgain);
-
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-			// Set the result code NS_WIZBACK to indicate this action and close
-			// the property sheet using brute force.  If this procedure is not
-			// being used by the first property sheet, you should ignore this
-			// notification and simply let windows go to the previous page.
-			//
-			// NOTE: To prevent the wizard from stepping back, return -1.
-
-
-			SaveDialogInput_SuitespotId(hwndDlg);
-
-			// in express mode this is the first dialog, so set back to go to other module */
-
-			if (EXPRESSMODE == MODE)
-			{
-				mi.m_nResult = NS_WIZBACK;
-				SendMessage(GetParent(hwndDlg), WM_CLOSE, 0, 0);
-			}
-			
-
-		  break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-		  SaveDialogInput_SuitespotId(hwndDlg);
-		  if(TRUE == (bValueReturned = Verify_SuitespotId() ) )
-		  {
-			/* one of the settings was invalid stay on this page */
-			 SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-		  }
-		   
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Admin_ID_Only_DialogProc
-//
-// dialog proc for the ADMIN_ID_ONLY install page
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-Admin_ID_Only_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-    
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_SUITESPOT_USER, 
-					   IDC_EDIT_PASSWORD, 
-					   -1}; 
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-          bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_SUITESPOT_USER,
-		                           mi.m_szMCCBindAs);
-		  if(FALSE == bResult)
-		  {
-		      DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-		  LoadDialogPasswords(hwndDlg, 
-							  mi.m_szMCCPw,
-							  0);
-
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-			// The user clicked the back button from the first property page.
-			// Set the result code NS_WIZBACK to indicate this action and close
-			// the property sheet using brute force.  If this procedure is not
-			// being used by the first property sheet, you should ignore this
-			// notification and simply let windows go to the previous page.
-			//
-			// NOTE: To prevent the wizard from stepping back, return -1.
-
-			GetDlgItemText(hwndDlg, 
-						   IDC_EDIT_SUITESPOT_USER,
-						   mi.m_szMCCBindAs,
-						   MAX_STR_SIZE);
-			GetDlgItemText(hwndDlg, 
-						   IDC_EDIT_PASSWORD,
-						   mi.m_szMCCPw,
-						   MAX_STR_SIZE);
-
-			// in express mode this is the first dialog, so set back to go to other module */
-
-			if (EXPRESSMODE == MODE)
-			{
-				mi.m_nResult = NS_WIZBACK;
-				SendMessage(GetParent(hwndDlg), WM_CLOSE, 0, 0);
-			}
-			
-
-			break;
-
-        case PSN_WIZNEXT:
-			// The user clicked the next button from the last property page.
-			// Set the result code NS_WIZNEXT to indicate this action and close
-			// the property sheet using brute force.  If this procedure is not
-			// being used by the last property sheet, you should ignore this
-			// notification and simply let windows go to the next page.
-			//
-			// NOTE: To prevent the wizard from stepping ahead, return -1.
-			GetDlgItemText(hwndDlg, 
-						   IDC_EDIT_SUITESPOT_USER,
-						   mi.m_szMCCBindAs,
-						   MAX_STR_SIZE);
-			GetDlgItemText(hwndDlg, 
-						   IDC_EDIT_PASSWORD,
-						   mi.m_szMCCPw,
-						   MAX_STR_SIZE);
-			if(TRUE == (bValueReturned = Verify_MCC_Settings() ) )
-			{
-				/* one of the settings was invalid stay on this page */
-				SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			}
-		   
-			break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Choose_Replication_DialogProc
-//
-// choose the type of replicatin to do, determine which pages to ask next
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-Choose_Replication_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
- 
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-
-        /* consumer replication */
-        if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_NO_CONSUMER_REPLICATION ) )
-        {
-            mi.m_nSetupConsumerReplication = NO_REPLICATION;
-        }else if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_CONSUMER_CIR ) ){
-            mi.m_nSetupConsumerReplication = CONSUMER_CIR_REPLICATION;
-        }else if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_CONSUMER_SIR ) ){
-            mi.m_nSetupConsumerReplication = CONSUMER_SIR_REPLICATION;
-        }
-
-        /* supplier replication */
-        if( BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_NO_SUPPLIER_REPLICATION ) )
-        {
-            mi.m_nSetupSupplierReplication = NO_REPLICATION;
-        }else if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_SUPPLIER_CIR ) ){
-            mi.m_nSetupSupplierReplication = SUPPLIER_CIR_REPLICATION;
-        }else if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_SUPPLIER_SIR ) ){
-            mi.m_nSetupSupplierReplication = SUPPLIER_SIR_REPLICATION;
-        }
-     
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-	       /* set buttons for appropriate replication type */
-			if(CONSUMER_CIR_REPLICATION == mi.m_nSetupConsumerReplication)
-			{
-				CheckDlgButton(hwndDlg, IDC_RADIO_CONSUMER_CIR, BST_CHECKED); 
-			}else if(CONSUMER_SIR_REPLICATION == mi.m_nSetupConsumerReplication){ 
-				CheckDlgButton(hwndDlg, IDC_RADIO_CONSUMER_SIR, BST_CHECKED); 
-			}else{
-				CheckDlgButton(hwndDlg, IDC_RADIO_NO_CONSUMER_REPLICATION, BST_CHECKED); 
-			}
-
-			if(SUPPLIER_CIR_REPLICATION == mi.m_nSetupSupplierReplication)
-			{
-				CheckDlgButton(hwndDlg, IDC_RADIO_SUPPLIER_CIR, BST_CHECKED); 
-			}else if(SUPPLIER_SIR_REPLICATION == mi.m_nSetupSupplierReplication){ 
-				CheckDlgButton(hwndDlg, IDC_RADIO_SUPPLIER_SIR, BST_CHECKED); 
-			}else{
-				CheckDlgButton(hwndDlg, IDC_RADIO_NO_SUPPLIER_REPLICATION, BST_CHECKED); 
-			}
-
-	        CenterWindow(GetParent(hwndDlg));
-		    PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		   
-		  // simple dialog, all button state gets saved in WM_COMMAND proccessing
-  		  break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-		  
-		  // simple dialog, all button state gets saved in WM_COMMAND proccessing
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// SaveDialogInput_Consumer_Replication
-//
-// save settings from ConsumerReplication Dialog
-// 
-// 
-// 
-//
-
-void SaveDialogInput_Consumer_Replication(HWND hwndDlg)
-{
-
-
-	if ( CONSUMER_SIR_REPLICATION  == mi.m_nSetupConsumerReplication  )
-	{
-
-		GetDlgItemText(hwndDlg, 
-					   IDC_EDIT_SUPPLIER_DN,
-					   mi.m_szSupplierDN,
-					   MAX_STR_SIZE);
-
-
-
-		SaveDialogPasswords(hwndDlg, 
-							mi.m_szSupplierPW,
-							mi.m_szSupplierPWAgain);
-
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Verify_Consumer_Replication
-//
-// save settings from ConsumerReplication Dialog
-// 
-// 
-// Returns TRUE if there is an invalid setting
-// Returns FALSE if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
-
-
-BOOL Verify_Consumer_Replication()
-{
-    BOOL bValueReturned = FALSE;
-
-	/* only check if configuring consumer replication */
-	if ( CONSUMER_SIR_REPLICATION  == mi.m_nSetupConsumerReplication  )
-	{
-
-		if ( 0 == strlen(mi.m_szSupplierDN) )
-		{
-			/* no value entered for Supplier DN */
-			DSMessageBoxOK(ERR_NO_SUPPLIER_DN_TITLE,
-						   ERR_NO_SUPPLIER_DN, 0);
-			bValueReturned = TRUE;
-		}else if ( !isValidDN(mi.m_szSupplierDN) )
-		{
-			/* error message displayed by isvalidDN */
-			bValueReturned = TRUE;
-		} else
-		{
-
-			bValueReturned = VerifyPasswords(mi.m_szSupplierPW,
-										     mi.m_szSupplierPWAgain,
-											 SLAPD_MIN_PW_LEN);
-	    }
-	}
-	return bValueReturned;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Consumer_Replication_DialogProc
-//
-// ask common settings needed for this server to be a consumer
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-Consumer_Replication_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_SUPPLIER_DN, 
-					   IDC_EDIT_PASSWORD, 
-					   IDC_EDIT_PASSWORD_AGAIN,
-					   -1}; 
-  
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-     
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-          if( CONSUMER_SIR_REPLICATION  != mi.m_nSetupConsumerReplication )
-          {
-            /* we only want this dialog for Consumer SIR replication */
-            SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-            return TRUE;
-
-          }
-
-          bResult = SetDlgItemText(hwndDlg, 
-		                           IDC_EDIT_SUPPLIER_DN,
-		                           mi.m_szSupplierDN);
-		  if(FALSE == bResult)
-		  {
-	          DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-		  
-		  LoadDialogPasswords(hwndDlg, 
-							mi.m_szSupplierPW,
-							mi.m_szSupplierPWAgain);
-
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		  SaveDialogInput_Consumer_Replication(hwndDlg);
-
-  		  break;
-
-        case PSN_WIZNEXT:
-			// The user clicked the next button from the last property page.
-			// Set the result code NS_WIZNEXT to indicate this action and close
-			// the property sheet using brute force.  If this procedure is not
-			// being used by the last property sheet, you should ignore this
-			// notification and simply let windows go to the next page.
-			//
-			// NOTE: To prevent the wizard from stepping ahead, return -1.
-			SaveDialogInput_Consumer_Replication(hwndDlg);
-			if( TRUE == (bValueReturned = Verify_Consumer_Replication() ) )
-			{
-			   /* a setting was invalid stay on this page*/
-               SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			}else{
-                /* all settings on this dialogue look good */
-		
-				/* these settings were specified, ok to use them */
-				mi.m_nUseSupplierSettings = 1;
-			}
-
-			break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// SaveDialogInput_Supplier_Replication
-//
-// save supplier settings
-// 
-// 
-// 
-//
-
-void SaveDialogInput_Supplier_Replication(HWND hwndDlg)
-{
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_CHANGELOG_DB_DIR,
-				   mi.m_szChangeLogDbDir,
-				   MAX_STR_SIZE);
-
-
-	GetDlgItemText(hwndDlg, 
-				   IDC_EDIT_CHANGELOG_DB_SUFFIX,
-				   mi.m_szChangeLogSuffix,
-				   MAX_STR_SIZE);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Verify_Supplier_Replication
-//
-// save supplier settings
-// 
-// 
-// Returns TRUE if there is an invalid setting
-// Returns FALSE if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
-
-BOOL Verify_Supplier_Replication()
-{
-	BOOL bValueReturned = TRUE;
-
-	if ( 0 == strlen(mi.m_szChangeLogDbDir) )
-	{
-		DSMessageBoxOK(ERR_NO_CHANGELOG_DB_TITLE,
-					   ERR_NO_CHANGELOG_DB, 0);
-	} else if ( contains8BitChars(mi.m_szChangeLogDbDir) )
-	{
-		/* make sure the path doesnt contain international characters */
-		DSMessageBoxOK(ERR_8BIT_PATH_TITLE, ERR_8BIT_PATH, 0);    
-	} else if ( 0 == strlen(mi.m_szChangeLogSuffix) )
-	{
-		DSMessageBoxOK(ERR_NO_CHANGELOG_SUFFIX_TITLE,
-					   ERR_NO_CHANGELOG_SUFFIX, 0);
-    } else if ( !isValidDN(mi.m_szChangeLogSuffix) )
-	{
-		/* error message displayed by isValidDN */
-	}else{
-	    /* all settings lookg good */
-	    bValueReturned = FALSE;
-	}
-	return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Supplier_Replication_DialogProc
-//
-// ask common settings for this server to be a suppplier
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-Supplier_Replication_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  static INT nInitialized = 0;
-  
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_CHANGELOG_DB_DIR, 
-					   IDC_EDIT_CHANGELOG_DB_SUFFIX, 
-					   -1}; 
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-		Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-	        // need to initialize the changelog dir the first time
-		// this dialog is created. This is because 
-		// the default values are set on dllMain and it wouldn't
-		// pick up the users change of target dir to calculate it
-		// reason for nInitialized is so it doesn't blow away 
-		// users changes after leaving module and window is recreated
-		// and wm_init is called again
-		if( !nInitialized )
-		{
-			my_snprintf(mi.m_szChangeLogDbDir, sizeof(mi.m_szChangeLogDbDir),"%s\\%s-%s\\%s", TARGETDIR,  
-				      DS_ID_SERVICE, mi.m_szServerIdentifier, DEFAULT_CHANGELOGDIR);
-			nInitialized = 1;
-		}
-
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-          if( NO_REPLICATION == mi.m_nSetupSupplierReplication)
-          {
-            /* we dont want to display this page unless this server is a supplier*/
-            SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-            return TRUE;
-
-          }
-
-		                                
-	      bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_CHANGELOG_DB_SUFFIX,
-				                     mi.m_szChangeLogSuffix);
-		  if(FALSE == bResult)
-		  {
-			  DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
- 		  bResult = SetDlgItemText(hwndDlg, 
-				                     IDC_EDIT_CHANGELOG_DB_DIR,
-					                 mi.m_szChangeLogDbDir);
-		  if(FALSE == bResult)
-		  {
-		      DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		  SaveDialogInput_Supplier_Replication(hwndDlg); 
-  		  break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-			SaveDialogInput_Supplier_Replication(hwndDlg); 
-
-			if ( FALSE == (bValueReturned = Verify_Supplier_Replication() ) )
-			{
-				/* all settings look good */
-				/* user chose these settings through dialog so use them */
-				mi.m_nUseChangeLogSettings = 1;   
-			}else{
-				/* one of the settings is invalid, stay on this page */
-                SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			}
-			break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// SaveDialogInput_Consumer_DN
-//
-// 
-// save input for Consumer DN dialog
-// 
-//
-
-void SaveDialogInput_Consumer_DN(HWND hwndDlg)
-{
-
-	if (1 == mi.m_nConfigConsumerDN)
-	{
-		GetDlgItemText(hwndDlg, 
-					   IDC_EDIT_CONSUMER_DN,
-					   mi.m_szConsumerDN,
-					   MAX_STR_SIZE);
-
-		SaveDialogPasswords(hwndDlg, 
-							mi.m_szConsumerPW,
-							mi.m_szConsumerPWAgain);
-
-
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Verify_Consumer_DN
-//
-// 
-// verify input for Consumer DN dialog
-// 
-// Returns TRUE if there is an invalid setting
-// Returns FALSE if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
-
-BOOL Verify_Consumer_DN()
-{
-
-   BOOL bValueReturned = FALSE;
-
-    /* only verify if trying to use these settings */
-	if (1 == mi.m_nConfigConsumerDN)
-	{
-
-		if ( 0 == strlen(mi.m_szConsumerDN) )
-		{
-			/* no value entered for consumer dn */
-			DSMessageBoxOK(ERR_NO_CONSUMER_DN_TITLE, ERR_NO_CONSUMER_DN, 0);
-			bValueReturned = TRUE;
-	    }else if ( !isValidDN(mi.m_szConsumerDN) )
-		{
-		/* error message displayed by isvalidDN */
-			bValueReturned = TRUE;
-		} else
-		{
-			/* only bother to check passwords if username is valid */
-			bValueReturned = VerifyPasswords(mi.m_szConsumerPW,
-											 mi.m_szConsumerPWAgain,
-											 SLAPD_MIN_PW_LEN);
-		}
-
-	}
-	return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Consumer_DN_DialogProc
-//
-// dialog proc for the Consumer DN page 
-// displayed only under Supplier CIR replication
-// 
-//
-
-static BOOL CALLBACK
-Consumer_DN_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-    
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_CONSUMER_DN, 
-					   IDC_EDIT_PASSWORD,
-					   IDC_EDIT_PASSWORD_AGAIN,
-					   -1};
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-	  my_snprintf(mi.m_szConsumerDN, sizeof(mi.m_szConsumerDN), "%s,%s", DEFAULT_CONSUMER_DN, mi.m_szInstanceSuffix);
-
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-
-		if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_CONFIG_CONSUMER_DN_YES) )
-		{
-			EnableConsumerDNFields(hwndDlg, TRUE);
-			mi.m_nConfigConsumerDN = 1;
-		}else if(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_CONFIG_CONSUMER_DN_NO) ){
-			EnableConsumerDNFields(hwndDlg, FALSE);
-			mi.m_nConfigConsumerDN = 0;
-		}
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-          if( SUPPLIER_CIR_REPLICATION  != mi.m_nSetupSupplierReplication  )
-          {
-            /* we only ask consumer dn for supplier cir*/
-            SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-            return TRUE;
-
-          }
-		
-	      bResult = SetDlgItemText(hwndDlg, 
-			                       IDC_EDIT_CONSUMER_DN,
-				                   mi.m_szConsumerDN);
-		  if(FALSE == bResult)
-		  {
-		      DSMessageBoxOK(ERR_INIT_DIALOG_TITLE, ERR_INIT_DIALOG, 0);
-		  }
-
-	  	  LoadDialogPasswords(hwndDlg, 
-			   				  mi.m_szConsumerPW,
-							  mi.m_szConsumerPWAgain);
-
-
-  		  CheckRadioButton(hwndDlg, IDC_RADIO_CONFIG_CONSUMER_DN_YES, IDC_RADIO_CONFIG_CONSUMER_DN_NO, 
-							( (1 == mi.m_nConfigConsumerDN) ? IDC_RADIO_CONFIG_CONSUMER_DN_YES : 
-									IDC_RADIO_CONFIG_CONSUMER_DN_NO));
-
-
-		  if(1 == mi.m_nConfigConsumerDN)
-		  {
-			EnableConsumerDNFields(hwndDlg, TRUE);
-		  }else{
-			EnableConsumerDNFields(hwndDlg, FALSE);
-		  }
-
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		  SaveDialogInput_Consumer_DN(hwndDlg);
-          break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-  		  SaveDialogInput_Consumer_DN(hwndDlg);
-		  if( TRUE == (bValueReturned = Verify_Consumer_DN(hwndDlg) ) )
-		  {
-			  /* one of the settings is invalid, stay on this page */
-    		  SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-		  }
-
-		  
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// SetDlgReplDays
-//
-// helper function to convert string to checked days in repl agreement dialog proc
-// 
-// 
-// 
-//                           
-
-   
-BOOL SetDlgReplDays(HWND hwndDlg, 
-                            PSZ szReplDays)
-{
-	INT Days[7] = {0};
-	INT i, tmp=0;
-	INT DayControls[] ={IDC_CHECK_SUN, IDC_CHECK_MON, IDC_CHECK_TUE,
-						IDC_CHECK_WED, IDC_CHECK_THUR, IDC_CHECK_FRI,
-						IDC_CHECK_SAT, -1};
-
-	for(i=0; szReplDays != NULL && szReplDays[i] != '\0'; i++)
-	{
-		tmp = ( (INT) szReplDays[i] ) - ASCII_ZERO;
-		if( tmp >= 0 && tmp < 7)
-		{
-			CheckDlgButton(hwndDlg, DayControls[tmp], BST_CHECKED); 
-		}
-
-	}
-	
-	return TRUE;
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// GetDlgReplDays
-//
-// helper function to convert checked days to string for repl agreement dialog procs
-// 
-// 
-// 
-//                           
-	
-
-BOOL GetDlgReplDays(HWND hwndDlg, 
-                            PSZ szReplDays)
-{
-	INT Days[7] = {0};
-	INT i, pos;
-	INT DayControls[] ={IDC_CHECK_SUN, IDC_CHECK_MON, IDC_CHECK_TUE,
-						IDC_CHECK_WED, IDC_CHECK_THUR, IDC_CHECK_FRI,
-						IDC_CHECK_SAT, -1};
-	pos=0;
-	for(i=0; DayControls[i] != -1; i++)
-	{
-		
-		if( IsDlgButtonChecked(hwndDlg, DayControls[i]) )
-		{
-			szReplDays[pos]=(char) (i + ASCII_ZERO);
-			pos++;
-		}
-
-	}
-	szReplDays[pos]='\0';
-	
-	return TRUE;
-
-}						
-
-//////////////////////////////////////////////////////////////////////////////
-// SetDlgReplTimes
-//  Initialize Time Controls/Spinners in ReplAgreementDlgProc
-//	
-// 
-// 
-//
-
-BOOL SetDlgReplTimes(HWND hwndDlg, PSZ szTimes)
-{
-	  CHAR s_hh[3]="\0", s_mm[3]="\0";
-	  CHAR e_hh[3]="\0", e_mm[3]="\0";
-	  INT i;
-	  	   
-	  for(i=0; i <2; i++)
-	  {
-		s_hh[i] = szTimes[i];
-		s_mm[i] = szTimes[i+2];
-		e_hh[i] = szTimes[i+5];
-		e_mm[i] = szTimes[i+7];
-	  }
-
-	  SetDlgItemText(hwndDlg, IDC_EDIT_REPL_START_TIME_HH, s_hh);
-	  SetDlgItemText(hwndDlg, IDC_EDIT_REPL_START_TIME_MM, s_mm);
-
-	  SetDlgItemText(hwndDlg, IDC_EDIT_REPL_END_TIME_HH, e_hh);
-	  SetDlgItemText(hwndDlg, IDC_EDIT_REPL_END_TIME_MM, e_mm);
-
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_START_TIME_HH, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_EDIT_REPL_START_TIME_HH), 0);
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_START_TIME_HH, UDM_SETRANGE, 0, MAKELONG((short)23, (short)0));
-
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_START_TIME_MM, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_EDIT_REPL_START_TIME_MM), 0);
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_START_TIME_MM, UDM_SETRANGE, 0, MAKELONG((short)59, (short)0));
-
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_END_TIME_HH, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_EDIT_REPL_END_TIME_HH), 0);
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_END_TIME_HH, UDM_SETRANGE, 0, MAKELONG((short)23, (short)0));
-
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_END_TIME_MM, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_EDIT_REPL_END_TIME_MM), 0);
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_END_TIME_MM, UDM_SETRANGE, 0, MAKELONG((short)59, (short)0));
-	 
-
-	  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// writeTime
-//  make Time Component always be 2 digits
-//	
-// 
-// 
-//
-BOOL writeTime(int nn, char *szTime)
-{
-	  if( nn > 9)
-	  {
-		sprintf(szTime, "%d", nn);
-	  }else{
-		sprintf(szTime, "0%d", nn);
-	  }
-
-  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// GetDlgReplTimes
-//  Get Repl Times From the Dialog
-//	
-// 
-// 
-//
-
-BOOL GetDlgReplTimes(HWND hwndDlg, PSZ szTimes)
-{
-	  CHAR s_hh[3]="\0", s_mm[3]="\0";
-	  CHAR e_hh[3]="\0", e_mm[3]="\0";
-	  INT  ns_hh, ns_mm;
-	  INT  ne_hh, ne_mm;
-	  BOOL bTrans;
-
-	  ns_hh = GetDlgItemInt(hwndDlg, IDC_EDIT_REPL_START_TIME_HH, &bTrans, FALSE);
-	  ns_mm = GetDlgItemInt(hwndDlg, IDC_EDIT_REPL_START_TIME_MM, &bTrans, FALSE);
-	  ne_hh = GetDlgItemInt(hwndDlg, IDC_EDIT_REPL_END_TIME_HH, &bTrans, FALSE);
-      ne_mm = GetDlgItemInt(hwndDlg, IDC_EDIT_REPL_END_TIME_MM, &bTrans, FALSE);
-
-	  	   
-	  writeTime(ns_hh, s_hh);
-	  writeTime(ns_mm, s_mm);
-	  writeTime(ne_hh, e_hh);
-	  writeTime(ne_mm, e_mm);
-
-	  sprintf(szTimes, "%s%s-%s%s", s_hh, s_mm, e_hh, e_mm);
-	 
-	  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// SaveDlgReplAgreement
-//
-// save information for replication agreements from dialog
-// 
-// 
-// 
-
-void SaveDlgReplAgreement(HWND hwndDlg, 
-						  PSZ pszReplHost, 
-						  INT *pnReplPort,
-						  PSZ pszReplRoot,
-						  PSZ pszReplBindAs,
-						  PSZ pszReplPw,
-						  PSZ pszReplDays,
-						  PSZ pszReplTimes)
-{
-
-	SaveDlgServerInfo(hwndDlg,
-					  pszReplHost, 
-					  pnReplPort,
-					  pszReplRoot,
-					  pszReplBindAs,
-					  pszReplPw);
-
-	/* get replication days */
-	GetDlgReplDays(hwndDlg, pszReplDays);
-
-	/* get replication times */
-	GetDlgReplTimes(hwndDlg, pszReplTimes);
-
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// LoadDlgReplAgreement
-//
-//load information for replication agreements into dialog
-// 
-// 
-// 
-
-void LoadDlgReplAgreement(HWND hwndDlg, 
-						  PSZ pszReplHost, 
-						  INT nReplPort,
-						  PSZ pszReplRoot,
-						  PSZ pszReplBindAs,
-						  PSZ pszReplPw,
-						  PSZ pszReplDays,
-						  PSZ pszReplTimes)
-{
-
-	LoadDlgServerInfo(hwndDlg,
-					  pszReplHost, 
-					  nReplPort,
-					  pszReplRoot,
-					  pszReplBindAs,
-					  pszReplPw);
-
-	SetDlgReplDays(hwndDlg, pszReplDays);
-	
-	/* get replication times */
-	SetDlgReplTimes(hwndDlg, pszReplTimes);
-
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// VerifyReplAgreement
-//
-// Verify replication agreement
-// 
-// Returns TRUE if there is an invalid setting
-// Returns False if all settings are valid
-//
-// SideEffect: displays error (or writes to log in silent mode)
- 
-
-BOOL VerifyReplAgreement(   PSZ pszReplHost, 
-                            INT *pnReplPort,
-                            PSZ pszReplRoot,
-                            PSZ pszReplBindAs,
-                            PSZ pszReplPw,
-							PSZ pszReplDays,
-							PSZ pszReplTimes)
-{
-    BOOL bValueReturned = FALSE;
-
-	
-	if( TRUE == (bValueReturned = VerifyServerInfo(pszReplHost, 
-								pnReplPort,
-								pszReplRoot,
-								pszReplBindAs,
-								pszReplPw,
-								TRUE) ) )
-	{
-		/* problem with the server info, just return true for Error */
-    
-		
-	} else if (FALSE == FullyQualifyHostName(pszReplHost) )
-	{
-		/* can't qualify host name, must be invalid */
-        DSMessageBoxOK(ERR_INVALID_HOST_TITLE, ERR_INVALID_HOST,
-					   pszReplHost, pszReplHost);
-
-		bValueReturned = TRUE;               
-
-	} else if (FALSE == UTF8IsValidLdapUser( pszReplHost, 
-											 *pnReplPort, 
-											 pszReplRoot, 
-											 pszReplBindAs, 
-											 pszReplPw, 
-											 FALSE) )
-	{
-		/* can't bind to host with info entered */
-		if( IDNO == DSMessageBox(MB_YESNO, ERR_CANT_FIND_DS_REPL_TITLE,
-								 ERR_CANT_FIND_DS_REPL, 0, pszReplHost,
-								 *pnReplPort, pszReplBindAs) )
-		{
-			/* user wants to stay on this page and fix value, otherwise,
-				allows them to continue even though cant find host
-				for replication */
-
-			bValueReturned = TRUE;
-		}
-	}
-	
-	/* may want to add more verification here */
-
-	return bValueReturned;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Supplier_Replication_Agreement_DialogProc
-//
-// get information for replication agreements
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-Supplier_Replication_Agreement_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  HWND hCtrl;
-
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_HOST, 
-					   IDC_EDIT_SUFFIX,
-					   IDC_EDIT_BIND_AS,
-					   IDC_EDIT_PW,
-					   -1};
-
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-		Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-     break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-          /* stevross: will have to come back to display this twice for middle case */
-          if( SUPPLIER_SIR_REPLICATION  != mi.m_nSetupSupplierReplication  )
-          {
-            /* we only setup replication agreements for SUPPLIER SIR */
-            SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-            return TRUE;
-          }
-
-		  /* set text to say Supplier Repl Agreement */
-		  SetDlgItemText(hwndDlg, IDC_STATIC_REPLICATION_AGREEMENT, SUPPLIER_REPL_AGREE);
-
-		  /* display values */
-		  LoadDlgReplAgreement(hwndDlg,
-							   mi.m_szSupplierHost, 
-							   mi.m_nSupplierPort,
-							   mi.m_szSupplierRoot,
-							   mi.m_szSupplierBindAs,
-							   mi.m_szSupplierPw,
-							   mi.m_szSIRDays,
-							   mi.m_szSIRTimes);
-		  
-		  /* hide the repl sync interval stuff because it only makes since for CIR */
-		  hCtrl = GetDlgItem(hwndDlg, IDC_EDIT_REPL_SYNC_INTERVAL);
-		  ShowWindow(hCtrl,SW_HIDE);
-
- 		  hCtrl = GetDlgItem(hwndDlg, IDC_STATIC_REPL_SYNC);
-		  ShowWindow(hCtrl,SW_HIDE);
-
-		  hCtrl = GetDlgItem(hwndDlg, IDC_SPIN_REPL_SYNC_INTERVAL);
-		  ShowWindow(hCtrl,SW_HIDE);
-
-
-		  /* center window n stuff */
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-		case PSN_WIZBACK:
-			// The user clicked the back button from the first property page.
-			// Set the result code NS_WIZBACK to indicate this action and close
-			// the property sheet using brute force.  If this procedure is not
-			// being used by the first property sheet, you should ignore this
-			// notification and simply let windows go to the previous page.
-			//
-			// NOTE: To prevent the wizard from stepping back, return -1.
-			SaveDlgReplAgreement(hwndDlg, 
-								 mi.m_szSupplierHost, 
-								 &mi.m_nSupplierPort,
-								 mi.m_szSupplierRoot,
-								 mi.m_szSupplierBindAs,
-								 mi.m_szSupplierPw,
-								 mi.m_szSIRDays,
-								 mi.m_szSIRTimes);
-
-			break;
-
-		case PSN_WIZNEXT:
-			// The user clicked the next button from the last property page.
-			// Set the result code NS_WIZNEXT to indicate this action and close
-			// the property sheet using brute force.  If this procedure is not
-			// being used by the last property sheet, you should ignore this
-			// notification and simply let windows go to the next page.
-			//
-			// NOTE: To prevent the wizard from stepping ahead, return -1.
-
-			/* only bother to check passwords if username is valid */
-
-			SaveDlgReplAgreement(hwndDlg, 
-								 mi.m_szSupplierHost, 
-								 &mi.m_nSupplierPort,
-								 mi.m_szSupplierRoot,
-								 mi.m_szSupplierBindAs,
-								 mi.m_szSupplierPw,
-								 mi.m_szSIRDays,
-								 mi.m_szSIRTimes);
-
-			if( TRUE == (bValueReturned = VerifyReplAgreement(mi.m_szSupplierHost, 
-												 &mi.m_nSupplierPort,
-												 mi.m_szSupplierRoot,
-												 mi.m_szSupplierBindAs,
-												 mi.m_szSupplierPw,
-												 mi.m_szSIRDays,
-												 mi.m_szSIRTimes) ) )
-			{
-				/* one of the settings is invalid, stay on this page */
-				SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			}
-
-    
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// SaveDlgInput_Consumer_Replication_Agreement_DialogProc
-//
-// get info for consumer replication agreements
-// 
-// 
-// 
-//
-void SaveDlgInput_Consumer_Replication_Agreement(HWND hwndDlg)
-{
-
-    BOOL bTrans;
-
-	SaveDlgReplAgreement(hwndDlg, 
-						 mi.m_szConsumerHost, 
-						 &mi.m_nConsumerPort,
-						 mi.m_szConsumerRoot,
-						 mi.m_szConsumerBindAs,
-						 mi.m_szConsumerPw,
-						 mi.m_szCIRDays,
-						 mi.m_szCIRTimes);
-
-
-	/* get the CIR Interval */
-	mi.m_nCIRInterval = GetDlgItemInt(hwndDlg, IDC_EDIT_REPL_SYNC_INTERVAL, &bTrans , FALSE);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Consumer_Replication_Agreement_DialogProc
-//
-// get information for replication agreements
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-Consumer_Replication_Agreement_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  
-   /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_EDIT_HOST, 
-					   IDC_EDIT_SUFFIX,
-					   IDC_EDIT_BIND_AS,
-					   IDC_EDIT_PW,
-					   -1};
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-	  Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_SYNC_INTERVAL, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_EDIT_REPL_SYNC_INTERVAL), 0);
-      SendDlgItemMessage(hwndDlg, IDC_SPIN_REPL_SYNC_INTERVAL, UDM_SETRANGE, 0, MAKELONG((short)59, (short)0));
-
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-      
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-
-          /* stevross: will have to come back to display this twice for middle case */
-          if( CONSUMER_CIR_REPLICATION  != mi.m_nSetupConsumerReplication )
-          {
-            /* we only setup replication agreements for CONSUMER CIR */
-            SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-            return TRUE;
-
-          }
-
-
-		  /* make title consumer replication agreement */
-		  SetDlgItemText(hwndDlg, IDC_STATIC_REPLICATION_AGREEMENT, CONSUMER_REPL_AGREE);
-
-  		  /* display values */
-		  LoadDlgReplAgreement(hwndDlg,
-							   mi.m_szConsumerHost, 
-							   mi.m_nConsumerPort,
-							   mi.m_szConsumerRoot,
-							   mi.m_szConsumerBindAs,
-							   mi.m_szConsumerPw,
-							   mi.m_szCIRDays,
-							   mi.m_szCIRTimes);
-
-		  SetDlgItemInt(hwndDlg, IDC_EDIT_REPL_SYNC_INTERVAL, mi.m_nCIRInterval, FALSE);
-
-          CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		  SaveDlgInput_Consumer_Replication_Agreement(hwndDlg);
-  		  break;
-
-		case PSN_WIZNEXT:
-			// The user clicked the next button from the last property page.
-			// Set the result code NS_WIZNEXT to indicate this action and close
-			// the property sheet using brute force.  If this procedure is not
-			// being used by the last property sheet, you should ignore this
-			// notification and simply let windows go to the next page.
-			//
-			// NOTE: To prevent the wizard from stepping ahead, return -1.
-
-			/* only bother to check passwords if username is valid */
-
-			SaveDlgInput_Consumer_Replication_Agreement(hwndDlg);
-			if( TRUE == (bValueReturned = VerifyReplAgreement(mi.m_szConsumerHost, 
-												 &mi.m_nConsumerPort,
-												 mi.m_szConsumerRoot,
-												 mi.m_szConsumerBindAs,
-												 mi.m_szConsumerPw,
-												 mi.m_szCIRDays,
-												 mi.m_szCIRTimes) ) )
-			{
-				/* one of the settings invalid, stay on this page */
-				SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-			}		     
-
-
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Sample_Entries_Org_DialogProc
-//
-// ask user if they want to populate with sample entries and sample organization
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-Sample_Entries_Org_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  CHAR szMustHaveBase[MAX_STR_SIZE]="\0";
-  static CHAR szCustomFileName[MAX_STR_SIZE]="\0";
-  static CHAR szSampleFileName[MAX_STR_SIZE]="\0";
-  
-  /* list of controls to be setup for 8bit input/display */
-  INT h8bitControls[]={IDC_STATIC_MUST_HAVE_BASE, 
-					   IDC_STATIC_LDIF_FILE_NAME,
-					   -1};
-
-
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-		  /* default is to populate with sample entries */
-
-	    Setup8bitInputDisplay(hwndDlg, h8bitControls);
-
-     break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-	
-		switch (LOWORD(wParam))
-		{
-	
-			case IDC_BUTTON_CHOOSE_LDIF_FILE:
-				GetFileName(hwndDlg, "Choose ldif file to import", 
-					        "Ldif Files|*.ldif|All Files|*.*|",
-							NULL, szCustomFileName, MAX_PATH );
-				
-				/* assume by browsing user will want this file so check custom radio button for them
-				   and set file to be displayed */
-				my_snprintf(mi.m_szPopLdifFile, sizeof(mi.m_szPopLdifFile), "%s", szCustomFileName);
-				CheckRadioButton(hwndDlg, IDC_RADIO_DONT_POPULATE, IDC_RADIO_POPULATE_CUSTOM, IDC_RADIO_POPULATE_CUSTOM);
-
-			default:
-
-			  mi.m_nPopulateSampleOrg = (int )(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_CHECK_POPULATE_ORG_ENTRIES ) );
-			  
-			  if( BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_POPULATE_SAMPLE ) )
-			  {
-					mi.m_nPopulateSampleEntries = 1;
-					my_snprintf(mi.m_szPopLdifFile, sizeof(mi.m_szPopLdifFile), "%s", szSampleFileName);
-			  }else if( BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_RADIO_POPULATE_CUSTOM ) ){
-					mi.m_nPopulateSampleEntries = 0;
-					mi.m_nPopulateSampleOrg = 1;
-//		     		my_snprintf(mi.m_szPopLdifFile, sizeof(mi.m_szPopLdifFile), "%s", szCustomFileName);
-			  }else{
-					mi.m_nPopulateSampleEntries = 0;
-					my_snprintf(mi.m_szPopLdifFile, sizeof(mi.m_szPopLdifFile), "\0");
-			  }
-
-			  
-			break;
-
-		}
-		/* update ldif file name if changed */
-		SetDlgItemText(hwndDlg, IDC_STATIC_LDIF_FILE_NAME, mi.m_szPopLdifFile);
-
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-	
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-          if(   (CONSUMER_CIR_REPLICATION  == mi.m_nSetupConsumerReplication)
-             || (CONSUMER_SIR_REPLICATION  == mi.m_nSetupConsumerReplication ) )
-          {
-            /* we only want to populate if they are not doing CIR */
-            SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-            return TRUE;
-
-          }
-		  
-		  /* warn user about suffix and database import */
-		  my_snprintf(szMustHaveBase, sizeof(szMustHaveBase), "(note: must have base %s)", mi.m_szInstanceSuffix );
-		  SetDlgItemText(hwndDlg, IDC_STATIC_MUST_HAVE_BASE, szMustHaveBase);
-    	  my_snprintf(szSampleFileName, sizeof(szSampleFileName), "%s\\%s", TARGETDIR, SAMPLE_LDIF);	
- 
-		  if(mi.m_nExistingUG == 0)
-		  {
-			/* the user is creating a new UG with this instance */
-		
-			/* create ou=People/ou=Groups */
-//			mi.m_nPopulateSampleOrg = 1;
-//			lstrcpy(mi.m_szPopLdifFile, SUGGEST_LDIF);
-		  }
-
-		  if(mi.m_nPopulateSampleEntries)
-		  {
-			  CheckRadioButton(hwndDlg, IDC_RADIO_DONT_POPULATE,
-							   IDC_RADIO_POPULATE_CUSTOM,
-							   IDC_RADIO_POPULATE_SAMPLE);
-		  } else if (mi.m_szPopLdifFile[0]) {
-			  CheckRadioButton(hwndDlg, IDC_RADIO_DONT_POPULATE,
-							   IDC_RADIO_POPULATE_CUSTOM,
-							   IDC_RADIO_POPULATE_CUSTOM);
-		  } else {
-			  CheckRadioButton(hwndDlg, IDC_RADIO_DONT_POPULATE,
-							   IDC_RADIO_POPULATE_CUSTOM,
-							   IDC_RADIO_DONT_POPULATE);
-		  }
-
-		  if(mi.m_nPopulateSampleOrg)
-		  {
-		      CheckDlgButton(hwndDlg, IDC_CHECK_POPULATE_ORG_ENTRIES, BST_CHECKED); 
-		  }
-
-		  SetDlgItemText(hwndDlg, IDC_STATIC_LDIF_FILE_NAME, mi.m_szPopLdifFile);
-    
-		  CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		   
-		  /* all settings for this dailog are saved in WM_COMMAND processing */
-  		  break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-		
-		  /* all settings for this dailog are saved in WM_COMMAND processing */
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Disable_Schema_Checking_DialogProc
-//
-// ask user if they want to disable schema checking
-// 
-// 
-// 
-//
-
-static BOOL CALLBACK
-Disable_Schema_Checking_DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  BOOL bValueReturned = FALSE;
-  UINT uResult        = 0;
-  BOOL bResult        = FALSE;
-  
-
-  switch (uMsg) 
-  {
-    case WM_INITDIALOG:
-      // This message is sent when the property page is first created.  Here
-      // you can perform any one time initialization that you require. 
-		  /* default is to populate with sample entries */
-  		
-      break;
-
-
-    case WM_COMMAND:
-      // Windows sends WM_COMMAND messages whenever the user clicks on
-      // a control in your property page.  If you need to perform some
-      // special action, such as validating data or responding to a
-      // button click, do it here.
-	
-		switch (LOWORD(wParam))
-		{
-	
-			default:
-
-				mi.m_nDisableSchemaChecking = (int )(BST_CHECKED == IsDlgButtonChecked(hwndDlg, IDC_CHECK_DISABLE_SCHEMA_CHECKING ) );
-			break;
-
-		}
-
-      break;
-
-    case WM_NOTIFY:
-      // Windows sends WM_NOTIFY messages to your property page whenever
-      // something interesting happens to the page.  This could be page
-      // activation/deactivation, a button click, etc.  The wParam parameter
-      // contains a pointer to the property page.  The lParam parameter
-      // contains a pointer to an NMHDR structure.  The code field of this
-      // structure contains the notification message code being sent.  The
-      // property sheet API allows you to alter the behavior of these
-      // messages by returning a value for each message.  To return a value,
-      // use the SetWindowLong Windows SDK function.
-
-      switch (((NMHDR*)lParam)->code) 
-      {
-
-	
-        case PSN_SETACTIVE:
-          // This notification is sent upon activation of the property page.
-          // The property sheet should be centered each time it is activated
-          // in case the user has moved the stupid thing (this duplicates
-          // InstallShield functionality). You should also set the state of
-          // the wizard buttons here.
-          //
-          // NOTE: If you do not wish this page to become active, return -1.
-            
-		  if(mi.m_nDisableSchemaChecking)
-		  {
-		      CheckDlgButton(hwndDlg, IDC_CHECK_DISABLE_SCHEMA_CHECKING, BST_CHECKED); 
-		  }
-
-		  CenterWindow(GetParent(hwndDlg));
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_KILLACTIVE:
-          // This notification is sent upon deactivation of the property page.
-          // Here you can do whatever might be necessary for this action, such
-          // as saving the state of the controls.  You should also reset the
-          // the state of the wizard buttons here, as both the Back and Next
-          // buttons should be active when you leave the AskOptions function.
-          //
-          // NOTE: If you do not want the page deactivated, return -1.
-
-          PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
-          break;
-
-        case PSN_WIZBACK:
-          // The user clicked the back button from the first property page.
-          // Set the result code NS_WIZBACK to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the first property sheet, you should ignore this
-          // notification and simply let windows go to the previous page.
-          //
-          // NOTE: To prevent the wizard from stepping back, return -1.
-		  
-		  /* all settings for this dailog are saved in WM_COMMAND processing */
-  		  break;
-
-        case PSN_WIZNEXT:
-          // The user clicked the next button from the last property page.
-          // Set the result code NS_WIZNEXT to indicate this action and close
-          // the property sheet using brute force.  If this procedure is not
-          // being used by the last property sheet, you should ignore this
-          // notification and simply let windows go to the next page.
-          //
-          // NOTE: To prevent the wizard from stepping ahead, return -1.
-
-     
-          /* this is the last property page of advanced mode whenever we display it*/
-          mi.m_nResult = NS_WIZNEXT;
-          SendMessage(GetParent(hwndDlg), WM_CLOSE, 0, 0);     
-  		  
-		  /* all settings for this dailog are saved in WM_COMMAND processing */
-		  break;
-
-        case PSN_QUERYCANCEL:
-          // This notification is sent when the user clicks the Cancel button.
-          // It is also sent in response to the WM_CLOSE messages issued
-          // by PSN_WIZBACK and PSN_WIZNEXT.  Make sure that we only process
-          // this message if the result is not back or next so that we don't
-          // nuke the return value assigned by PSN_WIZBACK or PSN_WIZNEXT.
-          //
-          // NOTE: To prevent the cancel from occuring, return -1.
-
-          if (mi.m_nResult != NS_WIZBACK && mi.m_nResult != NS_WIZNEXT)
-          {
-            if (QueryExit(hwndDlg)) 
-            {
-              mi.m_nResult = NS_WIZCANCEL;
-            }
-            else
-            {
-              SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
-              bValueReturned = TRUE;
-            }
-          }
-          break;
-      }
-      break;
-  }
-
-  return bValueReturned;
-}
-
-void initialize_module()
-{
-
-	mi.m_nResult                       = 0;
-	mi.m_szMCCBindAs                   = NULL;
-	mi.m_nInstanceServerPort           = 0;
-	mi.m_nAdminServerPort              = 0;
-	mi.m_nCfgSspt                      = 0;
-	mi.m_nPopulateSampleEntries        = 0;
-	mi.m_nPopulateSampleOrg            = 1;
-	mi.m_nSetupConsumerReplication     = 0;
-	mi.m_nSetupSupplierReplication     = 0;
-	mi.m_nMaxChangeLogRecords          = 0;
-	mi.m_nMaxChangeLogAge              = 0;
-	mi.m_nChangeLogAgeMagnitude        = 0;
-	mi.m_nConsumerSSL                  = 0;
-	mi.m_nSupplierSSL                  = 0;
-	mi.m_nUseSupplierSettings          = 0;
-	mi.m_nUseChangeLogSettings         = 0;
-	mi.m_nCIRInterval                  = 0;
-	mi.m_nConsumerPort                 = 0;
-	mi.m_nSupplierPort                 = 0;
-	mi.m_nMCCPort                      = 0;
-	mi.m_nExistingMCC                  = 0;
-	mi.m_nUGPort                       = 0;
-	mi.m_nExistingUG                   = 0;
-	mi.m_nDisableSchemaChecking        = 0;
-	mi.m_nSNMPOn                       = 0;
-	mi.m_nConfigConsumerDN             = 0;
-
-	memset(mi.m_szMCCPw,  			  			'\0', MAX_STR_SIZE);
-	memset(mi.m_szMCCHost,        				'\0', MAX_STR_SIZE);
-	memset(mi.m_szMCCSuffix,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szUGPw,        					'\0', MAX_STR_SIZE);
-	memset(mi.m_szUGHost,        				'\0', MAX_STR_SIZE);
-	memset(mi.m_szUGSuffix,        				'\0', MAX_STR_SIZE);
-	memset(mi.m_szAdminDomain,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szLdapURL,        				'\0', MAX_STR_SIZE);
-	memset(mi.m_szUserGroupURL, 			    '\0', MAX_STR_SIZE);
-	memset(mi.m_szUserGroupAdmin,   		    '\0', MAX_STR_SIZE);
-	memset(mi.m_szUserGroupAdminPW,	   		    '\0', MAX_STR_SIZE);
-	memset(mi.m_szInstallDN,    			    '\0', MAX_STR_SIZE);
-	memset(mi.m_szSsptUid,        				'\0', MAX_STR_SIZE);
-	memset(mi.m_szSsptUidPw,      				'\0', MAX_STR_SIZE);
-	memset(mi.m_szSsptUidPwAgain, 		        '\0', MAX_STR_SIZE);
-	memset(mi.m_szSsptUser,        				'\0', MAX_STR_SIZE);
-	memset(mi.m_szServerIdentifier,        		'\0', MAX_STR_SIZE);
-	memset(mi.m_szInstanceSuffix,				'\0', MAX_STR_SIZE);
-	memset(mi.m_szInstanceUnrestrictedUser,		'\0', MAX_STR_SIZE);
-	memset(mi.m_szInstancePassword,        		'\0', MAX_STR_SIZE);
-	memset(mi.m_szInstancePasswordAgain,       	'\0', MAX_STR_SIZE);
-	memset(mi.m_szInstanceHostName,        		'\0', MAX_STR_SIZE);
-	memset(mi.m_szSupplierDN,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szSupplierPW,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szSupplierPWAgain,       		'\0', MAX_STR_SIZE);
-	memset(mi.m_szSSLClients,       			'\0', MAX_STR_SIZE);
-	memset(mi.m_szChangeLogDbDir,        		'\0', MAX_STR_SIZE);
-	memset(mi.m_szChangeLogSuffix,        		'\0', MAX_STR_SIZE);
-	memset(mi.m_szConsumerDN,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szConsumerPW,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szConsumerPWAgain,        		'\0', MAX_STR_SIZE);
-	memset(mi.m_szConsumerHost,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szConsumerRoot,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szConsumerBindAs,        		'\0', MAX_STR_SIZE);
-	memset(mi.m_szConsumerPw,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szSupplierHost,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szSupplierRoot,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szSupplierBindAs,        		'\0', MAX_STR_SIZE);
-	memset(mi.m_szSupplierPw,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szPopLdifFile,        			'\0', MAX_STR_SIZE);
-	memset(mi.m_szCIRDays,             			'\0', N_DAYS);
-	memset(mi.m_szCIRTimes,          			'\0', N_TIMES);
-	memset(mi.m_szSIRDays,          			'\0', N_DAYS);
-	memset(mi.m_szSIRTimes,          			'\0', N_TIMES);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//getSNMPStatus() 
-//
-// sets module info for state of SNMPService
-// if its on asks user if ok to turn it off
-// if user says no or there is an error it returns false
-//
-
-BOOL getSNMPStatus()
-{
-
-	BOOL bReturn = TRUE;
-
-	if ( TRUE == isServiceRunning(SNMP_SERVICE) )
-	{
-		// its running
-		if (SILENTMODE == MODE)
-		{
-			/* don't prompt user, jsut turn it off */
-			if ( 0 == ControlServer(SNMP_SERVICE, FALSE) )
-			{
-				DSMessageBoxOK(ERR_SNMP_BAD_SHUTDOWN_TITLE,
-							   ERR_SNMP_BAD_SHUTDOWN, 0);
-				bReturn = FALSE;
-			}
-			mi.m_nSNMPOn = 1;
-		} else
-		{
-
-			/* ask the user what they want to do */
-			if ( IDOK == DSMessageBox(MB_OKCANCEL, ERR_SNMP_IS_RUNNING_TITLE,
-									  ERR_SNMP_IS_RUNNING, 0) )
-			{
-				/* save state for later use by cache so we know what to do in post install */
-				mi.m_nSNMPOn = 1;
-				if ( 0 == ControlServer(SNMP_SERVICE, FALSE) )
-				{
-					DSMessageBoxOK(ERR_SNMP_BAD_SHUTDOWN_TITLE,
-								   ERR_SNMP_BAD_SHUTDOWN, 0);
-					bReturn = FALSE;
-				}
-
-			} else
-			{
-				UINT uExitCode = 1;
-				/* stevross: use ExitProcess until admin server provides us with
-							 better way to exit framework and cleanup */
-				ExitProcess(uExitCode);
-			}
-
-		}
-
-	} else
-	{
-		mi.m_nSNMPOn = 0;
-	}
-
-	return bReturn;
-
-}
-
-
-/////////////////////////////////////////////////////////////////
-//
-//  somehow determine if slapd is installed under this server root
-//
-//
-
-BOOL slapdExists(char *pszServerRoot)
-{
-	BOOL bReturn = FALSE;
-    WIN32_FIND_DATA fileData;
-    HANDLE hFileHandle;
-	CHAR szCurrentDir[MAX_STR_SIZE]="\0";
-
-	/* not sure what the right way to check is, try this for now */
-    /* check if any slapd instances exist in server root */
-    /* later look in directory for anything slapd- */
-
-	/* get current dir so we have it for later */
-	GetCurrentDirectory(MAX_STR_SIZE, szCurrentDir);
-	
-	/* change current dir to server root */
-	SetCurrentDirectory(pszServerRoot);
-
-	hFileHandle = FindFirstFile("slapd-*", &fileData);
-
-	if( INVALID_HANDLE_VALUE != hFileHandle)
-	{
-		/* found slapd- something */
-		bReturn = TRUE;
-	}
-
-	/* set back to previous current directory */
-	SetCurrentDirectory(szCurrentDir);
-
-    return bReturn;
-}
-
-
-/////////////////////////////////////////////////////////////////
-//
-//  turn slapd instances in this server root on or off
-//
-//
-
-BOOL ControlSlapdServers(char *pszServerRoot, BOOL bOn, BOOL fixPwd)
-{
-	BOOL bReturn = FALSE;
-    WIN32_FIND_DATA fileData;
-    HANDLE hFileHandle;
-	CHAR szCurrentDir[MAX_STR_SIZE]="\0";
-
-	/* not sure what the right way to check is, try this for now */
-    /* check if any slapd instances exist in server root */
-    /* later look in directory for anything slapd- */
-
-	/* get current dir so we have it for later */
-	GetCurrentDirectory(MAX_STR_SIZE, szCurrentDir);
-	
-	/* change current dir to server root */
-	SetCurrentDirectory(pszServerRoot);
-
-	hFileHandle = FindFirstFile("slapd-*", &fileData);
-	if( INVALID_HANDLE_VALUE != hFileHandle)
-	{
-		if (fixPwd)
-		{
-			/* convert password file to new pin format */
-			ConvertPasswordToPin(pszServerRoot, fileData.cFileName);
-			/* do any server upgrade stuff */
-			ReinstallUpgradeServer(pszServerRoot, fileData.cFileName);
-		}
-		
-		/* turn on server */
-		ControlSlapdInstance(fileData.cFileName, bOn);
-		
-		while(TRUE == FindNextFile(hFileHandle, &fileData) )
-		{
-			if (fixPwd)
-			{
-				/* convert password file to new pin format */
-				ConvertPasswordToPin(pszServerRoot, fileData.cFileName);
-				/* do any server upgrade stuff */
-				ReinstallUpgradeServer(pszServerRoot, fileData.cFileName);
-			}
-
-			/* turn on server */
-			ControlSlapdInstance(fileData.cFileName, bOn);
-		}	
-	}
-
-	/* wait to make sure give server enough time startup/shutdown*/
-	/* this time should be long enough for all instances we just */
-	/* tried to shutdown/startup */
-	Sleep(SLAPD_SHUTDOWN_TIME_MILLISECONDS);
-
-
-	/* set back to previous current directory */
-	SetCurrentDirectory(szCurrentDir);
-
-    return bReturn;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// TMPL_PreInstall
-//
-// This function is called by the installation framework before asking the
-// user any questions.  Here you should determine if all of the requisites
-// for installing this component are being met.  If this operation succeeds
-// return TRUE, otherwise display an error message and return FALSE to abort
-// installation.
-//
-
-BOOL __declspec(dllexport)
-DSINST_PreInstall(LPCSTR lpszInstallPath)
-{
-	BOOL bReturn = FALSE;
-	// TODO: Add code to check for pre-installation requirements.
-
-	if( TRUE == getSNMPStatus() )
-	{
-		char * szLdapURL = NULL;
-		char * szLdapUser = NULL;
-		char * szAdminDomain = NULL;
-
-		getDefaultLdapInfo(TARGETDIR, &szLdapURL, &szLdapUser,
-						   &szAdminDomain);
-		if (szLdapURL && szAdminDomain)
-		{
-			my_strncpy(mi.m_szLdapURL, szLdapURL, sizeof(mi.m_szLdapURL));
-			GetURLComponents(mi.m_szLdapURL, mi.m_szMCCHost, 
-							 &mi.m_nMCCPort, mi.m_szMCCSuffix);
-			if (mi.m_szMCCSuffix[0] == 0)
-				my_strncpy(mi.m_szMCCSuffix, NS_DOMAIN_ROOT, sizeof(mi.m_szMCCSuffix));
-			if (szLdapUser && mi.m_szMCCBindAs)
-				my_strncpy(mi.m_szMCCBindAs, szLdapUser, sizeof(mi.m_szMCCBindAs));
-			my_strncpy(mi.m_szAdminDomain, szAdminDomain, sizeof(mi.m_szAdminDomain));
-			// since this server root is already configured to use
-			// an existing configuration directory server, we will
-			// not allow the user to install another one here, so
-			// the directory server created here will be a user
-			// directory; we will still need to ask for the admin
-			// user password
-			mi.m_nExistingMCC = 1;
-			mi.m_nExistingUG = 0;
-			mi.m_nCfgSspt = 0;
-
-			// it's only a reinstall if there is already a slapd
-			// installed in this server root
-			if( slapdExists(TARGETDIR) )
-				mi.m_nReInstall = 1;
-			else
-				mi.m_nReInstall = 0;
-		}
-		bReturn = TRUE;
-	}
-
-	if (mi.m_nReInstall) {
-		char infFile[MAX_PATH] = {0};
-		my_snprintf(infFile, sizeof(infFile), "%s\\setup\\slapd\\slapd.inf", TARGETDIR);
-		GetProductInfoStringWithTok(SETUP_INF_VERSION, "=", oldVersion,
-								OLD_VERSION_SIZE, infFile);
-		myLogData("file %s old version is %s", infFile, oldVersion);
-	}
-
-	return bReturn;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// DSINST_AskOptions
-//
-// This function is called by the installation framework to query the user for
-// information about your component.  Here you should ask all of the questions
-// required to install your component as a series of wizard property sheets.
-//
-
-INT __declspec(dllexport)
-DSINST_AskOptions(HWND hwndParent, INT nDirection)
-{
-	PROPSHEETPAGE psp[NUM_PROP_PAGES];
-	UINT uStartPage;
-	INT nNumPages = 0;
-	static INT wasExistingMCC = -1;
-
-	// TODO: Initialize a property page for each dialog template/resource
-	// required to query the user for options related to your server
-	// installation.  Don't forget to increment the count of pages contained
-	// in NUM_PROP_PAGES at the top of this file.
-
-	/* Keep the value of mi.m_nExistingMCC at the first invocation */
-	if (wasExistingMCC == -1)
-	{
-		wasExistingMCC = mi.m_nExistingMCC;
-	}
-
-	/* if in silent mode or reinstalling, don't display any property pages */
-	if ( SILENTMODE == MODE )
-	{
-		mi.m_nResult = nDirection; // keep moving in same direction...
-	}else
-	{
-		if(1 == mi.m_nReInstall)
-		{
-			uStartPage = ((nDirection == NS_WIZNEXT) ? 0 : 0);
-			AddWizardPage(mi.m_hModule, &psp[0], IDD_REINSTALL_CONFIG, ReInstall_DialogProc);
-			nNumPages = 1;
-		}else{
-
-			if (EXPRESSMODE == MODE)
-			{
-				/* just ask for Suitespot ID and Unrestricted User */
-				uStartPage = ((nDirection == NS_WIZNEXT) ? 0 : 1);
-				if (mi.m_nExistingMCC) // just need admin id and pwd
-					AddWizardPage(mi.m_hModule, &psp[0], IDD_ADMIN_ID_ONLY,
-								  Admin_ID_Only_DialogProc);
-				else
-					AddWizardPage(mi.m_hModule, &psp[0], IDD_SUITESPOTID,
-								  SuitespotID_DialogProc); 
-				AddWizardPage(mi.m_hModule, &psp[1], IDD_ROOTDN, RootDN_DialogProc); 
-
-				/* make sure to set numprop pages to actual number */
-				nNumPages = 2;
-			} else if ( (NORMALMODE == MODE) || (CUSTOMMODE == MODE) )
-			{
-				/* ask for server settings, SuitespotID and Unrestricted User */
-
-				if ((NORMALMODE == MODE) && wasExistingMCC)
-				{
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_SERVER_SETTINGS, Server_Settings_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_ADMIN_ID_ONLY, Admin_ID_Only_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_ROOTDN, RootDN_DialogProc);
-				}
-				else
-				{
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_MCC_SETTINGS, MCC_Settings_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_ADMIN_DOMAIN, AdminDomainCustom_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_MCC_SETTINGS, UG_Settings_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_SERVER_SETTINGS, Server_Settings_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_SUITESPOTID, SuitespotID_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_ADMIN_DOMAIN, AdminDomain_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_ROOTDN, RootDN_DialogProc);
-				}
-
-				/* add additional pages for custom mode */
-				if ( (CUSTOMMODE == MODE) )
-				{
-#ifdef CUSTOM_REPL_FOR_4X
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_CHOOSE_REPLICATION_SETUP,
-								  Choose_Replication_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_SUPPLIER_REPLICATION_SETTINGS,
-								  Supplier_Replication_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_CONSUMER_DN, Consumer_DN_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_REPLICATION_AGREEMENT,
-								  Supplier_Replication_Agreement_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_CONSUMER_REPLICATION_SETTINGS,
-								  Consumer_Replication_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_REPLICATION_AGREEMENT,
-								  Consumer_Replication_Agreement_DialogProc);  
-#endif
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_SAMPLE_ENTRIES_ORG,
-								  Sample_Entries_Org_DialogProc);
-					AddWizardPage(mi.m_hModule, &psp[nNumPages++],
-								  IDD_DISABLE_SCHEMA_CHECKING,
-								  Disable_Schema_Checking_DialogProc);
-				}
-				uStartPage = ((nDirection == NS_WIZNEXT) ? 0 : (nNumPages-1));
-			}
-
-		}
-
-		// Must initialize the result to an error code before calling WizardDialog
-		mi.m_nResult = NS_WIZERROR;
-
-		// Set the first page to display based on the direction we are travelling
-
-
-		// Call WizardDialog to display the set of property pages
-		if (WizardDialog(mi.m_hModule, hwndParent, psp, nNumPages, uStartPage) < 0)
-		{
-			mi.m_nResult = NS_WIZERROR;
-		}
-
-	}
-
-	// convert all DN valued attributes to LDAPv3 quoting
-	normalizeDNs();
-
-	// store the User directory information
-	storeUserDirectoryInfo();
-
-	if (1 == mi.m_nReInstall)
-	{
-		set_ldap_settings();
-	}
-
-	return mi.m_nResult;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// DSINST_GetSummary
-//
-// This function is called by the installation framework after all questions,
-// for all components, have been asked.  Here you should provide a detailed
-// summary explaining all of the choices selected by the user.
-//
-// IMPORTANT NOTE: Each line MUST end in a carriage return/line feed
-// combination ("\r\n") as this string is placed in an edit control.  Edit
-// controls do not properly handle single "\n" end-of-line characters.
-//
-
-VOID __declspec(dllexport)
-DSINST_GetSummary(LPSTR lpszSummary)
-{
-
-	// TODO: Add code to fill in the summary information entered by the user
-	char *psz = lpszSummary;
-
-	/* only use replication settings written to slapd.conf if dialogs were 
-		seen by user... otherwise set them to null so posted as null */
-
-	if ( 1 != mi.m_nUseSupplierSettings)
-	{
-		memset(mi.m_szSupplierDN, '\0', MAX_STR_SIZE);
-	}
-	if ( 1 != mi.m_nUseChangeLogSettings)
-	{
-		memset(mi.m_szChangeLogDbDir,  '\0', MAX_STR_SIZE);
-		memset(mi.m_szChangeLogSuffix, '\0', MAX_STR_SIZE);
-	}
-
-	if ( 1 != mi.m_nConfigConsumerDN)
-	{
-		memset(mi.m_szConsumerDN, '\0', MAX_STR_SIZE);
-	}
-
-	/* display in order of dialogs */
-	if ( 1 == mi.m_nReInstall )
-	{
-		psz += WriteSummaryStringRC(psz, "  %s\r\n",         mi.m_hModule, SUM_REINSTALL, NULL);
-	} else
-	{
-
-
-		/* if installing into existing configuration directory display settings entered */
-		if ( 1 == mi.m_nExistingMCC)
-		{
-			psz += WriteSummaryStringRC(psz, "  %s\r\n",         mi.m_hModule, SUM_CONFIG_DS_TITLE, NULL);
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_HOST, mi.m_szMCCHost);
-			psz += WriteSummaryIntRC(psz,    "      %s: %d\r\n", mi.m_hModule, SUM_PORT, mi.m_nMCCPort);
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_SUFFIX, mi.m_szMCCSuffix);
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_BIND_AS, mi.m_szMCCBindAs);
-		}
-
-		/* if storing data in existing directory display options entered */
-		if ( 1 == mi.m_nExistingUG)
-		{
-			psz += WriteSummaryStringRC(psz, "  %s\r\n",         mi.m_hModule, SUM_DATA_DS_TITLE, NULL);
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_HOST, mi.m_szUGHost);
-			psz += WriteSummaryIntRC(psz,    "      %s: %d\r\n", mi.m_hModule, SUM_PORT, mi.m_nUGPort);
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_SUFFIX, mi.m_szUGSuffix);
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_BIND_AS, mi.m_szUserGroupAdmin);
-		}
-
-		/* display instance settings */
-		psz += WriteSummaryStringRC(psz, "  %s\r\n",         mi.m_hModule, SUM_DS_SET_TITLE, NULL);
-		psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_SERVER_IDENTIFIER, mi.m_szServerIdentifier);
-		psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_SUFFIX, mi.m_szInstanceSuffix);
-		psz += WriteSummaryIntRC(psz,    "      %s: %d\r\n", mi.m_hModule, SUM_PORT,    mi.m_nInstanceServerPort);
-
-		if ( 1 != mi.m_nExistingMCC)
-		{
-			/* if not using Existing MCC display configuration Admin id*/
-			/* otherwise it is displayed as the Bind As under Configuration Directory */
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_CFG_ADM_ID, mi.m_szSsptUid);
-		}
-		psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_ADMIN_DOMAIN, mi.m_szAdminDomain);
-		psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_DIRECTORY_MANAGER, mi.m_szInstanceUnrestrictedUser);
-
-		/* replication settings */
-		if (mi.m_nSetupSupplierReplication != NO_REPLICATION)
-		{
-			psz += WriteSummaryStringRC(psz, "      %s\r\n", mi.m_hModule, SUM_SUPPLIER_REPL_TITLE, NULL);
-
-			/* display changelog DB dir and suffix for both supplier replication modes */
-			psz += WriteSummaryStringRC(psz, "          %s: %s\r\n", mi.m_hModule, SUM_CHANGELOG_DB_DIR, mi.m_szChangeLogDbDir);
-			psz += WriteSummaryStringRC(psz, "          %s: %s\r\n", mi.m_hModule, SUM_CHANGELOG_SUFFIX, mi.m_szChangeLogSuffix);
-		}
-
-		if (SUPPLIER_SIR_REPLICATION == mi.m_nSetupSupplierReplication)
-		{
-			/* display replication agreement */
-			psz += WriteSummaryStringRC(psz, "          %s\r\n", mi.m_hModule, SUM_REPL_AGR_TITLE, NULL);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_HOST, mi.m_szSupplierHost);
-			psz += WriteSummaryIntRC(psz,    "              %s: %d\r\n", mi.m_hModule, SUM_PORT, mi.m_nSupplierPort);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_REPL_ROOT, mi.m_szSupplierRoot);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_BIND_AS, mi.m_szSupplierBindAs);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_REPL_DAYS, mi.m_szSIRDays);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_REPL_TIMES, mi.m_szSIRTimes);
-		}
-
-		if (SUPPLIER_CIR_REPLICATION == mi.m_nSetupSupplierReplication )
-		{
-			/* if configuring consumer BIND DN display what user entered */
-			if (1 == mi.m_nConfigConsumerDN)
-			{
-				psz += WriteSummaryStringRC(psz, "          %s: %s\r\n", mi.m_hModule, SUM_CONSUMER_BIND_DN, mi.m_szConsumerDN);
-			}
-		}
-
-		if (CONSUMER_SIR_REPLICATION == mi.m_nSetupConsumerReplication)
-		{
-			psz += WriteSummaryStringRC(psz, "      %s\r\n", mi.m_hModule, SUM_CONSUMER_REPL_TITLE, NULL);
-			/* display supplier bind dn */
-			psz += WriteSummaryStringRC(psz, "          %s: %s\r\n", mi.m_hModule, SUM_SUPPLIER_DN, mi.m_szSupplierDN);
-		}
-
-		if (CONSUMER_CIR_REPLICATION == mi.m_nSetupConsumerReplication)
-		{
-			psz += WriteSummaryStringRC(psz, "      %s\r\n", mi.m_hModule, SUM_CONSUMER_REPL_TITLE, NULL);
-			/* display replication agreement */
-			/* display replication agreement */
-			psz += WriteSummaryStringRC(psz, "          %s\r\n", mi.m_hModule, SUM_REPL_AGR_TITLE, NULL);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_HOST, mi.m_szConsumerHost);
-			psz += WriteSummaryIntRC(psz,    "              %s: %d\r\n", mi.m_hModule, SUM_PORT, mi.m_nConsumerPort);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_REPL_ROOT, mi.m_szConsumerRoot);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_BIND_AS, mi.m_szConsumerBindAs);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_REPL_DAYS, mi.m_szCIRDays);
-			psz += WriteSummaryStringRC(psz, "              %s: %s\r\n", mi.m_hModule, SUM_REPL_TIMES, mi.m_szCIRTimes);
-			psz += WriteSummaryIntRC(psz,    "              %s: %d\r\n", mi.m_hModule, SUM_REPL_SYNC_INTERVAL, mi.m_nCIRInterval);
-		}
-
-		if ( CUSTOMMODE == MODE)
-		{
-			/* display org & ldif files */
-
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_POP_ORG_STRUCT, onezero2yesno(mi.m_nPopulateSampleOrg)   );
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_POP_DB_FILE, mi.m_szPopLdifFile);
-			psz += WriteSummaryStringRC(psz, "      %s: %s\r\n", mi.m_hModule, SUM_DISABLE_SCHEMA_CHECKING, onezero2yesno(mi.m_nDisableSchemaChecking)  );
-		}
-
-	}
-
-	*psz = '\0';
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// DSINST_WriteGlobalCache
-//
-// This function is called by the installation framework when the user clicks
-// Next at the summary screen.  Here you should write all information entered
-// by the user into the installation cache for use during silent installation.
-// Data written to this section of the file may be interpreted by the
-// framework.  If this operation succeeds return TRUE, otherwise display an
-// error message and return FALSE to indicate an error.
-//
-
-BOOL __declspec(dllexport)
-DSINST_WriteGlobalCache(LPCSTR lpszCacheFileName, LPCSTR lpszSectionName)
-{
-
-   if(1 == mi.m_nReInstall)
-  {
-
-	  /* write configuration directory info, thats the only thing we know about */
-	  /* during reinstall */
-	  WritePrivateProfileString(lpszSectionName, GLOBAL_INF_LDAP_USER, mi.m_szMCCBindAs, 
-		                    lpszCacheFileName);
-
-	  WritePrivateProfileString(lpszSectionName, GLOBAL_INF_LDAP_PASSWD, mi.m_szMCCPw, 
-		                    lpszCacheFileName);
-
-	  WritePrivateProfileString(lpszSectionName, SLAPD_KEY_K_LDAP_URL, mi.m_szLdapURL,
-	                        lpszCacheFileName);
-
-
-	  /* where do we get admin domain from on ReInstall ??? is default ok? */
-	  WritePrivateProfileString(lpszSectionName, SLAPD_KEY_ADMIN_DOMAIN, mi.m_szAdminDomain,
-                                   lpszCacheFileName);
-
-
-	  /* shut down all slapd servers so no file conflicts*/
-	  ControlSlapdServers(TARGETDIR, FALSE, FALSE);
-
-      return TRUE;
-  }	
-
-   	/* this is the first thing called after last dialog, setup UG stuff here if creating UG directory */
-	/* stevross: is there a better place to put this ? possibly in GetSummary, */
-    /* but what happens in silent mode ?*/
-
-	/* construct the LDAPURL */
-    /* suffix must always be o=netscape root */
-	my_snprintf(mi.m_szLdapURL, sizeof(mi.m_szLdapURL), "ldap://%s:%d/%s", mi.m_szMCCHost, mi.m_nMCCPort, NS_DOMAIN_ROOT);
-
-	if(mi.m_nExistingUG == 0)
-	{
-		/* the user is creating a new UG with this instance */
-		
-		/* create ou=People/ou=Groups */
-//		mi.m_nPopulateSampleOrg = 1;
-//		lstrcpy(mi.m_szPopLdifFile, SUGGEST_LDIF);
-
-		if(mi.m_nExistingMCC == 0)
-		{
-			/* the user is also creating a new MCC so set UG admin to MCC admin */
-			my_strncpy(mi.m_szUserGroupAdmin, mi.m_szMCCBindAs, sizeof(mi.m_szUserGroupAdmin));
-			my_strncpy(mi.m_szUserGroupAdminPW, mi.m_szMCCPw, sizeof(mi.m_szUserGroupAdminPW));
-
-		}else{
-			/* user is using an existing MCC so only creating UG, make UG user same as
-				Root DN */
-			my_strncpy(mi.m_szUserGroupAdmin, mi.m_szInstanceUnrestrictedUser, sizeof(mi.m_szUserGroupAdmin));
-			my_strncpy(mi.m_szUserGroupAdminPW, mi.m_szInstancePassword, sizeof(mi.m_szUserGroupAdminPW));
-
-		}
-		my_snprintf(mi.m_szUserGroupURL, sizeof(mi.m_szUserGroupURL), "ldap://%s:%d/%s", mi.m_szInstanceHostName,
-								 mi.m_nInstanceServerPort, mi.m_szInstanceSuffix);	
-	}
- 
-   WritePrivateProfileString(lpszSectionName, GLOBAL_INF_LDAP_USER, mi.m_szMCCBindAs, 
-		                    lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, GLOBAL_INF_LDAP_PASSWD, mi.m_szMCCPw, 
-		                    lpszCacheFileName);
-
-	WritePrivateProfileString(lpszSectionName, SLAPD_KEY_ADMIN_DOMAIN, mi.m_szAdminDomain,
-                                   lpszCacheFileName);
-
-	WritePrivateProfileString(lpszSectionName, SLAPD_KEY_K_LDAP_URL, mi.m_szLdapURL,
-                                   lpszCacheFileName);
-
-
-	WritePrivateProfileString(lpszSectionName, SLAPD_KEY_USER_GROUP_LDAP_URL, mi.m_szUserGroupURL,
-                                   lpszCacheFileName);
-
-	WritePrivateProfileString(lpszSectionName, SLAPD_KEY_USER_GROUP_ADMIN_ID, mi.m_szUserGroupAdmin,
-                                   lpszCacheFileName);
-
-	WritePrivateProfileString(lpszSectionName, SLAPD_KEY_USER_GROUP_ADMIN_PWD, mi.m_szUserGroupAdminPW,
-                                   lpszCacheFileName);
-  
-  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// DSINST_WriteLocalCache
-//
-// This function is called by the installation framework when the user clicks
-// Next at the summary screen.  Here you should write all information entered
-// by the user into the installation cache for use during silent installation.
-// Data written to this file is not interpreted by the framework, and may
-// consist of any values that you will need to perform the installation (not
-// just values entered by the user). If this operation succeeds return TRUE,
-// otherwise display an error message and return FALSE to indicate an error.
-//
-
-BOOL __declspec(dllexport)
-DSINST_WriteLocalCache(LPCSTR lpszCacheFileName, LPCSTR lpszSectionName)
-{
-  // TODO: Add code to write data to the cache file (INI format) under the
-  // specified section name.
-
-   CHAR szInt[BUFSIZ];
-
-	/* don't want to over write with bogus default values on ReInstall*/
-	  if(1 == mi.m_nReInstall)
-	  {
-		  /* just write snmp status cause thats the only thing we really know*/
-		  /* will allow to control it on reinstall also */
-		   WritePrivateProfileString(lpszSectionName, LOCAL_INF_SNMP_ON, onezero2yesno(mi.m_nSNMPOn), 
-				                    lpszCacheFileName);   
-
-        return TRUE;
-	  }	
-
-   
-   /* general settings */
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_USE_EXISTING_MC, onezero2yesno(mi.m_nExistingMCC), 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_USE_EXISTING_UG, onezero2yesno(mi.m_nExistingUG), 
-	                        lpszCacheFileName);
-
-   my_snprintf(szInt, sizeof(szInt), "%d",  mi.m_nInstanceServerPort);
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SERVER_PORT, szInt, 
-	                        lpszCacheFileName);
-     
-   if(!mi.m_nExistingUG)
-   {
-		/* don't write this key when config only directory */
-	    /* config only directory when using existing data store */
-		WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SUFFIX, mi.m_szInstanceSuffix, 
-				                    lpszCacheFileName);
-   }
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_ROOTDN, mi.m_szInstanceUnrestrictedUser, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_ROOTDNPWD, mi.m_szInstancePassword, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SERVER_IDENTIFIER, mi.m_szServerIdentifier, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SLAPD_CONFIG_FOR_MC, onezero2yesno(mi.m_nCfgSspt), 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_ADD_SAMPLE_ENTRIES, 
-								onezero2yesno(mi.m_nPopulateSampleEntries), 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_ADD_ORG_ENTRIES, onezero2yesno(mi.m_nPopulateSampleOrg), 
-	                        lpszCacheFileName);
-
-   my_snprintf(szInt, sizeof(szInt), "%s",  onezero2yesno( ( (NO_REPLICATION != mi.m_nSetupConsumerReplication) || (NO_REPLICATION != mi.m_nSetupSupplierReplication) ) ) );
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_USE_REPLICATION, szInt, 
-	                        lpszCacheFileName);
-   
-   /* consumer replication settings */
-
-   /* write no instead of number for no replication to be like unix installer */
-   if(NO_REPLICATION != mi.m_nSetupConsumerReplication)
-   {
-		my_snprintf(szInt, sizeof(szInt), "%d", mi.m_nSetupConsumerReplication);
-   }else{
-	    my_snprintf(szInt, sizeof(szInt), "no");
-   }
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SETUP_CONSUMER, szInt, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_HOST, mi.m_szConsumerHost, 
-	                        lpszCacheFileName);
-
-   my_snprintf(szInt, sizeof(szInt), "%d", mi.m_nConsumerPort );
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_PORT, szInt, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_SUFFIX, mi.m_szConsumerRoot, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_BINDDN, mi.m_szConsumerBindAs, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_BINDDNPWD, mi.m_szConsumerPw, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_SECURITY_ON, onezero2yesno(mi.m_nConsumerSSL),
-	                        lpszCacheFileName);
-   
-   my_snprintf(szInt, sizeof(szInt), "%d", mi.m_nCIRInterval );
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_INTERVAL, szInt, 
-	                        lpszCacheFileName);
-
-   if(!strcmp(DEFAULT_CIR_DAYS, mi.m_szCIRDays) )
-   {
-	   /* if default of all days write null to inf file as that is what cgi wants */
-	   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_DAYS, "\0", 
-		                        lpszCacheFileName);
-   }else{
-	   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_DAYS, mi.m_szCIRDays, 
-		                        lpszCacheFileName);
-   }
-
-   if(!strcmp(DEFAULT_CIR_TIMES, mi.m_szCIRTimes) )
-   {
-   	   /* if default of all times write null to inf file as that is what cgi wants */
-	  WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_TIMES, "\0", 
-	                        lpszCacheFileName);
-   }else{
-	  WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_TIMES, mi.m_szCIRTimes, 
-	                        lpszCacheFileName);
-   }
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_REPLICATIONDN, mi.m_szSupplierDN, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_REPLICATIONPWD, mi.m_szSupplierPW, 
-	                        lpszCacheFileName);
-
-   /* Supplier replication settings */
- 
-   /* write no instead of number for no replication to be like unix installer */
-   if(NO_REPLICATION != mi.m_nSetupSupplierReplication)
-   {
-		my_snprintf(szInt, sizeof(szInt), "%d", mi.m_nSetupSupplierReplication);
-   }else{
-	    my_snprintf(szInt, sizeof(szInt), "no");
-   }
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SETUP_SUPPLIER, szInt, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CHANGELOGDIR, mi.m_szChangeLogDbDir, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CHANGELOGSUFFIX, mi.m_szChangeLogSuffix, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_HOST, mi.m_szSupplierHost, 
-	                        lpszCacheFileName);
-
-   my_snprintf(szInt, sizeof(szInt), "%d", mi.m_nSupplierPort );
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_PORT, szInt, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_SUFFIX, mi.m_szSupplierRoot, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_BINDDN, mi.m_szSupplierBindAs, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_BINDDNPWD, mi.m_szSupplierPw, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_SECURITY_ON, onezero2yesno( mi.m_nSupplierSSL), 
-	                        lpszCacheFileName);
- 
-   if(!strcmp(DEFAULT_SIR_DAYS, mi.m_szSIRDays) )
-   {
-	   /* if default of all days write null to inf file as that is what cgi wants */
-	   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_DAYS, "\0", 
-		                        lpszCacheFileName);
-   }else{
-	   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_DAYS, mi.m_szSIRDays, 
-		                        lpszCacheFileName);
-   }
-
-   if(!strcmp(DEFAULT_SIR_TIMES, mi.m_szSIRTimes) )
-   {
-   	   /* if default of all times write null to inf file as that is what cgi wants */
-	  WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_TIMES, "\0", 
-	                        lpszCacheFileName);
-   }else{
-	  WritePrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_TIMES, mi.m_szSIRTimes, 
-	                        lpszCacheFileName);
-   }
-
-   WritePrivateProfileString(lpszSectionName, LOCAL_INF_CONFIG_CONSUMER_DN, onezero2yesno(mi.m_nConfigConsumerDN), 
-	                        lpszCacheFileName);
-   
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CONSUMERDN, mi.m_szConsumerDN, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_CONSUMERPWD, mi.m_szConsumerPW, 
-	                        lpszCacheFileName);
-
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_INSTALL_LDIF_FILE, mi.m_szPopLdifFile, 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, SLAPD_KEY_DISABLE_SCHEMA_CHECKING, onezero2yesno(mi.m_nDisableSchemaChecking), 
-	                        lpszCacheFileName);
-
-   WritePrivateProfileString(lpszSectionName, LOCAL_INF_SNMP_ON, onezero2yesno(mi.m_nSNMPOn), 
-	                        lpszCacheFileName);   
-
-  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// DSINST_ReadGlobalCache
-//
-// This function is called by the installation framework during silent install
-// to initialize your data from the cache file you created above. Here you
-// should read any information stored in the installation cache's global
-// section that you need. If this operation succeeds return TRUE, otherwise
-// display an error message and return FALSE to indicate an error.
-//
-
-BOOL __declspec(dllexport)
-DSINST_ReadGlobalCache(LPCSTR lpszCacheFileName, LPCSTR lpszSectionName)
-{
-  // TODO: Add code to read data from the cache file (INI format) under the
-  // specified section name.
-
-	/* stevross: this may be null when reading cache for post install or something, so
-		make sure to allocate it again */
-	CHAR szFormat[MAX_STR_SIZE];
-
-	if(1 == mi.m_nReInstall)
-	{
-		/* just read config directory stuff */
-		/* this is the only stuff we are need and are guaranteed to have */
-	LoadString( mi.m_hModule, ERR_READ_GLOBAL_CACHE, szFormat, MAX_STR_SIZE);
-					
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_FULL_MACHINE_NAME, "\0", 
-		                     mi.m_szInstanceHostName, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-	if (mi.m_szInstanceHostName[0] == 0)
-		DSGetHostName(mi.m_szInstanceHostName, MAX_STR_SIZE);
-
-	if(NULL == mi.m_szMCCBindAs )
-	{
-		mi.m_szMCCBindAs = malloc(MAX_STR_SIZE);
-	}
-
-    GetPrivateProfileString(lpszSectionName, GLOBAL_INF_LDAP_USER, "\0", 
-		                     mi.m_szMCCBindAs, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-    if ( 0 == lstrcmp(mi.m_szMCCBindAs, "\0") )
-	{
-		DSMessageBoxOK(ERR_NO_SS_ADMIN_TITLE, ERR_NO_SS_ADMIN, 0);
-	    return FALSE;
-	}else{
-
-		/* stevross: now that cgi can handle full DN 
-			Sspt UID is same user as MCC BindAs no matter what
-			look into removing later once get instance creatin working */
-			my_strncpy(mi.m_szSsptUid, mi.m_szMCCBindAs, sizeof(mi.m_szSsptUid));
-	}
-
-    GetPrivateProfileString(lpszSectionName, GLOBAL_INF_LDAP_PASSWD, "\0", 
-		                     mi.m_szMCCPw, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-    if ( 0 == lstrcmp(mi.m_szMCCPw, "\0") )
-	{
-		DSMessageBoxOK(ERR_NO_PW_TITLE, ERR_NO_PW, 0);
-	    return FALSE;
-	}else{
-		/* use password for sspt user since this is the ssptuser */
-		my_strncpy(mi.m_szSsptUidPw, mi.m_szMCCPw, sizeof(mi.m_szSsptUidPw));
-	    my_strncpy(mi.m_szSsptUidPwAgain, mi.m_szSsptUidPw, sizeof(mi.m_szSsptUidPwAgain));
-	}
-
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_ADMIN_DOMAIN, "\0", 
-		                     mi.m_szAdminDomain, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_K_LDAP_URL, "\0", 
-		                     mi.m_szLdapURL, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-	if( GetURLComponents(mi.m_szLdapURL, mi.m_szMCCHost, 
-			&mi.m_nMCCPort, mi.m_szMCCSuffix) != 0)
-	{
-		DSMessageBoxOK(ERR_NO_CONFIG_URL_TITLE, ERR_NO_CONFIG_URL, 0);
-		return FALSE;
-	}
-
-
-        return TRUE;
-	}	
-
-
-	LoadString( mi.m_hModule, ERR_READ_GLOBAL_CACHE, szFormat, MAX_STR_SIZE);
-					
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_FULL_MACHINE_NAME, "\0", 
-		                     mi.m_szInstanceHostName, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-	if (mi.m_szInstanceHostName[0] == 0)
-		DSGetHostName(mi.m_szInstanceHostName, MAX_STR_SIZE);
-
-	if(NULL == mi.m_szMCCBindAs )
-	{
-		mi.m_szMCCBindAs = malloc(MAX_STR_SIZE);
-	}
-
-    GetPrivateProfileString(lpszSectionName, GLOBAL_INF_LDAP_USER, "\0", 
-		                     mi.m_szMCCBindAs, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-    if ( 0 == lstrcmp(mi.m_szMCCBindAs, "\0") )
-	{
-		DSMessageBoxOK(ERR_NO_SS_ADMIN_TITLE, ERR_NO_SS_ADMIN, 0);
-	    return FALSE;
-	}else{
-
-		/* stevross: now that cgi can handle full DN 
-			Sspt UID is same user as MCC BindAs no matter what
-			look into removing later once get instance creatin working */
-			my_strncpy(mi.m_szSsptUid, mi.m_szMCCBindAs, sizeof(mi.m_szSsptUid));
-	}
-
-    GetPrivateProfileString(lpszSectionName, GLOBAL_INF_LDAP_PASSWD, "\0", 
-		                     mi.m_szMCCPw, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-    if ( 0 == lstrcmp(mi.m_szMCCPw, "\0") )
-	{
-		DSMessageBoxOK(ERR_NO_PW_TITLE, ERR_NO_PW, 0);
-	    return FALSE;
-	}else{
-		/* use password for sspt user since this is the ssptuser */
-		my_strncpy(mi.m_szSsptUidPw, mi.m_szMCCPw, sizeof(mi.m_szSsptUidPw));
-	    my_strncpy(mi.m_szSsptUidPwAgain, mi.m_szSsptUidPw, sizeof(mi.m_szSsptUidPwAgain));
-	}
-
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_ADMIN_DOMAIN, "\0", 
-		                     mi.m_szAdminDomain, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_K_LDAP_URL, "\0", 
-		                     mi.m_szLdapURL, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-	if( GetURLComponents(mi.m_szLdapURL, mi.m_szMCCHost, 
-			&mi.m_nMCCPort, mi.m_szMCCSuffix) != 0)
-	{
-		DSMessageBoxOK(ERR_NO_CONFIG_URL_TITLE, ERR_NO_CONFIG_URL, 0);
-		return FALSE;
-	}
-
-	GetPrivateProfileString(lpszSectionName, SLAPD_KEY_USER_GROUP_LDAP_URL, "\0", 
-		                     mi.m_szUserGroupURL, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-	if( GetURLComponents(mi.m_szUserGroupURL, mi.m_szUGHost, 
-		&mi.m_nUGPort, mi.m_szUGSuffix) != 0)
-	{
-		DSMessageBoxOK(ERR_NO_USER_URL_TITLE, ERR_NO_USER_URL, 0);
-		return FALSE;
-	}
-
-	GetPrivateProfileString(lpszSectionName, SLAPD_KEY_USER_GROUP_ADMIN_ID, "\0", 
-		                      mi.m_szUserGroupAdmin, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-	GetPrivateProfileString(lpszSectionName, SLAPD_KEY_USER_GROUP_ADMIN_PWD, "\0", 
-		                      mi.m_szUserGroupAdminPW, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-  return TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// DSINST_ReadLocalCache
-//
-// This function is called by the installation framework during silent install
-// to intialize your data from the local section of the cache created above.
-// Here you should read any information stored in the installation cache's
-// local section that you need.  If this operation succeeds return TRUE,
-// otherwise display an error message and return FALSE to indicate an error.
-//
-
-BOOL __declspec(dllexport)
-DSINST_ReadLocalCache(LPCSTR lpszCacheFileName, LPCSTR lpszSectionName)
-{
-  // TODO: Add code to read data from the cache file (INI format) under the
-  // specified section name.
-	char	szTemp[BUFSIZ];
-	CHAR szFormat[MAX_STR_SIZE];
-
-	/* only ting we know on this section during reinstall is SNMP value */
-	if(1 == mi.m_nReInstall)
-	{
-		
-	   GetPrivateProfileString(lpszSectionName, LOCAL_INF_SNMP_ON, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-		mi.m_nSNMPOn  = yesno2onezero(szTemp);
-
-	    return TRUE;
-	}	
-
-
-	LoadString( mi.m_hModule, ERR_READ_LOCAL_CACHE, szFormat, MAX_STR_SIZE);
-
-	GetPrivateProfileString(lpszSectionName, SLAPD_KEY_USE_EXISTING_MC, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-	mi.m_nExistingMCC = yesno2onezero(szTemp);
-
-	GetPrivateProfileString(lpszSectionName, SLAPD_KEY_USE_EXISTING_UG, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-	mi.m_nExistingUG = yesno2onezero(szTemp);
-
-    mi.m_nInstanceServerPort = GetPrivateProfileInt(lpszSectionName, 
-		SLAPD_KEY_SERVER_PORT, DEFAULT_SERVER_PORT, lpszCacheFileName);
-
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SUFFIX, "\0", 
-		                     mi.m_szInstanceSuffix, MAX_STR_SIZE, 
-							 lpszCacheFileName);
- 
-	GetPrivateProfileString(lpszSectionName, SLAPD_KEY_ROOTDN, "\0", 
-		                     mi.m_szInstanceUnrestrictedUser, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-   
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_ROOTDNPWD, "\0", 
-		                     mi.m_szInstancePassword, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-    my_strncpy(mi.m_szInstancePasswordAgain, mi.m_szInstancePassword, sizeof(mi.m_szInstancePasswordAgain));
-
-
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SERVER_IDENTIFIER, "\0", 
-		                     mi.m_szServerIdentifier, MAX_STR_SIZE, 
-							 lpszCacheFileName);
-
-     GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SLAPD_CONFIG_FOR_MC, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-	mi.m_nCfgSspt = yesno2onezero(szTemp);
-
-    /*stevross: should I add more error checking below? These are only required in certain cases*/
-
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_ADD_SAMPLE_ENTRIES, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-	mi.m_nPopulateSampleEntries = yesno2onezero(szTemp);
-
-
-    GetPrivateProfileString(lpszSectionName, SLAPD_KEY_ADD_ORG_ENTRIES, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-	mi.m_nPopulateSampleOrg = yesno2onezero(szTemp);
-
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SETUP_CONSUMER, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-   /* value should be no, 1 or 2 to be like unix installer*/
-   if(!strcmpi(szTemp, "no") )
-   {
-		mi.m_nSetupConsumerReplication = NO_REPLICATION;
-   }else{
-	    mi.m_nSetupConsumerReplication = GetPrivateProfileInt(lpszSectionName, SLAPD_KEY_SETUP_CONSUMER, 
-	                                                      DEFAULT_SETUP_CONSUMER, lpszCacheFileName);
-   }
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_HOST, "\0", 
-                           mi.m_szConsumerHost, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-
-   mi.m_nConsumerPort = GetPrivateProfileInt(lpszSectionName, SLAPD_KEY_CIR_PORT, 
-                                                        DEFAULT_CIR_PORT, lpszCacheFileName);
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_SUFFIX, "\0", 
-                           mi.m_szConsumerRoot, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-  
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_BINDDN, "\0", 
-                           mi.m_szConsumerBindAs, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-
- 
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_BINDDNPWD, "\0", 
-                           mi.m_szConsumerPw, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-   
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_SECURITY_ON, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-   mi.m_nConsumerSSL = yesno2onezero(szTemp);
-
-
-   mi.m_nCIRInterval = GetPrivateProfileInt(lpszSectionName, SLAPD_KEY_CIR_INTERVAL, 
-														DEFAULT_CIR_INTERVAL, lpszCacheFileName);
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_DAYS, DEFAULT_CIR_DAYS, 
-                           mi.m_szCIRDays, N_DAYS, 
-	    	 			   lpszCacheFileName);
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CIR_TIMES, DEFAULT_CIR_TIMES, 
-                           mi.m_szCIRTimes, N_TIMES, 
-	    	 			   lpszCacheFileName);
-  
-  
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_REPLICATIONDN, "\0", 
-                           mi.m_szSupplierDN, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
- 
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_REPLICATIONPWD, "\0", 
-                           mi.m_szSupplierPW, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-
-   /* read from cache, so copy it to mi.m_szSupplierPWAgain); */
-   my_strncpy(mi.m_szSupplierPWAgain, mi.m_szSupplierPW, sizeof(mi.m_szSupplierPWAgain));
-   
-   /* Supplier replication settings */
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SETUP_SUPPLIER, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-   /* value should be no, 1 or 2 to be like unix installer*/
-   if(!strcmpi(szTemp, "no"))
-   {
-		mi.m_nSetupSupplierReplication = NO_REPLICATION;
-   }else{
-	    mi.m_nSetupSupplierReplication = GetPrivateProfileInt(lpszSectionName, SLAPD_KEY_SETUP_SUPPLIER, 
-	                                                      DEFAULT_SETUP_CONSUMER, lpszCacheFileName);
-   }
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CHANGELOGDIR, "\0", 
-                           mi.m_szChangeLogDbDir, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-  
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CHANGELOGSUFFIX, "\0", 
-                           mi.m_szChangeLogSuffix, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_HOST, "\0", 
-                           mi.m_szSupplierHost, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-
-   mi.m_nSupplierPort = GetPrivateProfileInt(lpszSectionName, SLAPD_KEY_SIR_PORT, 
-                                                        DEFAULT_SIR_PORT, lpszCacheFileName);
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_SUFFIX, "\0", 
-                           mi.m_szSupplierRoot, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-  
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_BINDDN, "\0", 
-                           mi.m_szSupplierBindAs, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-
- 
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_BINDDNPWD, "\0", 
-                           mi.m_szSupplierPw, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-   
-   
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_SECURITY_ON, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-   mi.m_nSupplierSSL  = yesno2onezero(szTemp);
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_DAYS,DEFAULT_SIR_DAYS, 
-                           mi.m_szSIRDays, N_DAYS, 
-	    	 			   lpszCacheFileName);
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_SIR_TIMES, DEFAULT_SIR_TIMES, 
-                           mi.m_szSIRTimes, N_TIMES, 
-	    	 			   lpszCacheFileName);   
-  
-   GetPrivateProfileString(lpszSectionName, LOCAL_INF_CONFIG_CONSUMER_DN, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-   mi.m_nConfigConsumerDN  = yesno2onezero(szTemp);
-
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CONSUMERDN, "\0", 
-                           mi.m_szConsumerDN, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
- 
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_CONSUMERPWD, "\0", 
-                           mi.m_szConsumerPW, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-
-   my_strncpy(mi.m_szConsumerPWAgain, mi.m_szConsumerPW, sizeof(mi.m_szConsumerPWAgain));
-   
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_INSTALL_LDIF_FILE, DEFAULT_INF_POP_LDIF_FILE, 
-                           mi.m_szPopLdifFile, MAX_STR_SIZE, 
-	    	 			   lpszCacheFileName);
-   
-   
-   GetPrivateProfileString(lpszSectionName, SLAPD_KEY_DISABLE_SCHEMA_CHECKING, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-   mi.m_nDisableSchemaChecking  = yesno2onezero(szTemp);
-
-
-
-   GetPrivateProfileString(lpszSectionName, LOCAL_INF_SNMP_ON, "\0", 
-		                     szTemp, BUFSIZ, 
-							 lpszCacheFileName);
-
-	mi.m_nSNMPOn  = yesno2onezero(szTemp);
-
-	if ( SILENTMODE == MODE)
-	{
-		/* verify settings here as they didn't get verified in dialog */
-		/* stop install if find something bad */
-
-		/* things that always need to be checked */
-		if (    Verify_Server_Settings() )
-		{
-			/* error in server settings */
-			return FALSE;
-		}
-
-		if ( Verify_ROOTDN() )
-		{
-			return FALSE;
-		}
-
-#ifdef CUSTOM_REPL_FOR_4X
-		if (SUPPLIER_SIR_REPLICATION == mi.m_nSetupSupplierReplication)
-		{
-			/* always need to check changelogdb and suffix */
-			if ( Verify_Supplier_Replication() )
-			{
-				return FALSE;
-
-			}
-			
-			/* check replication agreement */
-			if (  VerifyReplAgreement(mi.m_szSupplierHost, 
-									  &mi.m_nSupplierPort,
-									  mi.m_szSupplierRoot,
-									  mi.m_szSupplierBindAs,
-									  mi.m_szSupplierPw,
-									  mi.m_szSIRDays,
-									  mi.m_szSIRTimes) )
-			{
-				return FALSE;
-			}
-
-
-		}
-
-		if (SUPPLIER_CIR_REPLICATION == mi.m_nSetupSupplierReplication)
-		{
-			/* always need to check changelogdb and suffix */
-			if ( Verify_Supplier_Replication() )
-			{
-				return FALSE;
-
-
-			}
-
-			if ( Verify_Consumer_DN() )
-			{
-				return FALSE;
-			}
-		}
-
-		if (CONSUMER_SIR_REPLICATION == mi.m_nSetupConsumerReplication)
-		{
-			if ( Verify_Consumer_Replication() )
-			{
-				return FALSE;
-			}
-		}
-
-		if (CONSUMER_CIR_REPLICATION == mi.m_nSetupConsumerReplication)
-		{
-			if ( VerifyReplAgreement(mi.m_szConsumerHost, 
-									 &mi.m_nConsumerPort,
-									 mi.m_szConsumerRoot,
-									 mi.m_szConsumerBindAs,
-									 mi.m_szConsumerPw,
-									 mi.m_szCIRDays,
-									 mi.m_szCIRTimes) )
-			{
-				return FALSE;
-			}
-
-		}
-#endif
-	}
-
-	/* set ldap settings for silent install mode */
-        if(1 != mi.m_nReInstall)
-	{
-             set_ldap_settings();
-        }
-
-	return TRUE;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// DSINST_ReadComponentInf
-//
-// 
-
-BOOL __declspec(dllexport) DSINST_ReadComponentInf(LPCSTR pszCacheFile, LPCSTR pszSection) 
-{ 
-
-  char szValue[MAX_PATH]; 
-
-  myLogData("In DSINST_ReadComponentInf: file [%s] section [%s]",
-			pszCacheFile, pszSection);
-  GetPrivateProfileString(pszSection, SETUP_INF_COM_VENDOR, "", szValue, sizeof(szValue), pszCacheFile); 
-  cd.szVendor = _strdup(szValue); 
-  GetPrivateProfileString(pszSection, SETUP_INF_COM_DESC, "", szValue, sizeof(szValue), pszCacheFile); 
-  cd.szDescription = _strdup(szValue); 
-  GetPrivateProfileString(pszSection, SETUP_INF_COM_NAME, "", szValue, sizeof(szValue), pszCacheFile); 
-  cd.szName = _strdup(szValue); 
-  GetPrivateProfileString(pszSection, SETUP_INF_COM_NICKNAME, "", szValue, sizeof(szValue), pszCacheFile); 
-  cd.szNickname = _strdup(szValue); 
-  GetPrivateProfileString(pszSection, SETUP_INF_COM_VERSION, "", szValue, sizeof(szValue), pszCacheFile); 
-  cd.szVersion = _strdup(szValue); 
-  GetPrivateProfileString(pszSection, SETUP_INF_COM_BUILDNUMBER, "", szValue, sizeof(szValue), pszCacheFile); 
-  cd.szBuildNumber = _strdup(szValue); 
-  GetPrivateProfileString(pszSection, SETUP_INF_COM_REVISION, "", szValue, sizeof(szValue), pszCacheFile); 
-  cd.szRevision = _strdup(szValue); 
-  GetPrivateProfileString(pszSection, SETUP_INF_COM_EXPIRY, "", szValue, sizeof(szValue), pszCacheFile); 
-  cd.szExpireDate = _strdup(szValue); 
-  GetPrivateProfileString(pszSection, SETUP_INF_COM_SECURITY, "", szValue, sizeof(szValue), pszCacheFile); 
-  cd.szSecurity = _strdup(szValue); 
-  cd.szTimeStamp = _strdup(getGMT()); 
-
-  myLogData("In DSINST_ReadComponentInf: name=%s nick=%s version=%s build=%s "
-			"rev=%s time=%s",
-			cd.szName, cd.szNickname, cd.szVersion, cd.szBuildNumber, cd.szRevision,
-			cd.szTimeStamp);
-  return TRUE; 
-} 
-
-//////////////////////////////////////////////////////////////////////////////
-// run_cgi
-//
-// 
-// runs a cgi
-// 
-// 
-// 
-// 
-//
-
-static int
-run_cgi(const char *serverroot, const char *cgipath, const char *args)
-{
-	int status = 0;
-    DWORD procResult;
-	DWORD dwLastError = 0;
-    char prog[MAX_STR_SIZE] = {0};
-	char cmdLine[MAX_STR_SIZE] = {0};
-	char netsiteRootEnvVar[MAX_STR_SIZE] = {0};
-    LPVOID lpMsgBuf;
-
-    my_snprintf(netsiteRootEnvVar, sizeof(netsiteRootEnvVar), "NETSITE_ROOT=%s", serverroot);
-    _putenv(netsiteRootEnvVar);
-    if ( getenv("DEBUG_DSINST") )
-		DebugBreak();
-    /* everything is set, start the program */
-	my_snprintf(prog, sizeof(prog), "%s\\%s", serverroot, cgipath);
-	if (!FileExists(prog))
-	{
-		lpMsgBuf = getLastErrorMessage();
-
-		DSMessageBoxOK(ERR_NO_FIND_INST_PROG_TITLE,
-					   ERR_NO_FIND_INST_PROG, 0, prog, lpMsgBuf, LOGFILE);
-
-
-        status = -1;
-		myLogData("Error: could not find program %s: %d (%s)", prog, GetLastError(), lpMsgBuf);
-        LocalFree( lpMsgBuf );
-	}
-	else
-	{
-		my_snprintf(cmdLine, sizeof(cmdLine), "\"%s\" %s", prog, args);
-        
-		myLogData("run_cgi: before execution of %s", cmdLine);
-		if ( (procResult = _LaunchAndWait(cmdLine, INFINITE)) != 0)
-		{
-			dwLastError = GetLastError();
-			lpMsgBuf = getLastErrorMessage();
-
-			myLogData("Error: could not run %s: %d (%s)", cmdLine, dwLastError, lpMsgBuf);
-			if(0 == dwLastError)
-			{
-				DSMessageBoxOK(ERR_EXEC_INST_PROG_TITLE, ERR_UNK_INST_CREATE, 0,
-							   prog, LOGFILE);
-			}else {
-				DSMessageBoxOK(ERR_EXEC_INST_PROG_TITLE, ERR_EXEC_INST_PROG, 0,
-							   prog, lpMsgBuf, LOGFILE);
-			}
-            
-            LocalFree( lpMsgBuf );
-            status = -1;
-		}
-		myLogData("run_cgi: after execution of %s", cmdLine);
-	}
-
-	return status;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// create_slapd_instance
-//
-// 
-// creates a instance of slapd 
-// 
-// 
-// 
-// 
-//
-
-
-static int
-create_slapd_instance(const char *hostname, const char *serverroot)
-{
-    int status = 0;
-    char INFfile[MAX_STR_SIZE] = {0};
-    char debugFile[MAX_STR_SIZE] = {0};
-    struct _stat statbuf;	
-    static char contentLength[100] = {0};	
-    static char admservRoot[MAX_STR_SIZE] = {0};
-    static char serverUrl[MAX_STR_SIZE] = {0};
-    static char scriptName[MAX_STR_SIZE] = {0};
-	char szCGIArgs[MAX_STR_SIZE]= {0};
-    LPVOID lpMsgBuf;
-
-	/* create an .inf file to pass to index */
-	/* write the data to a temp file */
-	my_snprintf(INFfile, sizeof(INFfile), "%s\\temp%d.inf", TEMPDIR, _getpid());
-	myLogData("create_slapd_instance: inf file is %s", INFfile);
-
-	if (TRUE == (status = writeINFfile(INFfile)) )
-	{
-		if (status = _stat(INFfile, &statbuf))
-		{
-			lpMsgBuf = getLastErrorMessage();
-			DSMessageBoxOK(ERR_NO_STAT_TMP_FILE_TITLE,
-						   ERR_NO_STAT_TMP_FILE, 0, INFfile, lpMsgBuf);
-
-            LocalFree(lpMsgBuf);
-		}
-		else
-		{
-            /* set temp file for admin output */
-            my_snprintf(debugFile, sizeof(debugFile), "DEBUG_FILE=%s\\debug.%d", TEMPDIR, _getpid());
-            _putenv(debugFile);
-			my_snprintf(szCGIArgs, sizeof(szCGIArgs), "\"%s\\bin\\slapd\\admin\\bin\\Install.pl\"",
-					serverroot);
-		    if (mi.m_nReInstall) 
-			{ 
-				PL_strcatn(szCGIArgs, sizeof(szCGIArgs), " -r -f ");
-				/* add the -r flag if reinstalling */ 
-			} else 
-			{ 
-				PL_strcatn(szCGIArgs, sizeof(szCGIArgs), " -f ");
-			}
-			PL_strcatn(szCGIArgs, sizeof(szCGIArgs), "\"");
-			PL_strcatn(szCGIArgs, sizeof(szCGIArgs), INFfile);
-			PL_strcatn(szCGIArgs, sizeof(szCGIArgs), "\"");
-			myLogData("create_slapd_instance: executing %s %s",
-				  PERL_EXE, szCGIArgs);
-			status = run_cgi(serverroot, PERL_EXE, szCGIArgs); 
-		}		
-	}
-
-	if (!getenv("USE_LOGFILE"))
-	  _unlink(INFfile); 
-
-	return status;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// 
-// generate_mcc_bat
-// 
-// make bat file with correct classpath, and host/port to start console
-// 
-//
-
-int generate_mcc_bat()
-{
-
-    FILE *fp;
-    CHAR szFilename[MAX_STR_SIZE];
-    CHAR szJavaDir[MAX_STR_SIZE];
-    INT rc = 0;
-
-    // don't generate the file unless asked
-    if (!getenv("GENERATE_MCC_BAT")) {
-	return rc;
-    }
-
-    my_snprintf(szFilename, sizeof(szFilename), "%s\\%s-%s\\mcc.bat", TARGETDIR, DS_ID_SERVICE,
-			mi.m_szServerIdentifier);
-    fp = fopen(szFilename, "wb");
-    if (!fp)
-    {
-		DSMessageBoxOK(ERR_NO_CREATE_FILE_TITLE,
-					   ERR_NO_CREATE_FILE, 0, szFilename);
-    	rc = -1;
-    }else{
-        my_snprintf(szJavaDir, sizeof(szJavaDir), "%s\\java", TARGETDIR);
-                              
-        fprintf(fp, "pushd \"%s\"\n", szJavaDir);
-
-        /* use jre */
-        fprintf(fp, "%s\\jre\\bin\\jre.exe -cp ", TARGETDIR);
-        
-        /* classes for classpath -cp option on jre */
-        fprintf(fp, "%s\\ds50.jar;", szJavaDir);
-        fprintf(fp, "%s\\ds50_en.jar;", szJavaDir);
-	fprintf(fp, "%s\\admserv45.jar;", szJavaDir);
-	fprintf(fp, "%s\\admserv45_en.jar;", szJavaDir);
-        fprintf(fp, "%s\\mcc45.jar;", szJavaDir);
-        fprintf(fp, "%s\\mcc45_en.jar;", szJavaDir);
-        fprintf(fp, "%s\\ldapjdk.jar;", szJavaDir);
-        fprintf(fp, "%s\\nmclf45.jar;", szJavaDir);
-        fprintf(fp, "%s\\nmclf45_en.jar;", szJavaDir);
-        fprintf(fp, "%s\\ssl.zip;", szJavaDir);
-        fprintf(fp, "%s\\base.jar;", szJavaDir);
-        fprintf(fp, "%s ", szJavaDir);
-       
-        /* command and arguments to execute the console for this server */
-        fprintf(fp, "com.netscape.management.client.console.Console -d %s -p %d -b \"%s\"\n",
-                     mi.m_szMCCHost, mi.m_nMCCPort, mi.m_szMCCSuffix);
-        fprintf(fp, "popd\n");
-
-        fclose(fp);
-
-        rc = 0;
-    }
- 
- return rc;
-
-}
-
-
-//
-//  Generates bat file to install ldap ctrs, since have to be in the same directory to get .h file
-//
-
-
-int generate_install_ldapctrs_bat()
-{
-
-    FILE *fp;
-    CHAR szFilename[MAX_STR_SIZE];
-    INT rc = 0;
-
-    my_snprintf(szFilename, sizeof(szFilename), "%s\\%s", TARGETDIR, INSTALL_CTRS_BAT);
-    fp = fopen(szFilename, "wb");
-    if (!fp)
-    {
-		DSMessageBoxOK(ERR_NO_CREATE_FILE_TITLE,
-					   ERR_NO_CREATE_FILE, 0, szFilename);
-    	rc = -1;
-    }else{
-        fprintf(fp, "copy  %s\\%s\\nsldapctr*.* %s\n", 
-                    TARGETDIR, BIN_SLAPD_INSTALL_BIN, WINSYSDIR);
-
-        fprintf(fp, "%s\\lodctr nsldapctrs.ini\n", WINSYSDIR);
-
-        fprintf(fp, "del %s\\nsldapctr*.*\n", WINSYSDIR);
-
-        fclose(fp);
-         rc = 0;
-    }
- 
- return rc;
-
-}
-
-
-//--------------------------------------------------------------------------//
-// Install perfmon                                                          //
-//     Creates Registry keys and loads counters for permon etc              //
-//--------------------------------------------------------------------------//
-BOOL _InstallPerfmon(char *szServerRoot)
-{
-    BOOL bReturn = FALSE;
-    HKEY hKey;
-    DWORD dwDisposition;
-    char szKey[MAX_PATH];
-    char szTemp[MAX_PATH];
-	int maxpath = MAX_PATH;
-	char *reg = REGSTR_PATH_SERVICES;
-	char *id = SVR_ID_SERVICE;
-	char *ver = SVR_VERSION;
-	char *key = KEY_PERFORMANCE;
-
-    wsprintf(szKey, "%s\\%s%s\\%s", REGSTR_PATH_SERVICES, SVR_ID_SERVICE, SVR_VERSION, KEY_PERFORMANCE);
-    if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, szKey, 0, "", REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) == ERROR_SUCCESS)
-    {
-        RegSetValueEx(hKey, "Open", 0, REG_SZ, PERF_OPEN_FUNCTION, lstrlen(PERF_OPEN_FUNCTION)+2);
-        RegSetValueEx(hKey, "Collect", 0, REG_SZ, PERF_COLLECT_FUNCTION, lstrlen(PERF_COLLECT_FUNCTION)+2);
-        RegSetValueEx(hKey, "Close", 0, REG_SZ, PERF_CLOSE_FUNCTION, lstrlen(PERF_CLOSE_FUNCTION)+2);
-        wsprintf(szTemp, "%s\\bin\\slapd\\server\\nsldapctr.dll", szServerRoot);
-        RegSetValueEx(hKey, "Library", 0, REG_SZ, szTemp, lstrlen(szTemp)+2);
-        RegCloseKey(hKey);
-
-        wsprintf(szTemp, "unlodctr %s%s", SVR_ID_SERVICE, SVR_VERSION);
-        _LaunchAndWait(szTemp, INFINITE);
-        
-        generate_install_ldapctrs_bat();
-            
-        wsprintf(szTemp, "%s\\%s",  szServerRoot, INSTALL_CTRS_BAT);
-        _LaunchAndWait(szTemp, INFINITE);
-
-        DeleteFile(szTemp);
-     
-    }
-
-
-
-    return(bReturn);
-}
-
-static void
-CopyAndDeleteKey(
-	HKEY srcBase, const char *srcName,
-	HKEY destBase, const char *destName
-)
-{
-	DWORD index = 0;
-	LONG retval = 0;
-	HKEY srcHKEY;
-	HKEY destHKEY;
-	char className[MAX_PATH+1] = {0};
-	DWORD classLen = MAX_PATH+1;
-	DWORD nKeys = 0, maxKeyLen = 0, maxClassLen = 0, nValues = 0,
-		maxValueNameLen = 0, maxValueDataLen = 0;
-	DWORD disposition = 0;
-
-	// open the source key
-	retval = RegOpenKey(srcBase, srcName, &srcHKEY);
-	if (retval != ERROR_SUCCESS) {
-		myLogError("CopyAndDeleteKey: could not open src key %s: ret = %d\n",
-				   srcName, retval);
-		return;
-	}
-
-	// get the info from the old key
-	retval = RegQueryInfoKey(srcHKEY, className, &classLen, 0, &nKeys, &maxKeyLen,
-							 &maxClassLen, &nValues, &maxValueNameLen,
-							 &maxValueDataLen, 0, 0);
-	if (retval != ERROR_SUCCESS) {
-		myLogError("CopyAndDeleteKey: could not read src key info %s: ret = %d\n",
-				   srcName, retval);
-		return;
-	}
-
-	// create the new key based on the info in the old key
-	retval = RegCreateKeyEx(destBase, destName, 0, className,
-							REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, 0,
-							&destHKEY, &disposition);
-	if (retval != ERROR_SUCCESS) {
-		myLogError("CopyAndDeleteKey: creating new key %s: ret = %d\n",
-				   destName, retval);
-		return;
-	}
-
-	// copy all of the values from the old key to the new key
-	for (index = 0; index < nValues; ++index) {
-		DWORD valueNameLen = maxValueNameLen+1;
-		DWORD valueType = 0;
-		DWORD valueDataLen = maxValueDataLen+1;
-		char *valueName = calloc(1, valueNameLen);
-		char *valueData = calloc(1, valueDataLen);
-		retval = RegEnumValue(srcHKEY, index, valueName, &valueNameLen, 0,
-							  &valueType, valueData, &valueDataLen);
-		if (retval == ERROR_SUCCESS) {
-			retval = RegSetValueEx(destHKEY, valueName, 0, valueType,
-								   valueData, valueDataLen);
-			if (retval != ERROR_SUCCESS) {
-				myLogError("CopyAndDeleteKey: could not write value %s to key %s\n",
-						   valueName, destName);
-			}
-		} else {
-			myLogError("CopyAndDeleteKey: could not read value %d:%s from key %s\n",
-					   index, (valueName ? valueName : "null"), destName);
-		}
-		free(valueName);
-		free(valueData);
-	}
-
-	// copy all of the sub keys as well; since we're deleting keys as we go along,
-	// the actual nKeys will change
-	if (nKeys > 0) {
-		for (index = nKeys; index; --index) {
-			DWORD keyNameLen = maxKeyLen+1;
-			char *keyName = calloc(1, keyNameLen);
-			retval = RegEnumKey(srcHKEY, index-1, keyName, keyNameLen);
-			if (retval == ERROR_SUCCESS) {
-				CopyAndDeleteKey(srcHKEY, keyName, destHKEY, keyName);
-			} else {
-				myLogError("CopyAndDeleteKey: could not get key %d:%s of nKeys %d:"
-						   "error %d\n", index-1, (keyName ? keyName : "null"),
-						   nKeys, retval);
-			}
-			free(keyName);
-		}
-	}
-
-	// close the destination key
-	retval = RegCloseKey(destHKEY);
-	if (retval != ERROR_SUCCESS) {
-		myLogError("CopyAndDeleteKey: could not close dest key %s\n",
-				   destName);
-	}
-
-	// close the source key
-	retval = RegCloseKey(srcHKEY);
-	if (retval != ERROR_SUCCESS) {
-		myLogError("CopyAndDeleteKey: could not close source key %s\n",
-				   srcName);
-	}
-
-	// delete the source key
-	retval = RegDeleteKey(srcBase, srcName);
-	if (retval != ERROR_SUCCESS) {
-		myLogError("CopyAndDeleteKey: could not delete source key %s\n",
-				   srcName);
-	}
-
-	return;
-}
-
-// This function will rename the registry keys from the old version to
-// the new version
-static void
-updateRegistryKeys(const char *oldVersion, const char *newVersion)
-{
-	char oldKey[MAX_PATH] = {0};
-	char newKey[MAX_PATH] = {0};
-	int retval = 0;
-	DWORD index = 0;
-	HKEY svrHKEY;
-	DWORD nKeys = 0;
-	DWORD maxKeyLen = 0;
-	char *ptr = 0;
-
-	// There are three places we need to change
-	// the first place is under
-	// HKEY_LOCAL_MACHINE\SOFTWARE\Netscape\Directory\oldVersion
-	// we need to change oldVersion to newVersion
-	my_snprintf(newKey, sizeof(newKey), "%s\\%s", KEY_SOFTWARE_NETSCAPE, SVR_KEY_ROOT);
-	strcpy(oldKey, newKey);
-	if (ptr = strstr(oldKey, SVR_VERSION)) {
-		my_strncpy(ptr, oldVersion, strlen(oldVersion));
-	}
-
-	myLogData("updateRegistryKeys: copying %s to %s\n",
-			  oldKey, newKey);
-	CopyAndDeleteKey(HKEY_LOCAL_MACHINE, oldKey, HKEY_LOCAL_MACHINE,
-					 newKey);
-
-	// the second place is under
-	// HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\slapdoldVersoin
-	// we need to change oldVersion to newVersion
-	my_snprintf(oldKey, sizeof(oldKey), "%s\\%s%s", KEY_SERVICES, PRODUCT_NAME,
-			oldVersion);
-	my_snprintf(newKey, sizeof(newKey), "%s\\%s%s", KEY_SERVICES, PRODUCT_NAME,
-			SVR_VERSION);
-
-	CopyAndDeleteKey(HKEY_LOCAL_MACHINE, oldKey, HKEY_LOCAL_MACHINE,
-					 newKey);
-
-	// the third place is under
-	// HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\slapd-instance
-	// for each instance, we need to replace the DisplayName value with
-	// the new display name
-
-	// open the services key
-	retval = RegOpenKey(HKEY_LOCAL_MACHINE, KEY_SERVICES, &svrHKEY);
-	
-	// get the info from the key
-	retval = RegQueryInfoKey(svrHKEY, 0, 0, 0, &nKeys, &maxKeyLen,
-							 0, 0, 0,
-							 0, 0, 0);
-	if (retval != ERROR_SUCCESS) {
-		myLogError("updateRegistryKeys: could not read info %s: ret = %d\n",
-				   KEY_SERVICES, retval);
-		return;
-	}
-
-	// iterate the keys under Services
-	for (index = 0; index < nKeys; ++index) {
-		DWORD keyNameLen = maxKeyLen+1;
-		char *keyName = calloc(1, keyNameLen);
-		retval = RegEnumKey(svrHKEY, index, keyName, keyNameLen);
-		if (retval == ERROR_SUCCESS && keyName &&
-			!strncmp(keyName, PRODUCT_NAME, strlen(PRODUCT_NAME))) {
-			// read the DisplayName value from the key
-			HKEY key;
-			retval = RegOpenKey(svrHKEY, keyName, &key);
-			if (retval == ERROR_SUCCESS) {
-				DWORD type = REG_SZ;
-				char oldValue[MAX_PATH+1] = {0};
-				DWORD oldValueLen = MAX_PATH+1;
-				char *ptr = 0;
-
-				retval = RegQueryValueEx(key, "DisplayName", 0, &type,
-										 oldValue, &oldValueLen);
-				// if the DisplayName contains the old version number . . .
-				if ((retval == ERROR_SUCCESS) &&
-					(ptr = strstr(oldValue, oldVersion))) {
-					// . . . replace it
-					strncpy(ptr, SVR_VERSION, strlen(SVR_VERSION));
-					retval = RegSetValueEx(key, "DisplayName", 0, type,
-										   oldValue, oldValueLen);
-					if (retval != ERROR_SUCCESS) {
-						myLogError("updateRegistryKeys: could not set value %s "
-								   "for key %s\n",
-								   oldValue, keyName);
-					}
-				} else {
-					myLogError("updateRegistryKeys: could not read DisplayName"
-							   "from key %s:%s\n", keyName, oldValue);
-				}
-				RegCloseKey(key);
-			} else {
-				myLogError("updateRegistryKeys: could not open service key %s\n",
-						   keyName);
-			}
-		} else {
-			myLogError("updateRegistryKeys: could not get key %d:%s of nKeys %d:"
-					   "error %d\n", index, (keyName ? keyName : "null"),
-					   nKeys, retval);
-		}
-		free(keyName);
-	}
-
-	RegCloseKey(svrHKEY);
-
-	// finally, remove the old Uninstall string
-#define REG_UNINST "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Netscape Server Family 4.0"
-	myLogData("Deleting key %s", REG_UNINST);
-	DeleteServerRegistryKey(HKEY_LOCAL_MACHINE, REG_UNINST);
-}
-
-// This function makes sure nsperl is installed and running before the main slapd
-// post install runs, which needs nsperl to run
-static BOOL
-NSPERLINST_PostInstall(VOID)
-{
-  BOOL bRC = TRUE;
-  char *p = 0;
-  char instDir[BUFSIZ] = {0};
-  char nsPerlPostInstall[MAX_PATH] = {0};
-  char infFile[MAX_PATH] = {0};
-  char srcPath[MAX_PATH] = {0};
-  char destPath[MAX_PATH] = {0};
-  char szCurrentDir[MAX_STR_SIZE] = {0};
-
-  if (GetCurrentDirectory(MAX_STR_SIZE, szCurrentDir) == 0) {
-    myLogError("NSPERLINST_PostInstall could not determine the current directory");
-    return FALSE;
-  }
-
-  // hack to work around potential bug in setuputil . . .
-  SetCurrentDirectory("../slapd");
-  my_snprintf(infFile, sizeof(infFile), "slapd.inf");
-  GetProductInfoStringWithTok(NSPERL_POST_INSTALL_PROG, "=", nsPerlPostInstall,
-			      BUFSIZ, infFile);
-
-  p = strrchr(nsPerlPostInstall, '/');
-  if (!p)
-	p = strrchr(nsPerlPostInstall, '\\');
-  if (!p) {
-	// punt
-    myLogError("NSPERLINST_PostInstall: could not get the post install program %s"
-	       " from the info file %s", nsPerlPostInstall, infFile);
-    return FALSE;
-  }
-
-  // get the RunPostInstall attribute from the inf; this is the name
-  // of the post install program
-  *p = 0; // p points at last dir sep in the path, so null it
-  my_snprintf(instDir, sizeof(instDir), "%s\\%s", TARGETDIR, nsPerlPostInstall);
-  p++;
-
-  // change directory to the directory of the post install program and
-  // execute it
-  if (SetCurrentDirectory(instDir) == 0) {
-    myLogError("NSPERLINST_PostInstall: could not change directory to %s",
-	       instDir);
-    return FALSE;
-  }
-
-  if (_LaunchAndWait(p, INFINITE) != 0) {
-    myLogError("NSPERLINST_PostInstall: could not run the nsperl post install"
-	       " program %s from directory %s", p, instDir);
-
-    SetCurrentDirectory(szCurrentDir);
-    return FALSE;
-  }
-
-  SetCurrentDirectory(szCurrentDir);
-
-  my_snprintf(srcPath, sizeof(srcPath), "%s\\nsperl.exe", instDir);
-  my_snprintf(destPath, sizeof(destPath), "%s\\%s", TARGETDIR, PERL_EXE);
-
-  if (FALSE == CopyFile(srcPath, destPath, FALSE)) { // FALSE to overwrite file if exists
-    myLogError("NSPERLINST_PostInstall: could not copy file %s to %s",
-	       srcPath, destPath);
-    bRC = FALSE;
-  }
-
-  myLogData("Successfully installed nsPerl");
-  return bRC;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// DSINST_PostInstall
-//
-// The framework calls this function to perform post-installation
-// configuration.  Here you should set values in any product configuration
-// files, install services, add registry keys, start servers, and anything
-// else that can only be done once the binaries are layed down on the disk.
-// If the function succeeds return TRUE, otherwise return FALSE to indicate
-// an error.
-//
-
-BOOL __declspec(dllexport)
-DSINST_PostInstall(VOID)
-{
-	// TODO: Add code to perform configuration.
-	BOOL rc;
-
-	myLogData("DSINST_PostInstall: BEGIN");
-
-	rc = NSPERLINST_PostInstall();
-	
-	/* install perfmon*/
-	_InstallPerfmon(TARGETDIR);
-
-	if (1 == mi.m_nReInstall )
-	{
-		myLogData("DSINST_PostInstall: doing a reinstall");
-		/* if the old version is not equal to the new version, we need to
-		   update the various registry keys */
-		if (strcmp(oldVersion, SVR_VERSION)) {
-			updateRegistryKeys(oldVersion, SVR_VERSION);
-		}
-
-		/* turn servers back on */
-		ControlSlapdServers(TARGETDIR, TRUE, TRUE);
-	
-		/* do any other ReInstall things here */
-	}
-
-	/*create slapd instance detects reinstall and calls index with -r */
-	myLogData("DSINST_PostInstall: before create_slapd_instance %s", mi.m_szInstanceHostName);
-	if (0 == create_slapd_instance(mi.m_szInstanceHostName, TARGETDIR) )
-	{
-		if ( 0 == generate_mcc_bat() )
-		{
-			rc = TRUE;
-		} else
-		{
-			DSMessageBoxOK(ERR_CREATE_MCC_BAT_TITLE, ERR_CREATE_MCC_BAT, 0);
-			rc = FALSE;
-		}
-	} else
-	{
-		DSMessageBoxOK(ERR_CREATE_DS_INSTANCE_TITLE, ERR_CREATE_DS_INSTANCE, 0);
-		rc = FALSE;
-	}
-
-	/* turn SNMP service back on if it was running */
-	if ( 1 == mi.m_nSNMPOn)
-	{
-		if ( 0 == ControlServer(SNMP_SERVICE, TRUE) )
-		{
-			/* complain but continue with install */
-			DSMessageBoxOK(ERR_SNMP_BAD_STARTUP_TITLE, ERR_SNMP_BAD_STARTUP, 0);
-		}
-	}
-	
-	return rc;
-}
-
-//--------------------------------------------------------------------------//
-//                                                                          //
-//--------------------------------------------------------------------------//
-
-static BOOL RemoveSNMPValue(void)
-{
-
-    char  line[MAX_PATH];
-    char  NumValuesBuf[3];
-    DWORD Result;
-    HKEY  hServerKey;
-    DWORD NumValues;
-    DWORD iterator;
-    int   value_already_exists = 0;
-    DWORD type_buffer;
-    char  value_data_buffer[MAX_PATH];
-    DWORD sizeof_value_data_buffer;
-
-    /* open registry key for Microsoft SNMP service  */
-    my_snprintf(line, sizeof(line), "%s\\%s", KEY_SERVICES, KEY_SNMP_SERVICE); 
-    Result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, 
-                          line,
-                          0,
-                          KEY_ALL_ACCESS,
-                          &hServerKey);
-
-    /* if Microsoft SNMP Service is installed look 
-       for slapd snmp value to remove  */
-    if (Result == ERROR_SUCCESS) 
-    {
-        my_snprintf(line, sizeof(line),
-                "%s\\%s\\%s",
-                KEY_SOFTWARE_NETSCAPE, 
-                SVR_KEY_ROOT, 
-                KEY_SNMP_CURRENTVERSION);
-
-        Result = RegQueryInfoKey(hServerKey, 
-                                 NULL, NULL, 
-                                 NULL, NULL, 
-                                 NULL, NULL, 
-                                 &NumValues, 
-                                 NULL, NULL, 
-                                 NULL, NULL);
-        
-        if (Result == ERROR_SUCCESS)
-        {
-            for(iterator = 0; iterator <= NumValues; iterator++)
-            {
-                sizeof_value_data_buffer=MAX_PATH;
-                my_snprintf(NumValuesBuf, sizeof(NumValuesBuf), "%d", iterator);
-                Result = RegQueryValueEx(hServerKey,
-                                         NumValuesBuf,
-                                         NULL,
-                                         &type_buffer,
-                                         value_data_buffer,
-                                         &sizeof_value_data_buffer);
-
-                if(!lstrcmp(value_data_buffer, line))
-                {
-                    /* remove the value */
-                    Result = RegDeleteValue(hServerKey, NumValuesBuf); 
-                    break;
-                }
-            }				
-        }
-    }
-    RegCloseKey(hServerKey);
-
-    return (Result == ERROR_SUCCESS);
-}
-
-BOOL RemoveSNMPKeys(void)
-{
-  
-    char  line[MAX_PATH];
-    BOOL  bRC = TRUE;
-
-    /* open registry key for Directory SNMP s */
-     memset(line, '\0', MAX_PATH);
-     my_snprintf(line, sizeof(line), "%s\\%s\\%s", KEY_SOFTWARE_NETSCAPE, SVR_KEY_ROOT, 
-                             	 KEY_SNMP_CURRENTVERSION);
-    
-     RegDeleteKey(HKEY_LOCAL_MACHINE, line);
-
-     memset(line, '\0', MAX_PATH);
-     my_snprintf(line, sizeof(line), "%s\\%s\\%s", KEY_SOFTWARE_NETSCAPE, SVR_KEY_ROOT, 
-                             	 SNMP_SERVICE_NAME);
-
-     RegDeleteKey(HKEY_LOCAL_MACHINE, line);
-
-     return bRC;
-}
-
-
-BOOL RemovePerfMon(void)
-{
-  
-    char  szTemp[MAX_PATH];
-    BOOL  bRC = TRUE;
-   
-     // uninstall perfmon counters and keys
-     wsprintf(szTemp, "unlodctr %s%s", SVR_ID_SERVICE, SVR_VERSION);
-     _LaunchAndWait(szTemp, 10000);
-
-     wsprintf(szTemp, "%s\\%s%s\\%s", REGSTR_PATH_SERVICES,
-			  SVR_ID_SERVICE, SVR_VERSION, KEY_PERFORMANCE);
-     RegDeleteKey(HKEY_LOCAL_MACHINE, szTemp );
-
-     wsprintf(szTemp, "%s\\%s%s", REGSTR_PATH_SERVICES,
-			  SVR_ID_SERVICE, SVR_VERSION);
-     RegDeleteKey(HKEY_LOCAL_MACHINE, szTemp );
-    
-     return bRC;
-}
-
-BOOL RemoveDirectoryRootKey()
-{     
-    char  line[MAX_PATH];
-    BOOL  bRC = TRUE;
-
-    memset(line, '\0', MAX_PATH);
-    my_snprintf(line, sizeof(line), "%s\\%s", KEY_SOFTWARE_NETSCAPE, DS_NAME_SHORT);
-
-    RegDeleteKey(HKEY_LOCAL_MACHINE, line);
-  
-    return bRC;
-}
-
-static void
-_PumpMessage(HWND hwndMsgDlg)
-{
-  MSG msg;
-
-  while (GetMessage(&msg, NULL, 0, 0))
-  {
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-  }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// ShutdownDialogProc
-//
-//	winproc for status window users sees when trying to shutdown instance so
-//		install doesn't appear to be hung
-//
-//
-
-
-BOOL CALLBACK ShutdownDialogProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
-{
-	int retval;
-
-	myLogData("ShutdownDialog Proc iMsg=%d wParam=%d lParam=%d", iMsg, wParam, lParam);
-
-	switch (iMsg)
-	{
-	
-	case WM_INITDIALOG:
-		retval = SetWindowText(hwnd, dialogMessage);
-		myLogData("19 SetWindowText returns %d", retval);
-		if (!retval) myLogError("19 SetWindowText");
-		retval = SetDlgItemText(hwnd, IDC_STOPPING_SERVER_MESSAGE,
-								dialogMessage);
-		myLogData("20 SetDlgItemText returns %d", retval);
-		if (!retval) myLogError("20 SetDlgItemText");
-		myLogData("iMsg=%d WM_INITDIALOG=%d WM_CREATE=%d msg=%s",
-				iMsg, WM_INITDIALOG, WM_CREATE, dialogMessage); 
-		return TRUE;
-	
-	case WM_DESTROY:
-		PostQuitMessage(0);
-		break;
-	}
-
-	return FALSE;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// shutdownDialog
-//
-//	thread proc for creating shutdown dialog acts as win main translating and
-//	dispatching events
-//
-//
-
-
-void shutdownDialog(ShutdownArg *shutdownargs)
-{
-	CHAR dbg[MAX_STR_SIZE]="\0";
-	int retval;
-
-	dialogMessage = shutdownargs->pszServiceName;
-	myLogData("Before createDialog");
-	shutdownargs->hwnd = CreateDialog(mi.m_hModule,
-									  MAKEINTRESOURCE(IDD_UNINSTALL_STATUS),
-									  NULL,
-									  ShutdownDialogProc);
-	myLogData("After createDialog");
-    if (shutdownargs->hwnd == NULL)
-    {
-		return;
-    }
-
-	CenterWindow(shutdownargs->hwnd);
-	retval = SetWindowText(shutdownargs->hwnd, dialogMessage);
-	myLogData("1 SetWindowText returns %d", retval);
-	retval = GetWindowText(shutdownargs->hwnd, dbg, MAX_STR_SIZE);
-	myLogData("GetWindowText string [%s] retval %d", dbg, retval);
-	retval = SetDlgItemText(shutdownargs->hwnd, IDC_STOPPING_SERVER_MESSAGE,
-							dialogMessage);
-	myLogData("3 SetDlgItemText returns %d", retval);
-	retval = UpdateWindow(shutdownargs->hwnd);
-	myLogData("5 UpdateWindow returns %d", retval);
-	retval = ShowWindow(shutdownargs->hwnd, SW_SHOWNORMAL);
-	myLogData("6 ShowWindow returns %d", retval);
-	retval = UpdateWindow(shutdownargs->hwnd);
-	myLogData("7 UpdateWindow returns %d", retval);
-	retval = SetWindowText(shutdownargs->hwnd, dialogMessage);
-	myLogData("8 SetWindowText returns %d", retval);
-	retval = GetWindowText(shutdownargs->hwnd, dbg, MAX_STR_SIZE);
-	myLogData("9 GetWindowText string [%s] retval %d", dbg, retval);
-	retval = UpdateWindow(shutdownargs->hwnd);
-	myLogData("10 retval=%d msg=%s\n", retval, dialogMessage); 
-
-	_PumpMessage(shutdownargs->hwnd);
-}
-
-BOOL writeUninstINFfile(const char *filename, 
-						const char *pszServerRoot,
-						const char *pszServiceName)
-{
-   FILE *fp = fopen(filename, "wb");
-   CHAR szHostName[MAX_STR_SIZE]="\0";
-
-   DSGetHostName(szHostName, MAX_STR_SIZE);
-   
-   if (NULL == fp)
-	   return FALSE;
-
-   // write section header
-   fprintf(fp, "[uninstall]\n");
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_FULL_MACHINE_NAME, szHostName);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SERVER_ROOT, pszServerRoot);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SERVER_IDENTIFIER, pszServiceName);
-   fprintf(fp, "%s= %s\n", GLOBAL_INF_LDAP_HOST,	GetLdapHost() );
-   fprintf(fp, "%s= %d\n", GLOBAL_INF_LDAP_PORT,	GetLdapPort() );
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SUFFIX,	GetLdapSuffix()	);
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SERVER_ADMIN_ID,	GetLdapUser() );
-   fprintf(fp, "%s= %s\n", SLAPD_KEY_SERVER_ADMIN_PWD,	GetLdapPassword() );
-   fprintf(fp, "%s= %s\n", SLAPD_INSTALL_LOG_FILE_NAME,	LOGFILE );
-   
-   fclose(fp);
-
-   return TRUE;
-}
-
-//////////////////////////////
-//
-//  try to turn a server instance on or off
-//  displays dialog while doing so
-//
-//
-
-void ControlSlapdInstance(char *pszServiceName, BOOL bOn)
-{
-   INT shutdown_tries=0;
-   BOOL bServerRunning=0;
-   CHAR szLog[MAX_STR_SIZE]="\0";
-   CHAR szFormat[MAX_STR_SIZE]="\0";
-   ShutdownArg  shutdownargs;
-   CHAR szMessage[MAX_STR_SIZE]="\0";
-   const CHAR *shortName = getShortName(pszServiceName);
-
-   myLogData("Begin ControlSlapdInstance");
-   if(bOn)
-   {
-   		LoadString( mi.m_hModule, IDS_STARTING_SERVICE, szFormat, MAX_STR_SIZE);
-   }else{
-   		LoadString( mi.m_hModule, IDS_STOPPING_SERVICE, szFormat, MAX_STR_SIZE);
-   }
-
-   my_snprintf(szMessage, sizeof(szMessage), szFormat, shortName);
-
-   myLogData(szMessage);
-	ZeroMemory(&shutdownargs, sizeof(shutdownargs));
-	/* strategy here is to try and turn on/off the server,
-		sometimes it may take more than the first try
-		if can't do it after N tries then give up
-		and warn user */
-
-	/* check for opposite of bOn (ie starting server bOn = true, check if its down = false) */
-	while ( shutdown_tries < MAX_SLAPD_SHUTDOWN_TRIES
-			&& (bOn != (bServerRunning = isServiceRunning( pszServiceName ) ) ) )
-	{
-		/* try to turn of the server */
-		my_snprintf(szLog, sizeof(szLog), szMessage);
-		LogData(NULL, szLog);
-		myLogData(szLog);
-
-		/* setup and launch thread to display window to user
-			so it doesn't think install is hung */
-		shutdownargs.pszServiceName = szMessage;
-		_beginthread(shutdownDialog, 0, &shutdownargs);
-
-		ControlServer( pszServiceName, bOn );
-
-		/* give it some time to shutdown */
-		/* unneeded? */
-   	
-		   if(bOn)
-		   {
-   				LoadString( mi.m_hModule, IDS_WAIT_SERVICE_START, szFormat, MAX_STR_SIZE);
-		   }else{
-   				LoadString( mi.m_hModule, IDS_WAIT_SERVICE_STOP, szFormat, MAX_STR_SIZE);
-		   }
-
-	  	   my_snprintf(szLog, sizeof(szLog), szFormat, shortName);
-		   LogData(NULL, szLog);
-		   myLogData(szLog);
-
-		Sleep(SLAPD_SHUTDOWN_TIME_MILLISECONDS);
-
-		shutdown_tries++;
-	}
-
-	if ((shutdown_tries > 0) && (shutdownargs.hwnd > 0))
-	{
-		SendMessage(shutdownargs.hwnd, WM_DESTROY, 0, 0);
-	} 
-
-	if ( MAX_SLAPD_SHUTDOWN_TRIES == shutdown_tries)
-	{
-		/* check if it got it the last time */
-
-		/* it should be whatever user wanted in bOn at this point*/
-		if (bOn == (bServerRunning = isServiceRunning( pszServiceName ) ) )
-		{
-			/* warn user, ask if they want to continue */
-
-			if ( IDOK == DSMessageBox(MB_OKCANCEL, ERR_SLAPD_SHUTDOWN_TITLE,
-									  ERR_SLAPD_SHUTDOWN, shortName, shortName) )
-			{
-
-			} else
-			{
-				UINT uExitCode = 1;
-				/* stevross: use ExitProcess until admin server provides us with
-					   better way to exit framework and cleanup */
-				ExitProcess(uExitCode);
-			}
-
-		}
-
-	}
-   myLogData("End ControlSlapdInstance");
-}
-
-static void ConvertPasswordToPin(char *pszServerRoot, char *pszServiceName)
-{
-	CHAR szFormat[MAX_STR_SIZE*4]="\0";
-	CHAR szCurrentDir[MAX_STR_SIZE]="\0";
-	CHAR szNewDir[MAX_STR_SIZE]="\0";
-
-	myLogData("Begin ConvertPasswordToPin");
-
-	/* get current dir so we have it for later */
-	if (GetCurrentDirectory(MAX_STR_SIZE, szCurrentDir) == 0)
-	{
-		myLogData("ConvertPasswordToPin: could not get current directory: %d",
-				  GetLastError());
-		return;
-	}
-	/* have to be in the alias directory to run this */
-	my_snprintf(szNewDir, sizeof(szNewDir), "%s\\alias", pszServerRoot);
-	/* change current dir to the alias directory */
-	if (SetCurrentDirectory(szNewDir) == 0)
-	{
-		myLogData("ConvertPasswordToPin: could not set current directory to %s: %d",
-				  szNewDir, GetLastError());
-		return;
-	}
-
-	/* spawn the perl script which does the conversion */
-	my_snprintf(szFormat, sizeof(szFormat), "\"%s\\bin\\slapd\\admin\\bin\\migratePwdFile\" \"%s\" %s",
-		pszServerRoot, pszServerRoot, pszServiceName);
-	run_cgi(pszServerRoot, PERL_EXE, szFormat);
-
-	if (SetCurrentDirectory(szCurrentDir) == 0)
-	{
-		myLogData("ConvertPasswordToPin: could not set current directory back to %s: %d",
-				  szCurrentDir, GetLastError());
-		return;
-	}
-	
-	myLogData("End ConvertPasswordToPin");
-}
-
-static void ReinstallUpgradeServer(char *pszServerRoot, char *pszServiceName)
-{
-	CHAR szFormat[MAX_STR_SIZE*4]="\0";
-	CHAR szCurrentDir[MAX_STR_SIZE]="\0";
-
-	myLogData("Begin ReinstallUpgradeServer");
-
-	/* get current dir so we have it for later */
-	if (GetCurrentDirectory(MAX_STR_SIZE, szCurrentDir) == 0)
-	{
-		myLogData("ReinstallUpgradeServer: could not get current directory: %d",
-				  GetLastError());
-		return;
-	}
-	/* have to be in the server root directory to run this */
-	if (SetCurrentDirectory(pszServerRoot) == 0)
-	{
-		myLogData("ReinstallUpgradeServer: could not set current directory to %s: %d",
-				  pszServerRoot, GetLastError());
-		return;
-	}
-
-	/* spawn the perl script which does the conversion */
-	my_snprintf(szFormat, sizeof(szFormat), "\"%s\\bin\\slapd\\admin\\bin\\upgradeServer\" \"%s\" %s",
-		pszServerRoot, pszServerRoot, pszServiceName);
-	run_cgi(pszServerRoot, PERL_EXE, szFormat);
-
-	if (SetCurrentDirectory(szCurrentDir) == 0)
-	{
-		myLogData("ReinstallUpgradeServer: could not set current directory back to %s: %d",
-				  szCurrentDir, GetLastError());
-		return;
-	}
-	
-	myLogData("End ReinstallUpgradeServer");
-}
-
-BOOL RemoveSlapdInstance(LPCSTR pszServerRoot, char *pszServiceName)
-{
-	int status = 0;
-	char szINFfile[MAX_STR_SIZE] = "\0";
-	CHAR szCGIArgs[MAX_STR_SIZE]="\0";
-
-
-    /* try to turn of service */
-	ControlSlapdInstance(pszServiceName, FALSE);
-
-    /* now try to remove the instance */
-
-	/* call remove cgi with inf */
-	my_snprintf(szINFfile, sizeof(szINFfile), "%s/unin%d.inf", TEMPDIR, _getpid());	
-	writeUninstINFfile(	szINFfile, pszServerRoot, pszServiceName);
-	my_snprintf(szCGIArgs, sizeof(szCGIArgs), " -f \"%s\"", szINFfile);
-
-	/* remove this instance */
-	status = run_cgi(pszServerRoot, "bin\\slapd\\admin\\bin\\ds_remove.exe", szCGIArgs);
-	
-	/* remove temp inffile */
-	_unlink(szINFfile); 
-
-    return (status == 0); /* return true if run_cgi succeeded */
-}
-
-
-BOOL RemoveMiscRegistryEntries(void)
-{
-    BOOL bRC = TRUE;
-
-
-    RemoveSNMPKeys();
-    RemoveSNMPValue();
- 
-    return bRC;
-}
-
-BOOL RemoveMiscSlapdFiles(pszServerRoot)
-{
-
-    char *miscFilesList[] = 
-    {
-     "dsgw", 
-     "plugins\\slapd", 
-     "plugins\\snmp\\netscape-ldap.mib",
-     "bin\\slapd",
-     "manual\\slapd",
-     "relnotes.gif",
-     "relnotes.html",
-     "slapd.txt",
-     "unsynch.exe",
-     "mcc.bat",
-     "authdb",
-     "setup\\slapd",
-     "ldap.info",
-     NULL
-    };
-
-    int i;
-    
-    CHAR szFileName[MAX_STR_SIZE];
-
-    for(i=0; miscFilesList[i] != NULL; i++)
-    {
-        memset(szFileName, '\0', MAX_STR_SIZE);
-        my_snprintf(szFileName, sizeof(szFileName), "%s\\%s", pszServerRoot, miscFilesList[i] );
-        DeleteRecursively(szFileName);
-    }
-
-    return TRUE;
- }
-
-//////////////////////////////////////////////////////////////////////////////
-// PreUninst
-//
-// 
-// Do things before uninstalling like turn off the server
-// 
-// 
-// 
-//
-
-BOOL __declspec(dllexport)
-DSINST_PreUnInstall(LPCSTR pszServerRoot)
-{
-    BOOL rc = TRUE;
-	BOOL snmpstatus;
-    WIN32_FIND_DATA fileData;
-    HANDLE hFileHandle;
-	CHAR szCurrentDir[MAX_STR_SIZE]="\0";
-
-    /* for now just turn of the one instance we install */
-    /* later look in directory for anything slapd- and turn that off */
-    
-    /* stevross: do this here until decide what to do with 
-                 DeleteServerRegistryKeys in Remove Instance */
-
-	/* get current dir so we have it for later */
-	GetCurrentDirectory(MAX_STR_SIZE, szCurrentDir);
-	
-	/* change current dir to server root */
-	SetCurrentDirectory(pszServerRoot);
-
-	/* Turn off SNMP Service if Running */
-	snmpstatus = getSNMPStatus();
-
-	/* remove SNMP keys and any other Misc stuff */
-	RemoveMiscRegistryEntries();
-
-	hFileHandle = FindFirstFile("slapd-*", &fileData);
-
-	if( INVALID_HANDLE_VALUE != hFileHandle)
-	{
-		rc = RemoveSlapdInstance(pszServerRoot, fileData.cFileName);
-		while(TRUE == FindNextFile(hFileHandle, &fileData) )
-		{
-			BOOL status = RemoveSlapdInstance(pszServerRoot, fileData.cFileName);
-			/* we want to report failure even if only 1 instance removal fails */
-			if (rc)
-			{
-				rc = status;
-			}
-		}
-		FindClose(hFileHandle);
-	}
-       		
-	/* turn SNMP service back on if it was running */
-	if (snmpstatus)
-	{
-		if( 1 == mi.m_nSNMPOn)
-		{
-			if( 0 == ControlServer(SNMP_SERVICE, TRUE) )
-			{
-				/* complain but continue with install */
-				DSMessageBoxOK(ERR_SNMP_BAD_STARTUP_TITLE,
-							   ERR_SNMP_BAD_STARTUP, 0);
-			}
-		}
-	}
-
-	/* set back to previous current directory */
-	SetCurrentDirectory(szCurrentDir);
-
-	/* unfortunately, if we just return FALSE here, uninstall will continue
-	   happily along, and ultimately remove the uninst.exe program which we
-	   need to run again after we figure out what went wrong
-	   So, we must exit here
-	*/
-	if (!rc) {
-		DSMessageBoxOK(ERR_UNINSTALL_DS_TITLE,
-					   ERR_UNINSTALL_DS, 0, LOGFILE);
-		ExitProcess(1);
-	}
-
-    return rc;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// PostUninst
-//
-// 
-// Clean up registry keys etc
-// 
-//
-//
-//
-BOOL __declspec(dllexport)
-DSINST_PostUnInstall(LPCSTR pszServerRoot)
-{
-
-    BOOL bRC = TRUE;
-
-   /* remove misc files */
-
-    
-    RemovePerfMon();
-    RemoveMiscSlapdFiles(pszServerRoot);
-    RemoveDirectoryRootKey();
-  
-    return bRC;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// DllMain
-//
-// The Windows DLL main entry point.  Called upon loading the DLL into memory.
-// Perform all initialization in the DLL_PROCESS_ATTACH reason handler, and
-// release any resources that you have allocated in the DLL_PROCESS_DETACH
-// message handler.  See the Windows SDK documentation for more information
-// on this function.
-//
-
-BOOL WINAPI
-DllMain(HANDLE hModule, ULONG ulReasonForCall, LPVOID lpReserved)
-{
-  switch (ulReasonForCall)
-  {
-    case DLL_PROCESS_ATTACH:
-      mi.m_hModule = hModule;
-	  StartWSA();
-	  initialize_module();
-
-	  /* set default server settings */
-	  set_default_ldap_settings();
-      break;
-    case DLL_PROCESS_DETACH:
-      break;
-    case DLL_THREAD_ATTACH:
-      break;
-    case DLL_THREAD_DETACH:
-      break;
-  }
-  return TRUE;
-}
-
-static void
-fixDN(char *dn)
-{
-	if (dn && *dn)
-	{
-		char *utf8dn = localToUTF8(dn);
-		char *localdn = NULL;
-		dn_normalize_convert(utf8dn);
-		localdn = UTF8ToLocal(utf8dn);
-		strcpy(dn, localdn);
-		nsSetupFree(utf8dn);
-		nsSetupFree(localdn);
-	}
-}
-
-static void
-fixURL(char *url)
-{
-	if (url && *url)
-	{
-		char host[MAX_STR_SIZE];
-		int port;
-		char base[MAX_STR_SIZE];
-		GetURLComponents(url, host, &port, base);
-		fixDN(base);
-		my_snprintf(url, MAX_STR_SIZE, "ldap://%s:%d/%s", host, port, base);
-	}
-}
-		
-
-static void
-normalizeDNs()
-{
-	fixDN(mi.m_szMCCSuffix);
-	fixDN(mi.m_szUGSuffix);
-	fixDN(mi.m_szInstallDN);
-	fixDN(mi.m_szInstanceSuffix);
-	fixDN(mi.m_szInstanceUnrestrictedUser);
-	fixDN(mi.m_szSupplierDN);
-	fixDN(mi.m_szChangeLogSuffix);
-	fixDN(mi.m_szConsumerDN);
-	fixDN(mi.m_szConsumerBindAs);
-	fixDN(mi.m_szSupplierBindAs);
-	fixDN(mi.m_szConsumerRoot);
-	fixDN(mi.m_szSupplierRoot);
-	fixURL(mi.m_szLdapURL);
-	fixURL(mi.m_szUserGroupURL);
-}
-
-/*
-  Usage:
-  	DSMessageBox(type, titleKey, msgKey, titlearg, msgarg1, ..., msgargN);
-*/
-int
-DSMessageBox(UINT type, UINT titleKey, UINT msgKey, const char *titlearg, ...)
-{
-	int retval = 0;
-	va_list ap;
-	CHAR msgFormat[MAX_STR_SIZE] = {0};
-	CHAR msg[MAX_STR_SIZE*2] = {0};
-	CHAR titleFormat[MAX_STR_SIZE] = {0};
-	CHAR title[MAX_STR_SIZE] = {0};
-
-	LoadString(mi.m_hModule, msgKey, msgFormat, MAX_STR_SIZE);
-	if (!msgFormat[0])
-		return retval;
-
-	if (titleKey >= 0)
-		LoadString(mi.m_hModule, titleKey, titleFormat, MAX_STR_SIZE);
-
-	va_start(ap, titlearg);
-	_vsnprintf(msg, sizeof(msg), msgFormat, ap);
-	va_end(ap);
-	msg[sizeof(msg)-1] = (char)0;
-
-	LogData(NULL, msg);
-	myLogData(msg);
-	if (SILENTMODE != MODE)
-	{
-		if (titleFormat[0])
-		{
-			my_snprintf(title, sizeof(title), titleFormat, titlearg);
-			retval = NsSetupMessageBox(NULL, msg, title, type);
-		}
-		else
-			retval = NsSetupMessageBox(NULL, msg, NULL, type);
-	}
-	else
-	{
-		retval = IDOK; /* force OK for silent mode */
-	}
-
-	return retval;
-}
-
-/*
-  Usage:
-  	DSMessageBoxOK(titleKey, msgKey, titlearg, msgarg1, ..., msgargN);
-*/
-int
-DSMessageBoxOK(UINT titleKey, UINT msgKey, const char *titlearg, ...)
-{
-	int retval = 0;
-	va_list ap;
-	CHAR msgFormat[MAX_STR_SIZE] = {0};
-	CHAR msg[MAX_STR_SIZE*2] = {0};
-	CHAR titleFormat[MAX_STR_SIZE] = {0};
-	CHAR title[MAX_STR_SIZE] = {0};
-
-	LoadString(mi.m_hModule, msgKey, msgFormat, MAX_STR_SIZE);
-	if (!msgFormat[0])
-		return retval;
-
-	if (titleKey >= 0)
-		LoadString(mi.m_hModule, titleKey, titleFormat, MAX_STR_SIZE);
-
-	va_start(ap, titlearg);
-	_vsnprintf(msg, sizeof(msg), msgFormat, ap);
-	va_end(ap);
-	msg[sizeof(msg)-1] = (char)0;
-
-	LogData(NULL, msg);
-	if (MODE != SILENTMODE)
-	{
-		if (titleFormat[0])
-		{
-			my_snprintf(title, sizeof(title), titleFormat, titlearg);
-			retval = NsSetupMessageBox(NULL, msg, title, MB_OK);
-		}
-		else
-			retval = NsSetupMessageBox(NULL, msg, NULL, MB_OK);
-	}
-	else
-	{
-		myLogData(msg); /* log the message */
-		retval = IDOK; /* force true return if silent mode */
-	}
-
-	return retval;
-}
diff --git a/ldap/cm/newinstnt/dsinst.h b/ldap/cm/newinstnt/dsinst.h
deleted file mode 100644
index a6be96f1..00000000
--- a/ldap/cm/newinstnt/dsinst.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-// dsinst.h - Netscape SuiteSpot Installation Plug-In Directory Server
-//
-//
-
-#ifndef __DSINST_H
-#define __DSINST_H
-
-
-
-#include <regparms.h>
-#include "libinst.h"
-#include "plstr.h"
-
-extern __declspec(dllexport) DSINST_ReadComponentInf(LPCSTR pszCacheFile, LPCSTR pszSection);
-extern __declspec(dllexport) INT  __cdecl DSINST_AskOptions(HWND hwndParent, INT nDirection);
-extern __declspec(dllexport) VOID __cdecl DSINST_GetSummary(LPSTR lpszSummary);
-extern __declspec(dllexport) BOOL __cdecl DSINST_WriteCacheGlobal(LPCSTR lpszCacheFileName, LPCSTR lpszSection);
-extern __declspec(dllexport) BOOL __cdecl DSINST_WriteCacheLocal(LPCSTR lpszCacheFileName, LPCSTR lpszSection);
-extern __declspec(dllexport) BOOL __cdecl DSINST_ReadCacheGlobal(LPCSTR lpszCacheFileName, LPCSTR lpszSection);
-extern __declspec(dllexport) BOOL __cdecl DSINST_ReadCacheLocal(LPCSTR lpszCacheFileName, LPCSTR lpszSection);
-extern __declspec(dllexport) BOOL __cdecl DSINST_PreInstall(LPCSTR lpszInstallPath);
-extern __declspec(dllexport) BOOL __cdecl DSINST_Install(void);
-extern __declspec(dllexport) BOOL __cdecl DSINST_PostInstall(void);
-extern __declspec(dllexport) BOOL __cdecl DSINST_PreUnInstall(LPCSTR pszServerRoot);
-extern __declspec(dllexport) BOOL __cdecl DSINST_PostUnInstall(LPCSTR pszServerRoot);
-
-/* no attr we add uses more the 5 */
-#define MAX_LDAP_ATTR_VALUES 5
-
-/* shutdown tries * shutdown time should == 10 minutes */
-#define MAX_SLAPD_SHUTDOWN_TRIES 2400
-#define SLAPD_SHUTDOWN_TIME_MILLISECONDS 15000
-
-/* stevross: GLOBAL_INF_ only here to speed integration until
-	admin header file gets updated */
-#define GLOBAL_INF_LDAP_INSTALL_DN "InstallationRootDN"
-
-#define LOCAL_INF_HOST					"InstanceHost"
-#define LOCAL_INF_PORT					"InstancePort"
-#define LOCAL_INF_SUFFIX				"InstanceSuffix"
-#define LOCAL_INF_ROOTDN                "RootDN"
-#define LOCAL_INF_ROOTDN_PASSWD         "RootDNPwd"
-#define LOCAL_INF_CONFIG_SSPT           "ConfigSspt"
-
-#define LOCAL_INF_CONFIG_CONSUMER_DN    "ConfigConsumerDN"
-#define LOCAL_INF_SNMP_ON				"SNMPServiceOn"
-#define NETSCAPEROOT                    "NetscapeRoot"
-
-/* for now admin wants suffix always to be o=netscaperoot,
-   have it defined here in case it changes */
-#define CONFIG_DIR_SUFFIX					"o=netscaperoot"
-
-/* default settings */
-#define DEFAULT_UNRESTRICTED_USER   "cn=Directory Manager"
-#define DEFAULT_SERVER_PORT         389
-#define DEFAULT_SECURITY_ON         0
-#define DEFAULT_CONFIG_SSPT         1
-#define DEFAULT_START_SERVER        1
-#define DEFAULT_LDAP_INSTALL_DN     "ou=mcom.com, o=NetscapeRoot"
-#define DEFAULT_SSPT_USER           "admin"
-#define DEFAULT_SUPPLIER_DN         "cn=Replication Manager"
-#define DEFAULT_CHANGELOGDIR    "logs\\changelogdb"
-#define DEFAULT_CHANGELOGSUFFIX    "cn=changelog"
-#define DEFAULT_ADD_SAMPLE_ENTRIES  0
-#define DEFAULT_ADD_ORG_ENTRIES     0
-#define DEFAULT_SETUP_CONSUMER      0
-#define DEFAULT_CIR_HOST            "\0"
-#define DEFAULT_CIR_PORT            389
-#define DEFAULT_CIR_SUFFIX          "\0"
-#define DEFAULT_CIR_BINDDN          "cn=Replication Consumer"
-#define DEFAULT_CIR_BINDDN_PWD       "\0"
-#define DEFAULT_CIR_INTERVAL        10 
-#define DEFAULT_CIR_DAYS            "0123456"
-#define DEFAULT_CIR_TIMES           "0000-2359"
-#define DEFAULT_REPLICATION_DN           "cn=supplier"
-#define DEFAULT_REPLICATION_PWD          "\0"
-#define DEFAULT_SETUP_SUPPLIER      0
-#define DEFAULT_SIR_HOST            "\0"
-#define DEFAULT_SIR_PORT            389
-#define DEFAULT_SIR_SUFFIX          "\0"
-#define DEFAULT_SIR_BINDDN          "cn=supplier"
-#define DEFAULT_SIR_BINDDN_PWD       "\0"
-#define DEFAULT_SIR_DAYS            "0123456"
-#define DEFAULT_SIR_TIMES           "0000-2359"
-#define DEFAULT_CONFIG_CONSUMER_DN  0
-#define DEFAULT_CONSUMER_DN         "cn=Replication Consumer"
-#define DEFAULT_CONSUMER_PWD        "\0"
-#define DEFAULT_INF_POP_LDIF_FILE   "\0"
-#define DEFAULT_POPULATE_SAMPLE_ENTRIES	0
-#define DEFAULT_DISABLE_SCHEMA_CHECKING 0
-#define DEFAULT_SNMP_ON             0
-#define DEFAULT_ADMIN_PORT          80
-
-#define SUGGEST_LDIF "suggest"
-#define SAMPLE_LDIF "bin\\slapd\\install\\ldif\\Example.ldif"
-#define TEMPLATE_LDIF "bin\\slapd\\install\\ldif\\template.ldif"
-#define PROCESSED_TEMPLATE_LDIF "ldif\\sample-org.ldif"
-#define LDAP_MODIFY_EXE "bin\\slapd\\server\\ldapmodify.exe"
-#define INSTALL_CTRS_BAT "install-nsldapctrs.bat"
-#define BIN_SLAPD_INSTALL_BIN "bin\\slapd\\install\\bin"
-
-
-#define ROOT_DN     "RootDN"
-#define ROOT_DN_PWD "RootDNPwd"
-#define SERVER_IDENTIFIER "ServerId"
-
-
-#define CONSUMER_REPL_AGREE    "Consumer Replication Agreement"
-#define SUPPLIER_REPL_AGREE    "Supplier Replication Agreement"
-#define SERVER_MIGRATION_CLASS "com.netscape.admin.dirserv.task.MigrateCreate"
-#define SERVER_CREATION_CLASS "com.netscape.admin.dirserv.task.MigrateCreate"
-
-#define NO_REPLICATION              3
-#define CONSUMER_SIR_REPLICATION    1
-#define CONSUMER_CIR_REPLICATION    2
-
-#define SUPPLIER_SIR_REPLICATION    1
-#define SUPPLIER_CIR_REPLICATION    2
-
-
-/// inf file stuff
-
-#define SETUP_INF_COM_VENDOR         "Vendor"
-#define SETUP_INF_COM_DESC           "Description"
-#define SETUP_INF_COM_NAME           "Name"
-#define SETUP_INF_COM_NICKNAME       "NickName"
-#define SETUP_INF_COM_VERSION        "Version"
-#define SETUP_INF_COM_BUILDNUMBER    "BuildNumber"
-#define SETUP_INF_COM_REVISION       "Revision"
-#define SETUP_INF_COM_CREATIONDATE   "CreationDate"
-#define SETUP_INF_COM_EXPIRY         "Expires"
-#define SETUP_INF_COM_SECURITY       "Security"
-
-#define SLAPD_MIN_PW_LEN 8
-#define SSPT_MIN_PW_LEN  1
-
-#define N_DAYS   8
-#define N_TIMES  10
-
-#define SNMP_SERVICE			  "SNMP"
-
-/* error messages */
-
-#define ASCII_ZERO 48
-
-typedef struct tagMODULEINFO {
-  HINSTANCE m_hModule;
-  HWND      m_hwndParent;
-  INT       m_nResult;
-  INT		m_nReInstall;
-  CHAR      *m_szMCCBindAs;
-  INT       m_nInstanceServerPort;
-  INT       m_nAdminServerPort;
-  INT       m_nCfgSspt;
-  INT       m_nPopulateSampleEntries;
-  INT       m_nPopulateSampleOrg;
-  INT       m_nSetupConsumerReplication;
-  INT       m_nSetupSupplierReplication;
-  INT       m_nMaxChangeLogRecords;
-  INT       m_nMaxChangeLogAge;
-  INT       m_nChangeLogAgeMagnitude;
-  INT       m_nConsumerSSL;
-  INT       m_nSupplierSSL;
-  INT       m_nUseSupplierSettings;
-  INT       m_nUseChangeLogSettings;
-  INT       m_nCIRInterval;
-  INT       m_nConsumerPort;
-  INT       m_nSupplierPort;
-  INT       m_nMCCPort;
-  INT       m_nExistingMCC;
-  INT		m_nUGPort;
-  INT		m_nExistingUG;
-  INT		m_nDisableSchemaChecking;
-  INT       m_nSNMPOn;
-  INT       m_nConfigConsumerDN;
-  CHAR      m_szMCCPw[MAX_STR_SIZE];
-  CHAR      m_szMCCHost[MAX_STR_SIZE];
-  CHAR      m_szMCCSuffix[MAX_STR_SIZE];
-  CHAR		m_szUGPw[MAX_STR_SIZE];
-  CHAR		m_szUGHost[MAX_STR_SIZE];
-  CHAR		m_szUGSuffix[MAX_STR_SIZE];
-  CHAR		m_szAdminDomain[MAX_STR_SIZE];
-  CHAR		m_szLdapURL[MAX_STR_SIZE];
-  CHAR		m_szUserGroupURL[MAX_STR_SIZE];
-  CHAR		m_szUserGroupAdmin[MAX_STR_SIZE];
-  CHAR		m_szUserGroupAdminPW[MAX_STR_SIZE];
-  CHAR      m_szInstallDN[MAX_STR_SIZE];
-  CHAR      m_szSsptUid[MAX_STR_SIZE];
-  CHAR      m_szSsptUidPw[MAX_STR_SIZE];
-  CHAR      m_szSsptUidPwAgain[MAX_STR_SIZE];
-  CHAR      m_szSsptUser[MAX_STR_SIZE];
-  CHAR      m_szServerIdentifier[MAX_STR_SIZE];
-  CHAR      m_szInstanceSuffix[MAX_STR_SIZE];
-  CHAR      m_szInstanceUnrestrictedUser[MAX_STR_SIZE];
-  CHAR      m_szInstancePassword[MAX_STR_SIZE];
-  CHAR      m_szInstancePasswordAgain[MAX_STR_SIZE];
-  CHAR      m_szInstanceHostName[MAX_STR_SIZE];
-  CHAR      m_szSupplierDN[MAX_STR_SIZE];
-  CHAR      m_szSupplierPW[MAX_STR_SIZE];
-  CHAR      m_szSupplierPWAgain[MAX_STR_SIZE];
-  CHAR      m_szSSLClients[MAX_STR_SIZE];
-  CHAR      m_szChangeLogDbDir[MAX_STR_SIZE];
-  CHAR      m_szChangeLogSuffix[MAX_STR_SIZE];
-  CHAR      m_szConsumerDN[MAX_STR_SIZE];
-  CHAR      m_szConsumerPW[MAX_STR_SIZE];
-  CHAR      m_szConsumerPWAgain[MAX_STR_SIZE];
-  CHAR      m_szConsumerHost[MAX_STR_SIZE];
-  CHAR      m_szConsumerRoot[MAX_STR_SIZE];
-  CHAR      m_szConsumerBindAs[MAX_STR_SIZE];
-  CHAR      m_szConsumerPw[MAX_STR_SIZE];
-  CHAR      m_szSupplierHost[MAX_STR_SIZE];
-  CHAR      m_szSupplierRoot[MAX_STR_SIZE];
-  CHAR      m_szSupplierBindAs[MAX_STR_SIZE];
-  CHAR      m_szSupplierPw[MAX_STR_SIZE];
-  CHAR      m_szPopLdifFile[MAX_STR_SIZE];
-  CHAR      m_szCIRDays[N_DAYS];
-  CHAR      m_szCIRTimes[N_TIMES];
-  CHAR      m_szSIRDays[N_DAYS];
-  CHAR      m_szSIRTimes[N_TIMES];
-} MODULEINFO;
-
-typedef struct tagINFDATA
-{
-  char* szVendor;
-  char* szDescription;
-  char* szName;
-  char* szNickname;
-  char* szVersion;
-  char* szBuildNumber;
-  char* szRevision;
-  char* szTimeStamp;
-  char* szExpireDate;
-  char* szSecurity;
-} INFDATA;
-
-typedef struct tagShutdownArgs
-{
-	HWND hwnd;
-	char* pszServiceName;
-
-} ShutdownArg;
-
-#endif // __DSINST_H
diff --git a/ldap/cm/newinstnt/dsinst.rc b/ldap/cm/newinstnt/dsinst.rc
deleted file mode 100644
index f232d24c..00000000
--- a/ldap/cm/newinstnt/dsinst.rc
+++ /dev/null
@@ -1,748 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This Program is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation; version 2 of the License.
-// 
-// This Program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License along with
-// this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-// Place, Suite 330, Boston, MA 02111-1307 USA.
-// 
-// In addition, as a special exception, Red Hat, Inc. gives You the additional
-// right to link the code of this Program with code not covered under the GNU
-// General Public License ("Non-GPL Code") and to distribute linked combinations
-// including the two, subject to the limitations in this paragraph. Non-GPL Code
-// permitted under this exception must only link to the code of this Program
-// through those well defined interfaces identified in the file named EXCEPTION
-// found in the source code files (the "Approved Interfaces"). The files of
-// Non-GPL Code may instantiate templates or use macros or inline functions from
-// the Approved Interfaces without causing the resulting work to be covered by
-// the GNU General Public License. Only Red Hat, Inc. may make changes or
-// additions to the list of Approved Interfaces. You must obey the GNU General
-// Public License in all respects for all of the Program code and other code used
-// in conjunction with the Program except the Non-GPL Code covered by this
-// exception. If you modify this file, you may extend this exception to your
-// version of the file, but you are not obligated to do so. If you do not wish to
-// provide this exception without modification, you must delete this exception
-// statement from your version and license this file solely under the GPL without
-// exception. 
-// 
-// 
-// Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-// Copyright (C) 2005 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Fedora\0"
-            VALUE "FileDescription", "Directory Server 1.0\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "Directory Server 1.0\0"
-            VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc.  Portions copyright 1999, 2002 Netscape Communications Corporation.  All rights reserved.\0"
-            VALUE "OriginalFilename", "\0"
-            VALUE "ProductName", "Fedora Server Products\0"
-            VALUE "ProductVersion", "1, 0, 1, 0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_MCC_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0"
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_EDIT_HOST,158,68,103,13,ES_AUTOHSCROLL | WS_DISABLED
-    EDITTEXT        IDC_EDIT_PORT,158,86,29,13,ES_AUTOHSCROLL | WS_DISABLED
-    EDITTEXT        IDC_EDIT_SUFFIX,158,140,103,13,ES_AUTOHSCROLL | 
-                    WS_DISABLED
-    EDITTEXT        IDC_EDIT_BIND_AS,158,104,103,13,ES_AUTOHSCROLL | 
-                    WS_DISABLED
-    EDITTEXT        IDC_EDIT_PW,158,122,103,13,ES_PASSWORD | ES_AUTOHSCROLL | 
-                    WS_DISABLED
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "Host:",IDC_STATIC_MCC_HOST,136,70,17,8
-    LTEXT           "Port:",IDC_STATIC_MCC_PORT,137,88,16,8
-    LTEXT           "Suffix:",IDC_STATIC_MCC_SUFFIX,130,142,23,8
-    LTEXT           "Bind As:",IDC_STATIC_MCC_BIND_AS,126,106,27,8
-    LTEXT           "Password:",IDC_STATIC_MCC_PW,117,124,36,8
-    GROUPBOX        "Configuration Directory Server",IDC_STATIC_SETTINGS,91,
-                    37,191,121
-    CONTROL         "This instance will be the configuration directory server",
-                    IDC_RADIO_USE_THIS_SERVER,"Button",BS_AUTORADIOBUTTON,97,
-                    47,184,10
-    CONTROL         "Use existing configuration directory server",
-                    IDC_RADIO_USE_EXISTING_SERVER,"Button",
-                    BS_AUTORADIOBUTTON,97,57,165,10
-    LTEXT           "Fedora server information is stored in the Fedora configuration directory server, which you may have already set up.  If so, you should configure this server to be managed by the configuration server.",
-                    IDC_STATIC_DESC,92,3,172,33
-END
-
-IDD_ROOTDN DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Directory Manager Settings"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    EDITTEXT        IDC_EDIT_UNRESTRICTED_USER,168,74,112,14,ES_AUTOHSCROLL
-    LTEXT           "Directory Manager DN:",IDC_STATIC_UNRESTRICTED_USER,88,
-                    74,73,8
-    LTEXT           "Password:",IDC_STATIC_PASSWORD,88,96,34,8
-    EDITTEXT        IDC_EDIT_PASSWORD,168,96,112,14,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    LTEXT           "Password (again):",IDC_STATIC_PASSWORD_AGAIN,88,119,57,
-                    8
-    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,168,119,111,14,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    GROUPBOX        "Directory Manager Settings",
-                    IDC_STATIC_UNRESTRICTED_USER_GROUPBOX,84,58,203,84
-    LTEXT           "Certain directory server operations require an administrative user.  This user is referred to as the Directory Manager and typically has a bind Distinguished Name (DN) of cn=Directory Manager.",
-                    IDC_STATIC_DM_DESC,84,11,202,26
-    LTEXT           "The password for the Directory Manager must be at least 8 characters long.",
-                    IDC_STATIC,84,39,202,18
-END
-
-IDD_SUITESPOTID DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION 
-"Directory Server 1.0 Fedora configuration directory server administrator "
-
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    EDITTEXT        IDC_EDIT_SUITESPOT_USER,173,51,114,14,ES_AUTOHSCROLL
-    LTEXT           "Configuration Directory Administrator ID:",
-                    IDC_STATIC_SUITESPOT_USER,94,51,73,17
-    LTEXT           "Password:",IDC_STATIC_PASSWORD,94,74,34,8
-    EDITTEXT        IDC_EDIT_PASSWORD,173,74,114,14,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    LTEXT           "Password (again):",IDC_STATIC_PASSWORD_AGAIN,94,97,57,8
-    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,173,97,114,14,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    GROUPBOX        "Configuration Directory Server Administrator ",
-                    IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,91
-    LTEXT           "The Fedora configuration directory administrator is the ID typically used to log in to the console.",
-                    IDC_STATIC_MCA_DESC,88,10,196,18
-END
-
-IDD_SERVER_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Server Settings"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "General Settings",IDC_STATIC_GENERAL_SETTINGS,97,33,194,
-                    68
-    EDITTEXT        IDC_EDIT_SERVER_IDENTIFIER,175,46,105,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_SERVER_PORT,175,62,35,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_SUFFIX,175,78,105,12,ES_AUTOHSCROLL
-    CONTROL         "Spin1",IDC_SPIN_SERVER_PORT,"msctls_updown32",
-                    UDS_SETBUDDYINT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,209,62,
-                    10,12
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "Server Identifier:",IDC_STATIC_SERVER_IDENTIFIER,116,46,
-                    52,8
-    LTEXT           "Server Port: ",IDC_STATIC_SERVER_PORT,129,62,39,8
-    LTEXT           "Suffix: ",IDC_STATIC_SUFFIX,146,78,22,8
-    LTEXT           "Settings this directory server will use for basic operation.",
-                    IDC_STATIC_SERV_SETTINGS_DESC,103,20,180,10
-END
-
-IDD_SAMPLE_ENTRIES_ORG DIALOG DISCARDABLE  0, 0, 377, 179
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Populate Database"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Sample Organizational Structure",
-                    IDC_STATIC_DEFAULT_ORG_GROUP,89,5,285,50
-    CONTROL         "Install Sample Organizational Structure",
-                    IDC_CHECK_POPULATE_ORG_ENTRIES,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,104,41,146,10
-    GROUPBOX        "Populate Database",IDC_STATIC_SAMPLE_GROUP,89,64,285,95
-    CONTROL         "Don't Populate",IDC_RADIO_DONT_POPULATE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,96,93,63,10
-    CONTROL         "Populate with sample database",
-                    IDC_RADIO_POPULATE_SAMPLE,"Button",BS_AUTORADIOBUTTON,96,
-                    102,114,11
-    CONTROL         "Populate with custom database",
-                    IDC_RADIO_POPULATE_CUSTOM,"Button",BS_AUTORADIOBUTTON,96,
-                    112,115,10
-    PUSHBUTTON      "Browse",IDC_BUTTON_CHOOSE_LDIF_FILE,96,130,51,14,
-                    WS_GROUP
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,176
-    LTEXT           "Populate the new directory server instance with some commonly used organizational entries, to provide some default structure to the directory.",
-                    IDC_STATIC_ORG_ENTRIES,96,15,180,26
-    LTEXT           "(must have base )",IDC_STATIC_MUST_HAVE_BASE,106,121,
-                    154,8
-    LTEXT           "File:",IDC_STATIC_FILE_NAME_COLON,96,146,15,10
-    LTEXT           "",IDC_STATIC_LDIF_FILE_NAME,96,146,188,9
-    LTEXT           "You may choose at this time to populate the database with an LDIF file or create a sample database.",
-                    IDC_STATIC,96,75,186,17
-END
-
-IDD_CONSUMER_REPLICATION_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Consumer Replication Settings"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "In order to allow remote servers to replicate new entries to this server, the remote server must have the ability to bind to this server as some entity with permission to do so.  ",
-                    IDC_STATIC_CIR_DESCRIPTION,93,7,186,24
-    LTEXT           "Supplier Bind DN:",IDC_STATIC_SUPPLIER_DN,97,80,71,8
-    LTEXT           "Supplier Password:",IDC_STATIC_SUPPLIER_PW,97,96,61,8
-    LTEXT           "Supplier Password (again):",IDC_STATIC_SUPPLIER_PW2,97,
-                    112,86,11
-    EDITTEXT        IDC_EDIT_SUPPLIER_DN,188,80,95,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PASSWORD,188,96,95,12,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,188,112,95,12,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    GROUPBOX        "Consumer Server Replication Settings",IDC_CONSUMER,90,
-                    62,201,66
-    LTEXT           "The Supplier DN is the DN of the entity the remote server will use to connect to this server to supply updates.",
-                    IDC_STATIC_CIR_DESCRIPTION2,93,36,186,16
-END
-
-IDD_SUPPLIER_REPLICATION_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Supplier Replication Settings"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "Settings which configure this server to send replication updates to other servers.",
-                    IDC_STATIC_SIR_DESCRIPTION,91,13,186,17
-    LTEXT           "Changelog DB Directory:",IDC_STATIC_CHANGELOG_DB_DIR,91,
-                    55,79,8
-    LTEXT           "Changelog Suffix:",IDC_STATIC_CHANGELOG_SUFFIX,91,74,56,
-                    8
-    EDITTEXT        IDC_EDIT_CHANGELOG_DB_DIR,182,55,95,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_CHANGELOG_DB_SUFFIX,182,73,95,12,ES_AUTOHSCROLL
-    GROUPBOX        "Supplier Server Replication Settings",
-                    IDC_SIR_DESCRIPTION,83,40,201,55
-END
-
-IDD_CONSUMER_DN DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Consumer DN Settings "
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    EDITTEXT        IDC_EDIT_CONSUMER_DN,163,77,111,14,ES_AUTOHSCROLL
-    LTEXT           "Consumer Bind DN:",IDC_STATIC_CONSUMER_DN,90,77,67,8
-    LTEXT           "Password:",IDC_STATIC_CONSUMER_PW,90,100,36,8
-    EDITTEXT        IDC_EDIT_PASSWORD,163,100,111,14,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    LTEXT           "Password (again):",IDC_STATIC_PASSWORD_AGAIN,90,123,57,
-                    8
-    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,163,123,112,14,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    GROUPBOX        "Supplier CIR Replication Settings",
-                    IDC_STATIC_SUPPLIER_CIR,84,59,208,89
-    LTEXT           "Do you wish to create an entry which can be used by CIR Consumers to bind to this Supplier? \nNote: This user will have acess to the entire database as well as the changelog.",
-                    IDC_STATIC,84,5,206,32
-    CONTROL         "Yes",IDC_RADIO_CONFIG_CONSUMER_DN_YES,"Button",
-                    BS_AUTORADIOBUTTON,149,45,28,10
-    CONTROL         "No",IDC_RADIO_CONFIG_CONSUMER_DN_NO,"Button",
-                    BS_AUTORADIOBUTTON,181,45,25,10
-END
-
-IDD_REPLICATION_AGREEMENT DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Configure Replication Agreement"
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_EDIT_HOST,159,13,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PORT,159,30,24,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_SUFFIX,159,48,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_BIND_AS,159,65,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PW,159,82,80,13,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "Host:",IDC_STATIC_REPLICATION_HOST,137,13,18,8
-    LTEXT           "Port:",IDC_STATIC_REPLICATION_PORT,139,30,16,8
-    LTEXT           "Root of Replication:",IDC_STATIC_REPLICATION_ROOT,91,48,
-                    64,8
-    LTEXT           "Bind As:",IDC_STATIC_REPLICATION_BIND_AS,128,65,27,8
-    LTEXT           "Password:",IDC_STATIC_REPLICATION_PW,119,82,34,8
-    GROUPBOX        "Replication Agreement",IDC_STATIC_REPLICATION_AGREEMENT,
-                    84,2,207,155
-    GROUPBOX        "Replication Days",IDC_STATIC_REPL_DAYS,90,93,197,22
-    CONTROL         "Sun",IDC_CHECK_SUN,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,92,102,25,10
-    CONTROL         "Mon",IDC_CHECK_MON,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,119,102,28,10
-    CONTROL         "Tue",IDC_CHECK_TUE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,147,102,25,10
-    CONTROL         "Wed",IDC_CHECK_WED,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,173,102,27,10
-    CONTROL         "Thur",IDC_CHECK_THUR,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,201,102,27,10
-    CONTROL         "Fri",IDC_CHECK_FRI,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,229,102,25,10
-    CONTROL         "Sat",IDC_CHECK_SAT,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,254,102,25,10
-    GROUPBOX        "Replication Times",IDC_STATIC,89,117,83,37
-    LTEXT           "Start:",IDC_STATIC_REPL_START_TIME,95,126,16,8
-    EDITTEXT        IDC_EDIT_REPL_START_TIME_HH,113,126,15,12,ES_AUTOHSCROLL
-    LTEXT           "End:",IDC_STATIC_REPL_END_TIME,95,140,16,8
-    EDITTEXT        IDC_EDIT_REPL_END_TIME_HH,113,140,15,12,ES_AUTOHSCROLL
-    CONTROL         "Spin1",IDC_SPIN_REPL_START_TIME_MM,"msctls_updown32",
-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,155,126,10,12
-    EDITTEXT        IDC_EDIT_REPL_SYNC_INTERVAL,238,126,25,12,ES_AUTOHSCROLL
-    LTEXT           "Replication Sync Interval(minutes)",
-                    IDC_STATIC_REPL_SYNC,182,126,55,17
-    CONTROL         "Spin1",IDC_SPIN_REPL_SYNC_INTERVAL,"msctls_updown32",
-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,262,126,11,11
-    EDITTEXT        IDC_EDIT_REPL_START_TIME_MM,141,126,15,12,ES_AUTOHSCROLL
-    CONTROL         "Spin1",IDC_SPIN_REPL_START_TIME_HH,"msctls_updown32",
-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,128,126,11,12
-    CONTROL         "Spin1",IDC_SPIN_REPL_END_TIME_HH,"msctls_updown32",
-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,128,140,11,12
-    EDITTEXT        IDC_EDIT_REPL_END_TIME_MM,141,140,15,12,ES_AUTOHSCROLL
-    CONTROL         "Spin1",IDC_SPIN_REPL_END_TIME_MM,"msctls_updown32",
-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,155,140,11,12
-END
-
-IDD_CHOOSE_REPLICATION_SETUP DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Configure Server for Replication"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "A Consumer that will pull updates",
-                    IDC_RADIO_CONSUMER_CIR,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,119,117,125,9
-    CONTROL         "A Consumer that will have updates",
-                    IDC_RADIO_CONSUMER_SIR,"Button",BS_AUTORADIOBUTTON,119,
-                    95,127,10
-    CONTROL         "Do not configure as a Consumer",
-                    IDC_RADIO_NO_CONSUMER_REPLICATION,"Button",
-                    BS_AUTORADIOBUTTON,119,138,113,10
-    CONTROL         "A Supplier that will have updates",
-                    IDC_RADIO_SUPPLIER_CIR,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,118,42,122,10
-    CONTROL         "A Supplier that will push updates",
-                    IDC_RADIO_SUPPLIER_SIR,"Button",BS_AUTORADIOBUTTON,118,
-                    20,121,10
-    CONTROL         "Do not configure as as Supplier",
-                    IDC_RADIO_NO_SUPPLIER_REPLICATION,"Button",
-                    BS_AUTORADIOBUTTON,118,65,113,10
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "from another server (CIR)",
-                    IDC_STATIC_CONSUMER_CIR_EXTRA,132,126,80,8
-    LTEXT           "pushed to it from another server (SIR)",
-                    IDC_STATIC_CONSUMER_SIR_EXTRA,132,105,118,8
-    LTEXT           "pulled from it by another server (CIR)",
-                    IDC_STATIC_SUPPLIER_CIR_EXTRA,131,53,115,8
-    LTEXT           "to another server (SIR)",IDC_STATIC_SUPPLIER_SIR_EXTRA,
-                    131,31,72,8
-    GROUPBOX        "Consumer Replications Settings",
-                    IDC_STATIC_CONSUMER_REPL,113,84,144,68
-    GROUPBOX        "Supplier Replication Settings",
-                    IDC_STATIC_SUPPLIER_REPLICATION,112,9,145,71
-END
-
-IDD_DISABLE_SCHEMA_CHECKING DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Disable Schema Checking"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "If you are going to import an old database immediately after or during installation, and you think you may have problems with your old schema, you may wish to turn off schema checking until after the import.",
-                    IDC_STATIC_DISABLE_SCHEMA_TXT,95,37,188,34
-    LTEXT           "If you choose to do this, schema checking will remain off until you manually turn it back on.  It is recommended that you turn it back on as soon as possible.",
-                    IDC_STATIC_DISABLE_SCHEMA_TEXT_CONT,95,76,187,28
-    GROUPBOX        "Disable Schema Checking",
-                    IDC_STATIC_DISABLE_SCHEMA_CHECKING_GROUP,90,27,198,102
-    CONTROL         "Disable Schema Checking",
-                    IDC_CHECK_DISABLE_SCHEMA_CHECKING,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,95,111,99,10
-END
-
-IDD_ADMIN_DOMAIN DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Administration Domain"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "The Administration Domain is a part of the configuration directory server used to store information about Fedora software.",
-                    IDC_STATIC_ADMIN_DOMAIN_DESC,90,8,203,16
-    EDITTEXT        IDC_EDIT_ADMIN_DOMAIN,157,113,118,14,ES_AUTOHSCROLL
-    LTEXT           "Administration Domain:",IDC_STATIC_ADMIN_DOMAIN,104,113,
-                    51,16
-    GROUPBOX        "Administration Domain Settings",
-                    IDC_STATIC_ADMIN_DOMAIN_GB,90,99,187,40
-    LTEXT           "If you are managing multiple software releases at the same time, or managing information about multiple domains, you may use the the Administration Domain to keep them separate.",
-                    IDC_STATIC_ADMIN_DOMAIN_DESC2,90,29,197,25
-    LTEXT           "If you are not using administrative domains, select the default.  Otherwise, enter a descriptive, unique name for the administration domain, such as the name of the organization responsible for managing the domain.",
-                    IDC_STATIC_ADMIN_DOMAIN_DESC3,90,58,197,33
-END
-
-IDD_REINSTALL_CONFIG DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 1.0 Reinstall Settings"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    LTEXT           "Setup has detected that you are reinstalling into an existing server root. ",
-                    IDC_STATIC_ADMIN_REINSTALL_DESC,90,8,203,16
-    LTEXT           "config url is displayed here",IDC_CONFIG_URL_VAL,96,52,
-                    184,8
-    LTEXT           "Bind As:",IDC_STATIC_BIND_AS,96,67,27,8
-    EDITTEXT        IDC_EDIT_BIND_AS,145,65,132,14,ES_AUTOHSCROLL
-    LTEXT           "Password:",IDC_STATIC_PW,96,88,34,8
-    EDITTEXT        IDC_EDIT_PW,145,87,132,14,ES_PASSWORD | ES_AUTOHSCROLL
-    GROUPBOX        "Configuration Directory",IDC_STATIC_CONFIG_DIR_SETTING,
-                    87,36,206,89
-END
-
-IDD_UNINSTALL_STATUS DIALOG DISCARDABLE  0, 0, 291, 72
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
-FONT 8, "MS Sans Serif"
-BEGIN
-    CTEXT           "",IDC_STOPPING_SERVER_MESSAGE,10,29,270,13,
-                    SS_CENTERIMAGE
-END
-
-IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE  0, 0, 297, 163
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION 
-"Directory Server 1.0 Fedora configuration directory server administrator "
-
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
-    EDITTEXT        IDC_EDIT_SUITESPOT_USER,173,51,114,14,ES_AUTOHSCROLL
-    LTEXT           "Configuration Directory Administrator ID:",
-                    IDC_STATIC_SUITESPOT_USER,94,51,73,17
-    LTEXT           "Password:",IDC_STATIC_PASSWORD,94,74,34,8
-    EDITTEXT        IDC_EDIT_PASSWORD,173,74,114,14,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    GROUPBOX        "Configuration Directory Server Administrator ",
-                    IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,61
-    LTEXT           "The Fedora configuration directory administrator is the ID typically used to log in to the console.",
-                    IDC_STATIC_MCA_DESC,88,10,196,18
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_SAMPLE_ENTRIES_ORG, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 176
-    END
-
-    IDD_REPLICATION_AGREEMENT, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 160
-    END
-
-    IDD_CHOOSE_REPLICATION_SETUP, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 160
-    END
-
-    IDD_UNINSTALL_STATUS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 284
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 65
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_WIZARD              BITMAP  DISCARDABLE     "wizard.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ERR_NO_WINSOCK          "Cant find usable winsock DLL > 2.0"
-    ERR_NO_WINSOCK_VER      "Cant find usable winsock DLL > 2.0"
-    ERR_NO_HOST             "You must enter a Host."
-    ERR_NO_PORT             "You must enter a Port."
-    ERR_NO_SUFFIX           "You must enter a suffix."
-    ERR_NO_BIND_DN          "You must enter a Bind DN."
-    ERR_NO_PW               "You must enter a password."
-    ERR_INIT_DIALOG         "Fatal Error Initializing Dialog"
-    ERR_NO_SERVER_ID        "You must enter a Server Identifier."
-    ERR_SERVER_ID_EXISTS    "A server already exists with the identifier %s. Choose a unique identifier."
-    ERR_INVALID_PORT        "The server port %d is invalid.  Please choose another one."
-    ERR_PW_TOO_SHORT        "You must enter a password of at least %d characters."
-    ERR_NO_PW_AGAIN         "You must enter password again to confirm."
-    ERR_PW_DIFFER           "Passwords differ, try again."
-    ERR_NO_ROOT_DN          "You must enter an unrestricted user."
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ERR_NO_SS_ADMIN         "You must enter a Configuration Administrator."
-    ERR_NO_SUPPLIER_DN      "You must enter a Supplier DN."
-    ERR_NO_CHANGELOG_DB     "You must enter a Changelog DB."
-    ERR_NO_CHANGELOG_SUFFIX "You must enter a Changelog Suffix."
-    ERR_NO_CONSUMER_DN      "You must enter a consumer bind dn."
-    ERR_READ_GLOBAL_CACHE   "Error Reading Global Cache: Invalid %s"
-    ERR_READ_LOCAL_CACHE    "Error Reading Local Cache: Invalid %s"
-    ERR_NO_FIND_INST_PROG   "Could not find program %s: %s"
-    ERR_EXEC_INST_PROG      "Error executing program %s: %s\nPlease refer to the log file %s for more information."
-    ERR_NO_STAT_TMP_FILE    "Could not stat the temp file %s: %s"
-    ERR_NO_CREATE_FILE      "Could not create file %s"
-    ERR_CREATE_MCC_BAT      "Fatal Error Creating Directory Server Mcc"
-    ERR_CREATE_DS_INSTANCE  "Fatal Error Creating Directory Server Instance"
-    ERR_REMOVE_EVLOG_KEY    "Error Removing Directory Server EventLog Key"
-    ERR_REMOVE_INSTANCE     "Error: unable to remove server instance: %s."
-    ERR_REM_INST_REG_KEYS   "Error: unable to remove registry keys for server %s."
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ERR_SERV_RUN_ON_PORT    "You have another server running on port %d. Turn off that server before continuing with installation."
-    ERR_INVALID_HOST        "The hostname %s could not be verified.  Please enter another hostname."
-    ERR_CANT_FIND_DS        "Could not connect to ldap://%s:%d/ for bind DN %s\nPlease check your settings.  Otherwise, the remote server may be down at this time.\nThe installation cannot proceed."
-    ERR_SNMP_IS_RUNNING     "The SNMP Service is running. It will be turned off automatically and restarted when this operation is complete if you choose to continue."
-    ERR_SNMP_BAD_SHUTDOWN   "Error stopping the SNMP Service. Setup can not continue"
-    ERR_SNMP_BAD_STARTUP    "Error starting the SNMP Service"
-    ERR_SLAPD_SHUTDOWN      "Unable to shutdown the Directory Server (%s).\nWarning, all files and registry keys may not be removed.\nWould you like to continue uninstalling?"
-    ERR_UNK_INST_CREATE     "An unknown error occured while executing program %s.\nPlease refer to the log file %s for more information."
-    IDS_UG_DESC             "You may already have a directory server you want to use to store your data, such as user and group information."
-    IDS_UG_GB_DESC          "Directory to store data"
-    IDS_UG_RADIO_EXIST      "Store data in an existing directory server"
-    IDS_UG_RADIO_CREATE     "Store data in this directory server"
-    IDS_UG_DLG_CAPTION      " "
-    ERR_NO_ADMIN_DOMAIN     "You must enter an Admin Domain."
-    ERR_8BIT_PW             "Passwords must contain 7 bit characters only."
-    ERR_8BIT_SERVID         "Server identifiers must contain 7 bit characters only."
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ERR_8BIT_PATH           "Paths must contain 7 bit characters only."
-    SUM_DS_SET_TITLE        "Directory Server Settings"
-    SUM_SERVER_IDENTIFIER   "Server Identifier"
-    SUM_SUFFIX              "Suffix"
-    SUM_PORT                "Port"
-    SUM_CONFIG_DS_TITLE     "Configuration Directory Server Settings"
-    SUM_HOST                "Host"
-    SUM_BIND_AS             "Bind As"
-    SUM_DATA_DS_TITLE       "Data Directory Server Settings"
-    SUM_CFG_ADM_ID          "Configuration Directory Administrator ID"
-    SUM_ADMIN_DOMAIN        "Administration Domain"
-    SUM_DIRECTORY_MANAGER   "Directory Manager DN"
-    SUM_SUPPLIER_REPL_TITLE "Supplier Replication Settings"
-    SUM_CHANGELOG_DB_DIR    "Changelog DB Directory"
-    SUM_CHANGELOG_SUFFIX    "Changelog Suffix"
-    SUM_REPL_AGR_TITLE      "Replication Agreement"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    SUM_REPL_ROOT           "Root of Replication"
-    SUM_REPL_DAYS           "Replication Days"
-    SUM_REPL_TIMES          "Replication Times"
-    SUM_CONSUMER_BIND_DN    "Consumer Bind DN"
-    SUM_CONSUMER_REPL_TITLE "Consumer Replication Settings"
-    SUM_SUPPLIER_DN         "Supplier Bind DN"
-    SUM_REPL_SYNC_INTERVAL  "Replication Sync Interval"
-    SUM_POP_ORG_STRUCT      "Install Sample Organizational Structure"
-    SUM_POP_DB_FILE         "Populate Database with"
-    SUM_DISABLE_SCHEMA_CHECKING "Disable Schema Checking"
-    ERR_INVALID_DN          "%s is not a valid DN."
-    SUM_REINSTALL           "Files will be updated, no configuration changes."
-    ERR_CANT_FIND_DS_REPL   "Could not connect to ldap://%s:%d/ for bind DN %s Please check your settings.  Otherwise, the remote server may be down at this time. You may need to manually start replication after installation. Would you like to continue using these settings?"
-    IDS_STARTING_SERVICE    "Starting Fedora Directory Server (%s)"
-    IDS_STOPPING_SERVICE    "Stopping Fedora Directory Server (%s)"
-    IDS_WAIT_SERVICE_START  "Waiting for Fedora Directory Server (%s) to start"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_WAIT_SERVICE_STOP   "Waiting for Fedora Directory Server (%s) to stop"
-    ERR_ADMIN_DOMAIN_DN     "A DN [%s] is not allowed here.  Please enter a valid string."
-    ERR_CANT_FIND_ADMIN_DOMAIN 
-                            "Could not find the Admin Domain %s in ldap://%s:%d/ for bind DN %s\nPlease check your settings.  You may need to install using Custom mode in order to specify the Admin domain.\nThe installation cannot proceed."
-    WARN_USING_LDAPV2_QUOTES 
-                            "The given value [%s] is quoted in the deprecated LDAPv2 style\nquoting format.  It will be automatically converted to use the\nLDAPv3 style escaped format [%s]."
-    ERR_8BIT_UID            "The UID value must contain 7 bit characters only."
-    ERR_SERVER_ID_EXISTS_TITLE "Directory Server (%s) Already Exists"
-    ERR_NO_CONFIG_URL       "The Config Directory URL could not be found."
-    WARN_USING_LDAPV2_QUOTES_TITLE "Warning: Deprecated Quoting Style [%s]"
-    ERR_INVALID_DN_TITLE    "Invalid DN: %s"
-    ERR_NO_WINSOCK_TITLE    "Could Not Find Winsock"
-    ERR_NO_WINSOCK_VER_TITLE "Invalid Winsock Version"
-    ERR_8BIT_SERVID_TITLE   "Invalid Server ID"
-    ERR_SERV_RUN_ON_PORT_TITLE "Port Is In Use"
-    ERR_INIT_DIALOG_TITLE   "Could Not Initialize Dialog"
-    ERR_NO_HOST_TITLE       "Host Required"
-    ERR_NO_PORT_TITLE       "Port Required"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ERR_NO_SUFFIX_TITLE     "Suffix Required"
-    ERR_NO_BIND_DN_TITLE    "Bind DN Required"
-    ERR_NO_PW_TITLE         "Password Required"
-    ERR_NO_SERVER_ID_TITLE  "Server ID Required"
-    ERR_INVALID_PORT_TITLE  "Port Is Invalid"
-    ERR_PW_TOO_SHORT_TITLE  "Password Length Too Short"
-    ERR_NO_PW_AGAIN_TITLE   "Enter Password Again"
-    ERR_PW_DIFFER_TITLE     "Passwords Are Different"
-    ERR_NO_ROOT_DN_TITLE    "Root DN Required"
-    ERR_NO_SS_ADMIN_TITLE   "Configuration Administrator Required"
-    ERR_NO_SUPPLIER_DN_TITLE "Supplier DN Required"
-    ERR_NO_CHANGELOG_DB_TITLE "Changelog DB Required"
-    ERR_NO_CHANGELOG_SUFFIX_TITLE "Changelog Suffix Required"
-    ERR_NO_CONSUMER_DN_TITLE "Consumer DN Required"
-    ERR_NO_FIND_INST_PROG_TITLE "Program Not Found"
-    ERR_EXEC_INST_PROG_TITLE "Could Not Execute Program"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ERR_NO_STAT_TMP_FILE_TITLE "File Not Found"
-    ERR_NO_CREATE_FILE_TITLE "Could Not Create File"
-    ERR_CREATE_MCC_BAT_TITLE "Could Not Create Script File"
-    ERR_CREATE_DS_INSTANCE_TITLE "Could Not Create Directory Server Instance"
-    ERR_REMOVE_EVLOG_KEY_TITLE "Could Not Remove EVLOG Key"
-    ERR_REMOVE_INSTANCE_TITLE "Could Not Remove Directory Server Instance"
-    ERR_REM_INST_REG_KEYS_TITLE "Could Not Remove Registry Keys"
-    ERR_INVALID_HOST_TITLE  "Invalid Host: %s"
-    ERR_CANT_FIND_DS_TITLE  "Could Not Contact Directory Server"
-    ERR_SNMP_IS_RUNNING_TITLE "SNMP Is Running"
-    ERR_SNMP_BAD_SHUTDOWN_TITLE "Error Shutting Down SNMP"
-    ERR_SNMP_BAD_STARTUP_TITLE "Could Not Start SNMP"
-    ERR_SLAPD_SHUTDOWN_TITLE "Error Shutting Down Directory Server (%s)"
-    ERR_NO_ADMIN_DOMAIN_TITLE "Admin Domain Required"
-    ERR_8BIT_PW_TITLE       "Invalid Password"
-    ERR_8BIT_PATH_TITLE     "Invalid Path"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ERR_CANT_FIND_DS_REPL_TITLE "Could Not Connect To Replication Server"
-    ERR_ADMIN_DOMAIN_DN_TITLE "Invalid Admin Domain %s"
-    ERR_CANT_FIND_ADMIN_DOMAIN_TITLE "Admin Domain %s Not Found"
-    ERR_8BIT_UID_TITLE      "Invalid User ID Value"
-    ERR_NO_CONFIG_URL_TITLE "Configuration Directory Information Not Found"
-    ERR_NO_USER_URL         "The information about the User Directory could not be found."
-    ERR_NO_USER_URL_TITLE   "Could Nof Find User Directory Information"
-    ERR_UNINSTALL_DS        "Could not uninstall Directory Server.  Please check the log file\n%s for problems,\ncorrect them, and uninstall again.  Exiting."
-    ERR_UNINSTALL_DS_TITLE  "Could not uninstall Directory Server"
-    ERR_REG_DEL_KEY_TITLE   "Could Not Delete Registry Key"
-    ERR_REG_DEL_KEY         "Could not delete the registry key %s - error %d (%s)."
-    ERR_REG_CREATE_KEY_TITLE "Could not Create Registry Key"
-    ERR_REG_CREATE_KEY      "Could not create the registry key %s - error %d (%s)."
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/ldap/cm/newinstnt/dsinst_dsalib_dn.c b/ldap/cm/newinstnt/dsinst_dsalib_dn.c
deleted file mode 100644
index 53b92f7a..00000000
--- a/ldap/cm/newinstnt/dsinst_dsalib_dn.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-
-#include <dsalib_dn.c>
diff --git a/ldap/cm/newinstnt/libinst.c b/ldap/cm/newinstnt/libinst.c
deleted file mode 100644
index 2246b011..00000000
--- a/ldap/cm/newinstnt/libinst.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include "libinst.h"
-#include <stdio.h>
-
-//--------------------------------------------------------------------------//
-// Use this instead of installer installer sdk stuff so window is hidden    //
-//--------------------------------------------------------------------------//
-DWORD _LaunchAndWait(char *szCommandLine, DWORD dwTimeout)
-{
-    PROCESS_INFORMATION pi;
-    STARTUPINFO si;
-    DWORD dwExitCode = 0;
-
-    ZeroMemory(&pi, sizeof(pi));
-    ZeroMemory(&si, sizeof(si));
-    si.cb = sizeof(STARTUPINFO);
-    si.dwFlags = STARTF_USESHOWWINDOW;
-    // si.wShowWindow = SW_HIDE;
-    // show for debuggin for now
-    si.dwFlags = SW_SHOW;
-
-    if(CreateProcess(NULL, szCommandLine, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
-    {
-        if(WaitForSingleObject(pi.hProcess, dwTimeout) == WAIT_OBJECT_0)
-            GetExitCodeProcess(pi.hProcess, &dwExitCode);
-        CloseHandle(pi.hThread);
-        CloseHandle(pi.hProcess);
-    }
-    return(dwExitCode);
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// WriteSummaryStringRC
-//
-// write summary info string using resource
-//
-// returns number of bytes written by wsprintf 
-//
-
-int WriteSummaryStringRC(LPSTR psz, char *format, HINSTANCE hModule, UINT uStringID, char *value)
-{
-
-	char szTempString[MAX_STR_SIZE]={0};
-	int nReturn= 0;
-
-	LoadString( hModule, uStringID, szTempString, MAX_STR_SIZE);
-
-	if(value)
-	{
-		nReturn = wsprintf(psz, format, szTempString, value);
-	}else{
-		nReturn = wsprintf(psz, format, szTempString);
-	}
-	
-	return nReturn;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// WriteSummaryStringRC
-//
-// write summary info integer using resource
-//
-// returns number of bytes written by wsprintf 
-//
-
-int WriteSummaryIntRC(LPSTR psz, char *format, HINSTANCE hModule, UINT uStringID, int value)
-{
-
-	char szTempString[MAX_STR_SIZE]={0};
-	int nReturn = 0;
-	
-
-	LoadString( hModule, uStringID, szTempString, MAX_STR_SIZE);
-	nReturn = wsprintf(psz, format, szTempString, value);
-	
-	return nReturn;
-}
-
-void
-DSGetHostName(char *hostname, int bufsiz)
-{
-	char *setupHostname = setupGetHostName();
-	if (setupHostname) {
-		int len = strlen(setupHostname);
-		if (len >= bufsiz)
-			len = bufsiz - 1;
-		strncpy(hostname, setupHostname, len);
-		hostname[len] = 0;
-		setupFree(setupHostname);
-	} else {
-		GetHostName(hostname, bufsiz);
-	}
-}
-
-void
-DSGetDefaultSuffix(char *suffix, const char *hostname)
-{
-	const char *SUF = "dc=";
-	const int SUF_LEN = 3;
-	char *sptr = suffix;
-	const char *ptr = 0;
-
-	if (!hostname) {
-		sprintf(sptr, "%s%s", SUF, "unknown-suffix");
-		return; /* bogus domain name */
-	} else {
-		ptr = strchr(hostname, '.'); /* skip to first . in hostname */
-		if (!ptr) {
-			sprintf(sptr, "%s%s", SUF, hostname);
-			return; /* no domain name */
-		}
-		ptr++; /* skip to beginning of domain name */
-	}
-
-	*sptr = 0;
-	strcat(sptr, SUF);
-	sptr += SUF_LEN;
-	for (; *ptr; ++ptr) {
-		if (*ptr == '.') {
-			strcat(sptr, ", ");
-			sptr += 2;
-			strcat(sptr, SUF);
-			sptr += SUF_LEN;
-		} else {
-			*sptr++ = *ptr;
-		}
-	}
-	*sptr = 0;
-
-	return;
-}
diff --git a/ldap/cm/newinstnt/libinst.h b/ldap/cm/newinstnt/libinst.h
deleted file mode 100644
index a3d50442..00000000
--- a/ldap/cm/newinstnt/libinst.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-// libinst.h - Netscape SuiteSpot Installation Plug-In Directory Server
-//
-//
-// routines common to each component install dll
-#ifndef __LIBINST_H
-#define __LIBINST_H
-
-#include <windows.h>
-#include <nssetup.h>
-
-#define MAX_STR_SIZE  512
-
-DWORD _LaunchAndWait(char *szCommandLine, DWORD dwTimeout);
-int WriteSummaryStringRC(LPSTR lpsz, char *format, HINSTANCE hModule, UINT uStringID, char *value);
-int WriteSummaryIntRC(LPSTR lpsz, char *format, HINSTANCE hModule, UINT uStringID, int value);
-int DSMessageBox(UINT type, UINT titleKey, UINT msgKey, const char *titlearg, ...);
-int DSMessageBoxOK(UINT titleKey, UINT msgKey, const char *titlearg, ...);
-void DSGetHostName(char *hostname, int bufsiz);
-void DSGetDefaultSuffix(char *suffix, const char *hostname);
-#endif
diff --git a/ldap/cm/newinstnt/resource.h b/ldap/cm/newinstnt/resource.h
deleted file mode 100644
index 2355e440..00000000
--- a/ldap/cm/newinstnt/resource.h
+++ /dev/null
@@ -1,377 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This Program is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation; version 2 of the License.
-// 
-// This Program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License along with
-// this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-// Place, Suite 330, Boston, MA 02111-1307 USA.
-// 
-// In addition, as a special exception, Red Hat, Inc. gives You the additional
-// right to link the code of this Program with code not covered under the GNU
-// General Public License ("Non-GPL Code") and to distribute linked combinations
-// including the two, subject to the limitations in this paragraph. Non-GPL Code
-// permitted under this exception must only link to the code of this Program
-// through those well defined interfaces identified in the file named EXCEPTION
-// found in the source code files (the "Approved Interfaces"). The files of
-// Non-GPL Code may instantiate templates or use macros or inline functions from
-// the Approved Interfaces without causing the resulting work to be covered by
-// the GNU General Public License. Only Red Hat, Inc. may make changes or
-// additions to the list of Approved Interfaces. You must obey the GNU General
-// Public License in all respects for all of the Program code and other code used
-// in conjunction with the Program except the Non-GPL Code covered by this
-// exception. If you modify this file, you may extend this exception to your
-// version of the file, but you are not obligated to do so. If you do not wish to
-// provide this exception without modification, you must delete this exception
-// statement from your version and license this file solely under the GPL without
-// exception. 
-// 
-// 
-// Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-// Copyright (C) 2005 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by dsinst.rc
-//
-#define ERR_NO_WINSOCK                  1
-#define ERR_NO_WINSOCK_VER              2
-#define ERR_NO_HOST                     3
-#define ERR_NO_PORT                     4
-#define ERR_NO_SUFFIX                   5
-#define ERR_NO_BIND_DN                  6
-#define ERR_NO_PW                       7
-#define ERR_INIT_DIALOG                 8
-#define ERR_NO_SERVER_ID                9
-#define ERR_SERVER_ID_EXISTS            10
-#define ERR_INVALID_PORT                11
-#define ERR_PW_TOO_SHORT                12
-#define ERR_NO_PW_AGAIN                 13
-#define ERR_PW_DIFFER                   14
-#define ERR_NO_ROOT_DN                  15
-#define ERR_NO_SS_ADMIN                 16
-#define ERR_NO_SUPPLIER_DN              17
-#define ERR_NO_CHANGELOG_DB             18
-#define ERR_NO_CHANGELOG_SUFFIX         19
-#define ERR_NO_CONSUMER_DN              20
-#define ERR_READ_GLOBAL_CACHE           21
-#define ERR_READ_LOCAL_CACHE            22
-#define ERR_NO_FIND_INST_PROG           23
-#define ERR_EXEC_INST_PROG              24
-#define ERR_NO_STAT_TMP_FILE            25
-#define ERR_NO_CREATE_FILE              26
-#define ERR_CREATE_MCC_BAT              27
-#define ERR_CREATE_DS_INSTANCE          28
-#define ERR_REMOVE_EVLOG_KEY            29
-#define ERR_REMOVE_INSTANCE             30
-#define ERR_REM_INST_REG_KEYS           31
-#define ERR_SERV_RUN_ON_PORT            32
-#define ERR_INVALID_HOST                33
-#define ERR_CANT_FIND_DS                34
-#define ERR_SNMP_IS_RUNNING             35
-#define ERR_SNMP_BAD_SHUTDOWN           36
-#define ERR_SNMP_BAD_STARTUP            37
-#define ERR_SLAPD_SHUTDOWN              38
-#define ERR_UNK_INST_CREATE             39
-#define IDS_UG_DESC                     40
-#define IDS_UG_GB_DESC                  41
-#define IDS_UG_RADIO_EXIST              42
-#define IDS_UG_RADIO_CREATE             43
-#define IDS_UG_DLG_CAPTION              44
-#define ERR_NO_ADMIN_DOMAIN             45
-#define ERR_8BIT_PW                     46
-#define ERR_8BIT_SERVID                 47
-#define ERR_8BIT_PATH                   48
-#define SUM_DS_SET_TITLE                49
-#define SUM_SERVER_IDENTIFIER           50
-#define SUM_SUFFIX                      51
-#define SUM_PORT                        52
-#define SUM_CONFIG_DS_TITLE             53
-#define SUM_HOST                        54
-#define SUM_BIND_AS                     55
-#define SUM_DATA_DS_TITLE               56
-#define SUM_CFG_ADM_ID                  57
-#define SUM_ADMIN_DOMAIN                58
-#define SUM_DIRECTORY_MANAGER           59
-#define SUM_SUPPLIER_REPL_TITLE         60
-#define SUM_CHANGELOG_DB_DIR            61
-#define SUM_CHANGELOG_SUFFIX            62
-#define SUM_REPL_AGR_TITLE              63
-#define SUM_REPL_ROOT                   64
-#define SUM_REPL_DAYS                   65
-#define SUM_REPL_TIMES                  66
-#define SUM_CONSUMER_BIND_DN            67
-#define SUM_CONSUMER_REPL_TITLE         68
-#define SUM_SUPPLIER_DN                 69
-#define SUM_REPL_SYNC_INTERVAL          70
-#define SUM_POP_ORG_STRUCT              71
-#define SUM_POP_DB_FILE                 72
-#define SUM_DISABLE_SCHEMA_CHECKING     73
-#define ERR_INVALID_DN                  74
-#define SUM_REINSTALL                   75
-#define ERR_CANT_FIND_DS_REPL           76
-#define IDS_STARTING_SERVICE            77
-#define IDS_STOPPING_SERVICE            78
-#define IDS_WAIT_SERVICE_START          79
-#define IDS_WAIT_SERVICE_STOP           80
-#define ERR_ADMIN_DOMAIN_DN             81
-#define ERR_CANT_FIND_ADMIN_DOMAIN      82
-#define WARN_USING_LDAPV2_QUOTES        83
-#define ERR_8BIT_UID                    84
-#define ERR_SERVER_ID_EXISTS_TITLE      85
-#define ERR_NO_CONFIG_URL               86
-#define WARN_USING_LDAPV2_QUOTES_TITLE  87
-#define ERR_INVALID_DN_TITLE            88
-#define ERR_NO_WINSOCK_TITLE            89
-#define ERR_NO_WINSOCK_VER_TITLE        90
-#define ERR_8BIT_SERVID_TITLE           91
-#define ERR_SERV_RUN_ON_PORT_TITLE      92
-#define ERR_INIT_DIALOG_TITLE           93
-#define ERR_NO_HOST_TITLE               94
-#define ERR_NO_PORT_TITLE               95
-#define ERR_NO_SUFFIX_TITLE             96
-#define ERR_NO_BIND_DN_TITLE            97
-#define ERR_NO_PW_TITLE                 98
-#define ERR_NO_SERVER_ID_TITLE          99
-#define ERR_INVALID_PORT_TITLE          100
-#define ERR_PW_TOO_SHORT_TITLE          101
-#define IDB_WIZARD                      102
-#define ERR_NO_PW_AGAIN_TITLE           102
-#define ERR_PW_DIFFER_TITLE             103
-#define ERR_NO_ROOT_DN_TITLE            104
-#define IDD_SERVER_SETTINGS             105
-#define ERR_NO_SS_ADMIN_TITLE           105
-#define IDD_SUITESPOTID                 106
-#define ERR_NO_SUPPLIER_DN_TITLE        106
-#define IDD_CONSUMER_REPLICATION_SETTINGS 107
-#define ERR_NO_CHANGELOG_DB_TITLE       107
-#define IDD_SUPPLIER_REPLICATION_SETTINGS 108
-#define ERR_NO_CHANGELOG_SUFFIX_TITLE   108
-#define IDD_ROOTDN                      109
-#define ERR_NO_CONSUMER_DN_TITLE        109
-#define ERR_NO_FIND_INST_PROG_TITLE     110
-#define ERR_EXEC_INST_PROG_TITLE        111
-#define IDD_CHOOSE_REPLICATION_SETUP    112
-#define ERR_NO_STAT_TMP_FILE_TITLE      112
-#define IDD_REPLICATION_AGREEMENT       113
-#define ERR_NO_CREATE_FILE_TITLE        113
-#define ERR_CREATE_MCC_BAT_TITLE        114
-#define IDD_SAMPLE_ENTRIES_ORG          115
-#define ERR_CREATE_DS_INSTANCE_TITLE    115
-#define IDD_CONSUMER_DN                 116
-#define ERR_REMOVE_EVLOG_KEY_TITLE      116
-#define IDD_MCC_SETTINGS                117
-#define ERR_REMOVE_INSTANCE_TITLE       117
-#define ERR_REM_INST_REG_KEYS_TITLE     118
-#define IDD_DISABLE_SCHEMA_CHECKING     119
-#define ERR_INVALID_HOST_TITLE          119
-#define IDD_ADMIN_DOMAIN                120
-#define ERR_CANT_FIND_DS_TITLE          120
-#define IDD_REINSTALL_CONFIG            121
-#define ERR_SNMP_IS_RUNNING_TITLE       121
-#define IDD_UNINSTALL_STATUS            122
-#define ERR_SNMP_BAD_SHUTDOWN_TITLE     122
-#define ERR_SNMP_BAD_STARTUP_TITLE      123
-#define IDD_ADMIN_ID_ONLY               123
-#define ERR_SLAPD_SHUTDOWN_TITLE        124
-#define ERR_NO_ADMIN_DOMAIN_TITLE       125
-#define ERR_8BIT_PW_TITLE               126
-#define ERR_8BIT_PATH_TITLE             127
-#define ERR_CANT_FIND_DS_REPL_TITLE     128
-#define ERR_ADMIN_DOMAIN_DN_TITLE       129
-#define ERR_CANT_FIND_ADMIN_DOMAIN_TITLE 130
-#define ERR_8BIT_UID_TITLE              131
-#define ERR_NO_CONFIG_URL_TITLE         132
-#define ERR_NO_USER_URL                 133
-#define ERR_NO_USER_URL_TITLE           134
-#define ERR_UNINSTALL_DS                135
-#define ERR_UNINSTALL_DS_TITLE          136
-#define ERR_REG_DEL_KEY_TITLE           137
-#define ERR_REG_DEL_KEY                 138
-#define ERR_REG_CREATE_KEY_TITLE        139
-#define ERR_REG_CREATE_KEY              140
-#define IDC_EDIT_UNRESTRICTED_USER      1000
-#define IDC_EDIT_PASSWORD               1001
-#define IDC_EDIT_PASSWORD_AGAIN         1002
-#define IDC_STATIC_UNRESTRICTED_USER    1003
-#define IDC_STATIC_PASSWORD             1004
-#define IDC_STATIC_PASSWORD_AGAIN       1005
-#define IDC_STATIC_PASSWORD_AGAIN2      1006
-#define IDC_STATIC_SERVER_PORT          1012
-#define IDC_STATIC_SECURITY_ENABLED     1013
-#define IDC_STATIC_SERVER_IDENTIFIER    1014
-#define IDC_STATIC_SUFFIX               1015
-#define IDC_STATIC_SECURE_SERVER_PORT   1016
-#define IDC_EDIT_SERVER_IDENTIFIER      1017
-#define IDC_EDIT_SUFFIX                 1018
-#define IDC_EDIT_SERVER_PORT            1019
-#define IDC_STATIC_GENERAL_SETTINGS     1020
-#define IDC_EDIT_SECURE_SERVER_PORT     1021
-#define IDC_STATIC_SECURITY_SETTINGS    1022
-#define IDC_RADIO_SEC_YES               1023
-#define IDC_RADIO_SEC_NO                1024
-#define IDC_SPIN_SERVER_PORT            1025
-#define IDC_SPIN_SECURE_SERVER_PORT     1026
-#define IDC_STATIC_CIR_DESCRIPTION      1027
-#define IDC_EDIT_SUITESPOT_USER         1028
-#define IDC_STATIC_CIR_DESCRIPTION2     1028
-#define IDC_STATIC_SUPPLIER_DN          1029
-#define IDC_STATIC_SUITESPOT_USER       1030
-#define IDC_STATIC_SUPPLIER_PW          1031
-#define IDC_STATIC_SUPPLIER_PW2         1032
-#define IDC_EDIT_SUPPLIER_DN            1033
-#define IDC_EDIT_SUPPLIER_PW            1034
-#define IDC_SUPPLIER_PW_AGAIN           1035
-#define IDC_CONSUMER                    1036
-#define IDC_STATIC_SUPPLIER_SSL         1037
-#define IDC_EDIT_SUPPLIER_SSL_CLIENTS   1038
-#define IDC_STATIC_SIR_DESCRIPTION      1039
-#define IDC_STATIC_CHANGELOG_DB_DIR     1040
-#define IDC_STATIC_CHANGELOG_SUFFIX     1041
-#define IDC_STATIC_MAX_CHANGELOG_RECORDS 1042
-#define IDC_STATIC_MAX_CHANGELOG_RECORDS2 1043
-#define IDC_EDIT_CHANGELOG_DB_DIR       1044
-#define IDC_EDIT_CHANGELOG_DB_SUFFIX    1045
-#define IDC_EDIT_MAX_CHANGELOG_AGE      1046
-#define IDC_EDIT_MAX_CHANGELOG_RECORDS  1047
-#define IDC_COMBO_MAX_CHANGELOG_AGE     1049
-#define IDC_SIR_DESCRIPTION             1050
-#define IDC_STATIC_SIR_AGREEMENTS       1051
-#define IDC_STATIC_SIR_AGREEMENTS_GROUP 1052
-#define IDC_LIST_CONSUMERS              1053
-#define IDC_RADIO_CONSUMER_CIR          1056
-#define IDC_STATIC_SIR_AGREEMENTS2      1057
-#define IDC_RADIO_CONSUMER_SIR          1057
-#define IDC_STATIC_CIR_AGREEMENTS_GROUP 1058
-#define IDC_RADIO_SUPPLIER_SIR          1058
-#define IDC_RADIO_SUPPLIER_CIR          1059
-#define IDC_STATIC_CHANGELOG_DB_DIR2    1060
-#define IDC_RADIO_NO_REPLICATION        1060
-#define IDC_RADIO_NO_CONSUMER_REPLICATION 1060
-#define IDC_STATIC_REPLICA_CONFIG       1061
-#define IDC_RADIO_NO_SUPPLIER_REPLICATION 1061
-#define IDC_STATIC_REPLICATION_HOST     1062
-#define IDC_STATIC_REPLICATION_PORT     1063
-#define IDC_STATIC_REPLICATION_ROOT     1064
-#define IDC_STATIC_REPLICATION_BIND_AS  1065
-#define IDC_STATIC_REPLICATION_PW       1066
-#define IDC_EDIT_REPLICATION_HOST       1067
-#define IDC_EDIT_REPLICATION_ROOT       1068
-#define IDC_EDIT_REPLICATION_BIND_AS    1069
-#define IDC_EDIT_REPLICATION_PW         1070
-#define IDC_EDIT_REPLICATION_PORT       1071
-#define IDC_STATIC_REPLICATION_AGREEMENT 1072
-#define IDC_CHECK_REPLICATION_SSL       1073
-#define IDC_STATIC_SAMPLE_ENTRIES_DESCRIPTION 1074
-#define IDC_CHECK_SAMPLE_ENTRIES        1075
-#define IDC_CHECK_POPULATE_SAMPLE_ENTRIES 1075
-#define IDC_STATIC_ORG_ENTRIES          1076
-#define IDC_CHECK_POPULATE_ORG_ENTRIES  1077
-#define IDC_STATIC_SAMPLE_GROUP         1078
-#define IDC_STATIC_DEFAULT_ORG_GROUP    1079
-#define IDC_EDIT_CONSUMER_DN            1080
-#define IDC_STATIC_CONSUMER_DN          1081
-#define IDC_STATIC_CONSUMER_PW          1082
-#define IDC_STATIC_SUPPLIER_CIR         1083
-#define IDC_STATIC_UNRESTRICTED_USER_GROUPBOX 1084
-#define IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX 1085
-#define IDC_STATIC_CONSUMER_CIR_EXTRA   1086
-#define IDC_STATIC_CONSUMER_SIR_EXTRA   1087
-#define IDC_STATIC_SUPPLIER_CIR_EXTRA   1088
-#define IDC_STATIC_SUPPLIER_SIR_EXTRA   1089
-#define IDC_STATIC_CONSUMER_REPL        1090
-#define IDC_STATIC_SUPPLIER_REPLICATION 1091
-#define IDC_BUTTON_CHOOSE_LDIF_FILE     1093
-#define IDC_RADIO_DONT_POPULATE         1097
-#define IDC_RADIO_POPULATE_SAMPLE       1098
-#define IDC_RADIO_POPULATE_CUSTOM       1099
-#define IDC_STATIC_MUST_HAVE_BASE       1100
-#define IDC_STATIC_FILE_NAME_COLON      1101
-#define IDC_STATIC_LDIF_FILE_NAME       1102
-#define IDC_STATIC_REPL_DAYS            1103
-#define IDC_CHECK_SUN                   1104
-#define IDC_CHECK_MON                   1105
-#define IDC_CHECK_TUE                   1106
-#define IDC_CHECK_WED                   1107
-#define IDC_CHECK_THUR                  1108
-#define IDC_CHECK_FRI                   1109
-#define IDC_CHECK_SAT                   1110
-#define IDC_STATIC_REPL_START_TIME      1111
-#define IDC_EDIT_REPL_START_TIME_HH     1112
-#define IDC_STATIC_REPL_END_TIME        1113
-#define IDC_EDIT_REPL_END_TIME_HH       1114
-#define IDC_SPIN_REPL_START_TIME_MM     1115
-#define IDC_SPIN_REPL_SYNC_INTERVAL     1117
-#define IDC_EDIT_REPL_SYNC_INTERVAL     1118
-#define IDC_EDIT_REPL_START_TIME_MM     1119
-#define IDC_STATIC_REPL_SYNC            1120
-#define IDC_SPIN_REPL_START_TIME_HH     1121
-#define IDC_SPIN_REPL_END_TIME_HH       1122
-#define IDC_EDIT_REPL_END_TIME_MM       1123
-#define IDC_SPIN_REPL_END_TIME_MM       1124
-#define IDC_EDIT_MCC_HOST               1125
-#define IDC_EDIT_HOST                   1125
-#define IDC_EDIT_MCC_PORT               1126
-#define IDC_EDIT_PORT                   1126
-#define IDC_EDIT_MCC_SUFFIX             1127
-#define IDC_EDIT_MCC_BIND_AS            1128
-#define IDC_EDIT_BIND_AS                1128
-#define IDC_EDIT_MCC_PW                 1129
-#define IDC_EDIT_PW                     1129
-#define IDC_STATIC_MCC_HOST             1130
-#define IDC_STATIC_MCC_PORT             1131
-#define IDC_STATIC_MCC_SUFFIX           1132
-#define IDC_STATIC_MCC_BIND_AS          1133
-#define IDC_STATIC_MCC_PW               1134
-#define IDC_STATIC_MCC_SETTINGS         1135
-#define IDC_STATIC_SETTINGS             1135
-#define IDC_RADIO_MCC_USE_THIS_SERVER   1136
-#define IDC_RADIO_USE_THIS_SERVER       1136
-#define IDC_RADIO_MCC_USE_EXISTING_SERVER 1137
-#define IDC_RADIO_USE_EXISTING_SERVER   1137
-#define IDC_STATIC_MCC_DESC             1138
-#define IDC_STATIC_DESC                 1138
-#define IDC_STATIC_MCA_DESC             1139
-#define IDC_STATIC_DM_DESC              1140
-#define IDC_RADIO_CONFIG_CONSUMER_DN_YES 1142
-#define IDC_RADIO3                      1143
-#define IDC_RADIO_CONFIG_CONSUMER_DN_NO 1143
-#define IDC_STATIC_DISABLE_SCHEMA_TXT   1144
-#define IDC_STATIC_DISABLE_SCHEMA_CHECKING_GROUP 1145
-#define IDC_CHECK_DISABLE_SCHEMA_CHECKING 1146
-#define IDC_STATIC_DISABLE_SCHEMA_TEXT_CONT 1147
-#define IDC_STATIC_SERV_SETTINGS_DESC   1148
-#define IDC_EDIT_ADMIN_DOMAIN           1149
-#define IDC_STATIC_ADMIN_DOMAIN_DESC    1150
-#define IDC_STATIC_ADMIN_DOMAIN         1151
-#define IDC_STATIC_ADMIN_DOMAIN_GB      1152
-#define IDC_STATIC_ADMIN_DOMAIN_DESC2   1153
-#define IDC_STATIC_ADMIN_REINSTALL_DESC 1154
-#define IDC_STATIC_ADMIN_DOMAIN_DESC3   1155
-#define IDC_CONFIG_URL_VAL              1156
-#define IDC_STATIC_BIND_AS              1157
-#define IDC_STATIC_PW                   1158
-#define IDC_STATIC_CONFIG_DIR_SETTING   1161
-#define IDC_STOPPING_SERVER_MESSAGE     1163
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        123
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1166
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/ldap/cm/newinstnt/setup.bat b/ldap/cm/newinstnt/setup.bat
deleted file mode 100644
index c6027c65..00000000
--- a/ldap/cm/newinstnt/setup.bat
+++ /dev/null
@@ -1,40 +0,0 @@
-@rem // --- BEGIN COPYRIGHT BLOCK ---
-@rem // This Program is free software; you can redistribute it and/or modify it under
-@rem // the terms of the GNU General Public License as published by the Free Software
-@rem // Foundation; version 2 of the License.
-@rem // 
-@rem // This Program is distributed in the hope that it will be useful, but WITHOUT
-@rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-@rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-@rem // 
-@rem // You should have received a copy of the GNU General Public License along with
-@rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-@rem // Place, Suite 330, Boston, MA 02111-1307 USA.
-@rem // 
-@rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
-@rem // right to link the code of this Program with code not covered under the GNU
-@rem // General Public License ("Non-GPL Code") and to distribute linked combinations
-@rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
-@rem // permitted under this exception must only link to the code of this Program
-@rem // through those well defined interfaces identified in the file named EXCEPTION
-@rem // found in the source code files (the "Approved Interfaces"). The files of
-@rem // Non-GPL Code may instantiate templates or use macros or inline functions from
-@rem // the Approved Interfaces without causing the resulting work to be covered by
-@rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
-@rem // additions to the list of Approved Interfaces. You must obey the GNU General
-@rem // Public License in all respects for all of the Program code and other code used
-@rem // in conjunction with the Program except the Non-GPL Code covered by this
-@rem // exception. If you modify this file, you may extend this exception to your
-@rem // version of the file, but you are not obligated to do so. If you do not wish to
-@rem // provide this exception without modification, you must delete this exception
-@rem // statement from your version and license this file solely under the GPL without
-@rem // exception. 
-@rem // 
-@rem // 
-@rem // Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-@rem // Copyright (C) 2005 Red Hat, Inc.
-@rem // All rights reserved.
-@rem // --- END COPYRIGHT BLOCK ---
-@echo off
-
-tools\perl setup.pl %*
diff --git a/ldap/cm/newinstnt/setup.inf b/ldap/cm/newinstnt/setup.inf
deleted file mode 100644
index 5e35fc24..00000000
--- a/ldap/cm/newinstnt/setup.inf
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Sample Netscape SuiteSpot Server Package Information File
-#
-# Components: lists the components to be installed as specified
-# in subsequent sections. If the section or the ComponentInfoFile
-# does note exist the setup program will ignore the component
-
-[General]
-Name         =      Fedora Server Family
-Vendor       =      Fedora Project
-Description  =      Fedora Server Family
-Version      =      %%%SERVER_VERSION%%%
-Components   =      svrcore, base, admin, slapd, dssynch, msg, mcc
-
-# Package Contents
-[svrcore]
-ComponentInfoFile = svrcore/svrcore.inf
-
-[base]
-ComponentInfoFile = base/base.inf
-
-[admin]
-ComponentInfoFile = admin/admin.inf
-
-[slapd]
-ComponentInfoFile = slapd/slapd.inf
-
-[dssynch]
-ComponentInfoFile=dssynch\dssynch.inf
-
-[msg]
-ComponentInfoFile = msg/msg.inf
-
-[mcc]
-ComponentInfoFile = mcc/mcc.inf
diff --git a/ldap/cm/newinstnt/slapd.inf b/ldap/cm/newinstnt/slapd.inf
deleted file mode 100644
index fc2917a3..00000000
--- a/ldap/cm/newinstnt/slapd.inf
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-[General]
-Name=Fedora Directory Suite
-Components=slapd,slapd-client
-Checked=TRUE
-Description=Fedora Directory Server
-
-[slapd]
-Name=Fedora Directory Server
-InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
-NickName=slapd
-Version= %%%SERVER_VERSION%%%
-Compatible= %%%SERVER_VERSION%%%
-BuildNumber= %%%SERVER_BUILD_NUM%%%
-Expires= %%%PUMPKIN_HOUR%%%
-Security= %%%SECURITY%%%
-Vendor=Fedora Project
-Description=Fedora Directory Server
-DefaultAcceptLanguage=en
-Dependencies=admin/4.5
-Revision= 
-Checked=TRUE
-IsLdap=TRUE
-IsDirLite=%%%IS_DIR_LITE%%%
-Mandatory=FALSE
-#install files for admin
-Archive=slapd.z
-PlugIn=dsinst.dll
-ReadInf=DSINST_ReadComponentInf
-PreInstall=DSINST_PreInstall
-AskOptions=DSINST_AskOptions
-GetSummary=DSINST_GetSummary
-WriteLocalCache=DSINST_WriteLocalCache
-WriteGlobalCache=DSINST_WriteGlobalCache
-ReadLocalCache=DSINST_ReadLocalCache
-ReadGlobalCache=DSINST_ReadGlobalCache
-PostInstall=DSINST_PostInstall
-PreUninstall=DSINST_PreUnInstall
-PostUninstall=DSINST_PostUnInstall
-
-[slapd-client]
-NickName=slapd-client
-Dependencies=base-client/4.5
-Name=Fedora Directory Server
-Description=Fedora Directory Server
-Version= %%%SERVER_VERSION%%%
-Compatible= %%%SERVER_VERSION%%%
-BuildNumber= %%%SERVER_BUILD_NUM%%%
-Expires= %%%PUMPKIN_HOUR%%%
-IsMCC=TRUE
-IsLdap=FALSE
-Checked=TRUE
-Mandatory=FALSE
-#install files admin-client component
-Archive=dsjars.z
diff --git a/ldap/cm/newinstnt/wizard.bmp b/ldap/cm/newinstnt/wizard.bmp
deleted file mode 100644
index 6941f566..00000000
--- a/ldap/cm/newinstnt/wizard.bmp
+++ /dev/null
diff --git a/ldap/cm/ntpack.sh b/ldap/cm/ntpack.sh
deleted file mode 100644
index 465625a9..00000000
--- a/ldap/cm/ntpack.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-#######################################################################
-#
-#   Script to pack ldapsdk on NT (uses rtpatch)
-#
-#   Mahesh Purswani (3/97)
-#######################################################################
-
-# Path to the rtpatch installation
-RTPATCH=/rtpatch
-
-outfile=outname
-reldir=.
-olddir=/nonedir
-while [ $# -gt 0 ]
-do
-  case "$1" in
-    -o)
-	shift
-	outfile=$1;;
-    -r)
-	shift
-	reldir=$1;;
-     *)
-	echo ""
-	echo "Usage: $0 [-o outfile] [-r sourcedir]"
-	echo ""
-	exit 1;;
-  esac
-  shift
-done
-
-if [ ! -d "$olddir" ] ; then
-  echo "Making empty old directory $olddir"
-  mkdir $olddir
-fi
-
-rolddir=`echo $olddir | sed 's#/#\\\\#g'`
-rreldir=`echo $reldir | sed 's#/#\\\\#g'`
-
-cat <<EOF > pack.txt
-OLDDIR $rolddir /F
-NEWDIR $rreldir /F
-OUTPUT $outfile
-FILE *.*
-PATCHFILE
-LONGNAMES
-PARTIAL
-SUBDIRSEARCH
-NOPATHSEARCH
-IGNOREMISSING
-EOF
-
-cat <<EOF > bind.txt
-[General]
-Platform=Console32
-DirectoryPrompt=Please specify install directory (default is current directory): 
-IncludeDLL=1
-PatchFile=$outfile.rtp
-OutputFile=$outfile.exe
-EOF
-
-# Run rtpatch
-$RTPATCH/pbld-nt @pack.txt
-$RTPATCH/pbind bind.txt
-
-echo "Packed release dir = $reldir"
-echo "To outfile = $outfile"
diff --git a/ldap/cm/redhat-patch.inf b/ldap/cm/redhat-patch.inf
deleted file mode 100644
index 27a613ee..00000000
--- a/ldap/cm/redhat-patch.inf
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Sample Info file to generate service pack
-# base: <builddir> containing the base package -- e.g., DS7.1
-# file: <bugzilla number>: <patchfile>
-# compfile: bug#: <patch_zipfile>:<patchfile> 
-#                 %DISTDIR% points <buildroot>/dist/<platform>
-#
-base: /share/dev4/fedora-ds/fds71/ships/20050526.1
-
-file: 000001: README.txt
-file: 000002: lib/libback-ldbm.*
-compfile: 000003: %DISTDIR%/adminserver/admin/nsadmin.zip:manual/help/help
diff --git a/ldap/cm/unixstrip b/ldap/cm/unixstrip
deleted file mode 100755
index 5b7cdd96..00000000
--- a/ldap/cm/unixstrip
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh  
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# usage unixstrip <location> 
-
-perl="$1"
-
-arch=`uname -s`
-if [ "$arch" = "HP-UX" ]; then
-    SHLIB_PATH="$4"
-	export SHLIB_PATH
-else
-    LD_LIBRARY_PATH="$4"
-	export LD_LIBRARY_PATH
-fi
-
-if [ $# > 2 ]; then
-exec "$perl" unixstrip.pl "$2" "$3"
-else
-exec "$perl" unixstrip.pl "$2"
-fi
-
-#for StripFile in `find . -type f  -print `
-#do
-#	strip $StripFile
-#done
diff --git a/ldap/cm/unixstrip.pl b/ldap/cm/unixstrip.pl
deleted file mode 100644
index 2093218d..00000000
--- a/ldap/cm/unixstrip.pl
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-use File::Find;
-
-#
-# usage: unixstrip.pl [ directory ... ] [ shlibsign ]
-#
-# if no arguments are passed, strip files under the current directory.
-#
-# if 1 argument is passed, strip files under the given directory.
-#
-# if 2 or more arguments are passed,
-#   the last argument is considered the path to nss utility shlibsign (NSS3.9~),
-#   the preceding args are directories, under which files are to be stripped.
-#   And nss libraries libsoftokn3, libfreebl_pure32_3, libfreebl_hybrid_3
-#   are to be checksum'ed with shlibsign.
-
-my $SHLIBSIGN = "";
-if (@ARGV > 1) {
-    $SHLIBSIGN = $ARGV[$#ARGV];
-    print STDERR "set $SHLIBSIGN \n";
-    for (my $i = 0; $i < $#ARGV; $i++)
-    {
-        print STDERR "args[$i]: $ARGV[$i]\n";
-        find(\&find_cb, $ARGV[$i]);
-    }
-} elsif (@ARGV == 1) {
-    find(\&find_cb, @ARGV);
-} else {
-    find(\&find_cb, '.');
-}
-
-sub find_cb {
-    return if (! -f $_);  # only look at plain files
-    return if (! -B $_);  # skip text files
-    return if (/\.jpg$/); # skip jpg files
-    return if (/\.gif$/); # skip gif files
-    return if (/\.jar$/); # skip jar files
-    return if (/\.zip$/); # skip zip files
-    return if (/\.gz$/);  # skip gzip files
-    return if (/\.chk$/); # skip chk files
-    print STDERR "about to strip $_ .\n";
-    system("strip $_");
-    print STDERR "strip $_ done.\n";
-    if ($SHLIBSIGN ne "" && /libsoftokn3|libfreebl_pure32_3|libfreebl_hybrid_3/)
-    {
-        print STDERR "$SHLIBSIGN $_\n";
-        system("$SHLIBSIGN -v -i $_");
-    }
-}
-
-exit 0;
diff --git a/ldap/cm/v1confs/ns-calendar-globopt.conf b/ldap/cm/v1confs/ns-calendar-globopt.conf
deleted file mode 100644
index 0c5de21f..00000000
--- a/ldap/cm/v1confs/ns-calendar-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index   nsCalXItemId    pres,eq,sub
-
diff --git a/ldap/cm/v1confs/ns-calendar-schema.conf b/ldap/cm/v1confs/ns-calendar-schema.conf
deleted file mode 100644
index e7e3c775..00000000
--- a/ldap/cm/v1confs/ns-calendar-schema.conf
+++ /dev/null
@@ -1,163 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute       generationQualifier             cis
-attribute       nsCalAccess                     cis
-attribute       nsCalAccessDomain               cis
-attribute       nsCalAdmd                       cis
-attribute       nsCalDefaultNoteReminder        cis
-attribute       nsCalDefaultReminder            cis
-attribute       nsCalDefaultTaskReminder        cis
-attribute       nsCalDisplayPrefs               cis
-attribute       nsCalFlags                      cis
-attribute       nsCalHost                       cis
-attribute       nsCalLanguageId                 cis
-attribute       nsCalNodeAlias                  cis
-attribute       nsCalNotifMechanism             cis
-attribute       nsCalOperatingPrefs             cis
-attribute       nsCalOrgUnit2                   cis
-attribute       nsCalOrgUnit3                   cis
-attribute       nsCalOrgUnit4                   cis
-attribute       nsCalPasswordRequired           cis
-attribute       nsCalPrmd                       cis
-attribute       nsCalRefreshPrefs               cis
-attribute       nsCalResourceCapacity           cis
-attribute       nsCalResourceNumber             cis
-attribute       nsCalServerVersion              cis
-attribute       nsCalSysopCanWritePassword      cis
-attribute       nsCalTimezone                   cis
-attribute       nsCalXItemId                    cis
-
-
-objectclass nsCalUser
-        requires
-                objectClass
-        allows
-                generationQualifier,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalRefreshPrefs,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass nsCalAdmin
-        requires
-                objectClass
-        allows
-                cn,
-                facsimileTelephoneNumber,
-                generationQualifier,
-                givenName,
-                initials,
-                ou,
-                postalAddress,
-                sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalXItemId
-
-objectclass nsCalResource
-        requires
-                objectClass
-        allows
-                cn,
-                facsimileTelephoneNumber,
-                postalAddress,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalPasswordRequired,
-                nsCalRefreshPrefs,
-                nsCalResourceCapacity,
-                nsCalResourceNumber,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass netscapeCalendarServer
-        requires
-                objectclass
-
-
diff --git a/ldap/cm/v1confs/ns-certificate-globopt.conf b/ldap/cm/v1confs/ns-certificate-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v1confs/ns-certificate-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v1confs/ns-certificate-schema.conf b/ldap/cm/v1confs/ns-certificate-schema.conf
deleted file mode 100644
index 2ea091af..00000000
--- a/ldap/cm/v1confs/ns-certificate-schema.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeCertificateServer
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v1confs/ns-compass-globopt.conf b/ldap/cm/v1confs/ns-compass-globopt.conf
deleted file mode 100644
index 6c56c350..00000000
--- a/ldap/cm/v1confs/ns-compass-globopt.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	pipuid			pres,eq,sub
-index	pipstatus		eq
-
diff --git a/ldap/cm/v1confs/ns-compass-schema.conf b/ldap/cm/v1confs/ns-compass-schema.conf
deleted file mode 100644
index 7a6d9d4f..00000000
--- a/ldap/cm/v1confs/ns-compass-schema.conf
+++ /dev/null
@@ -1,201 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-
-# Compass server specific (not currently used) 
-
-objectclass netscapeCompassServer
-        requires        
-                objectclass
-
-
-# Attributes for personal interest profile classes
-
-attribute	pipuid			cis
-attribute	pipcompassservers	cis
-attribute	pipuniqueid		cis
-attribute	pipstatus		cis
-attribute	pipusertype		cis
-attribute	pipfrequency		cis
-attribute	pipmedium		cis
-attribute	pipformat		cis
-attribute	piphour			cis
-attribute	pipmaxhits		cis
-attribute	pipresultset		cis
-attribute	pipsortorder		cis
-attribute	piptimestamp		cis
-attribute	pipirlist		cis
-attribute	pipiroption		cis
-attribute	pippwp			cis
-attribute	piplastcount		cis
-attribute	piptotalcount		cis
-attribute	piptotalrun		cis
-attribute	pipnotify		cis
-attribute	pipprivilege		cis
-attribute	pipgroup		cis
-attribute	pipidstcount		cis
-attribute	pipstid			cis
-attribute	pipstname		cis
-attribute	pipstquery		cis
-attribute	pipsttaxonomy		cis
-attribute	pipstinterest		cis
-attribute	pipsttype		cis
-attribute	pipstprivacy		cis
-attribute	pipststatus		cis
-attribute	pipstlastcount		cis
-attribute	pipsttotalcount		cis
-attribute	pipsttotalrun		cis
-attribute	pipstcategory		cis
-attribute	pipstfrequency		cis
-attribute	pipstmedium		cis
-attribute	pipstformat		cis
-attribute	pipsthour		cis
-attribute	pipstmaxhits		cis
-attribute	pipstresultset		cis
-attribute	pipstsortorder		cis
-attribute	pipsttimestamp		cis
-attribute	pipstirlist		cis
-attribute	pipstiroption		cis
-attribute	pipreservedcis1		cis
-attribute	pipreservedcis2		cis
-attribute	pipreservedcis3		cis
-attribute	pipreservedcis4		cis
-attribute	pipreservedcis5		cis
-attribute	pipreservedcis6		cis
-attribute	pipreservedces1		ces
-attribute	pipreservedces2		ces
-attribute	pipreservedces3		ces
-
-
-# Each interest profile is one of these and sits under the compass SIE
-
-objectclass personalInterestProfile 
-        requires        
-                objectclass,
-		pipuid
-	allows
-		pipuniqueid,
-		pipstatus,
-		pipusertype,
-		pipfrequency,
-		pipmedium,
-		pipformat,
-		piphour,
-		pipmaxhits,
-		pipresultset,
-		pipsortorder,
-		piptimestamp,
-		pipirlist,
-		pipiroption,
-		pippwp,
-		piplastcount,
-		piptotalcount,
-		piptotalrun,
-		pipnotify,
-		pipprivilege,
-		pipgroup,
-		pipidstcount,
-		pipstid,
-		pipstname,
-		pipstquery,
-		pipsttaxonomy,
-		pipstinterest,
-		pipsttype,
-		pipstprivacy,
-		pipststatus,
-		pipstlastcount,
-		pipsttotalcount,
-		pipsttotalrun,
-		pipstcategory,
-		pipstfrequency,
-		pipstmedium,
-		pipstformat,
-		pipsthour,
-		pipstmaxhits,
-		pipstresultset,
-		pipstsortorder,
-		pipsttimestamp,
-		pipstirlist,
-		pipstiroption,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
-
-# Replication of user info for template users, completeness, etc.
-# (not currently used)
-
-objectclass PIPUserInfo
-        requires        
-                objectclass
-	allows
-		cn,
-		mail,
-		userPassword,
-		description,
-		pipcompassservers,
-		pipuniqueid
-
-
-# Enhancements to a normal user entry (not currently used)
-
-objectclass PIPUser
-        requires        
-                objectclass
-	allows
-		pipuniqueid,
-		pipcompassservers,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
diff --git a/ldap/cm/v1confs/ns-directory-globopt.conf b/ldap/cm/v1confs/ns-directory-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v1confs/ns-directory-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v1confs/ns-directory-schema.conf b/ldap/cm/v1confs/ns-directory-schema.conf
deleted file mode 100644
index 952a205e..00000000
--- a/ldap/cm/v1confs/ns-directory-schema.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeDirectoryServer
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v1confs/ns-mail-globopt.conf b/ldap/cm/v1confs/ns-mail-globopt.conf
deleted file mode 100644
index 5c1075d9..00000000
--- a/ldap/cm/v1confs/ns-mail-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	uid,mail,mailAlternateAddress,mailHost	eq
-index	uniquemember,member	eq
diff --git a/ldap/cm/v1confs/ns-mail-schema.conf b/ldap/cm/v1confs/ns-mail-schema.conf
deleted file mode 100644
index 35a103e8..00000000
--- a/ldap/cm/v1confs/ns-mail-schema.conf
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-attribute	mailAccessDomain	2.16.840.1.113730.3.1.12 cis
-attribute	mailAlternateAddress	2.16.840.1.113730.3.1.13 cis
-attribute	mailAutoReplyMode	2.16.840.1.113730.3.1.14 cis
-attribute	mailAutoReplyText	2.16.840.1.113730.3.1.15 cis
-attribute	mailDeliveryOption	2.16.840.1.113730.3.1.16 cis
-attribute	mailForwardingAddress	2.16.840.1.113730.3.1.17 cis
-attribute	mailHost		2.16.840.1.113730.3.1.18 cis
-attribute	mailQuota		2.16.840.1.113730.3.1.21 cis
-attribute	mailRoutingAddress		2.16.840.1.113730.3.1.47 cis
-
-attribute	mailMessageStore	2.16.840.1.113730.3.1.19 ces
-attribute	mailProgramDeliveryInfo	2.16.840.1.113730.3.1.20 ces
-
-objectClass mailRecipient
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAccessDomain,
-		mailAlternateAddress,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailHost,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota,
-		mailRoutingAddress,
-		multiLineDescription,
-		uid,
-		userPassword
-
-attribute	mgrpAllowedDomain	2.16.840.1.113730.3.1.23 cis
-attribute	mgrpMsgRejectAction	2.16.840.1.113730.3.1.28 cis
-attribute	mgrpRFC822MailMember	2.16.840.1.113730.3.1.30 cis
-attribute	mgrpMsgMaxSize		2.16.840.1.113730.3.1.32 cis
-
-attribute	mgrpAllowedBroadcaster	2.16.840.1.113730.3.1.22 ces
-attribute	mgrpDeliverTo		2.16.840.1.113730.3.1.25 ces
-attribute	mgrpErrorsTo		2.16.840.1.113730.3.1.26 ces
-attribute	mgrpModerator		2.16.840.1.113730.3.1.33 ces
-attribute	mgrpMsgRejectText	2.16.840.1.113730.3.1.29 ces
-
-#attribute	groupPassword		2.16.840.1.113730.3.1.27 bin
-
-objectClass mailGroup
-	requires
-		objectClass,
-		mail
-	allows
-		cn,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mgrpAllowedBroadcaster,
-		mgrpAllowedDomain,
-		mgrpDeliverTo,
-		mgrpErrorsTo,
-		mgrpModerator,
-		mgrpMsgMaxSize,
-		mgrpMsgRejectAction,
-		mgrpMsgRejectText,
-		mgrpRFC822MailMember,
-		owner
-
-attribute	mailEnhancedUniqueMember	2.16.840.1.113730.3.1.31 dn
-
-objectClass groupOfMailEnhancedUniqueNames
-	requires
-		objectClass,
-		cn
-	allows
-		businessCategory,
-		description,
-		mailEnhancedUniqueMember,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectClass	netscapeMailServer
-	requires
-		objectClass
diff --git a/ldap/cm/v1confs/ns-media-globopt.conf b/ldap/cm/v1confs/ns-media-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v1confs/ns-media-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v1confs/ns-media-schema.conf b/ldap/cm/v1confs/ns-media-schema.conf
deleted file mode 100644
index a52bd5b5..00000000
--- a/ldap/cm/v1confs/ns-media-schema.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeMediaServer
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v1confs/ns-news-globopt.conf b/ldap/cm/v1confs/ns-news-globopt.conf
deleted file mode 100644
index 46dd80f7..00000000
--- a/ldap/cm/v1confs/ns-news-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	uniquemember,member	eq
-
diff --git a/ldap/cm/v1confs/ns-news-schema.conf b/ldap/cm/v1confs/ns-news-schema.conf
deleted file mode 100644
index 33b19bfb..00000000
--- a/ldap/cm/v1confs/ns-news-schema.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-attribute nsnewsACL cis 
-attribute nsaclrole cis 
-attribute nsprettyname cis 
-attribute nsflags cis 
-attribute nscreator cis 
-
-attribute ngcomponent dn  
-
-objectclass nginfo 
-	requires 
-		objectClass, 
-		ngcomponent 
-	allows 
-		nsnewsACL,  
-		subtreeACI, 
-		description,  
-		nsaclrole,  
-		nsprettyname, 
-		nsflags, 
-		nscreator 
-
-objectClass	netscapeNewsServer
-	requires
-		objectClass
-
diff --git a/ldap/cm/v1confs/ns-proxy-globopt.conf b/ldap/cm/v1confs/ns-proxy-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v1confs/ns-proxy-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v1confs/ns-proxy-schema.conf b/ldap/cm/v1confs/ns-proxy-schema.conf
deleted file mode 100644
index aef68f1d..00000000
--- a/ldap/cm/v1confs/ns-proxy-schema.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeProxyServer
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v1confs/ns-web-globopt.conf b/ldap/cm/v1confs/ns-web-globopt.conf
deleted file mode 100644
index 46dd80f7..00000000
--- a/ldap/cm/v1confs/ns-web-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	uniquemember,member	eq
-
diff --git a/ldap/cm/v1confs/ns-web-schema.conf b/ldap/cm/v1confs/ns-web-schema.conf
deleted file mode 100644
index 72c7ad91..00000000
--- a/ldap/cm/v1confs/ns-web-schema.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeWebServer
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v1confs/slapd.at.conf b/ldap/cm/v1confs/slapd.at.conf
deleted file mode 100644
index c7f9655a..00000000
--- a/ldap/cm/v1confs/slapd.at.conf
+++ /dev/null
@@ -1,308 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# slapd.at.conf
-# 
-attribute	abstract				cis
-attribute	ad	addmdname			cis
-attribute	affiliationcode				cis
-attribute	ambiance				cis
-attribute	ansiorgnumericcode			cis
-attribute	appearance				cis
-attribute	associateddomain			cis
-attribute	authorcn	documentauthorcommonname	cis
-attribute	authorsn	documentauthorsurname		cis
-attribute	automgt	automatedmanagement			cis
-attribute	average-price				cis
-attribute	buildingname				cis
-attribute	businesscategory			cis
-attribute	c	countryname			cis
-attribute	carlicense				cis
-attribute	category				cis
-attribute	changelogmaximumage			cis
-attribute	changelogmaximumsize			cis
-attribute	citation				cis
-attribute	classstanding				cis
-attribute	closed					cis
-attribute	cn	commonname			cis
-attribute	cnamerecord				cis
-attribute	co	friendlycountryname		cis
-attribute	colordepth				cis
-attribute	copyright				cis
-attribute	creditcardsaccepted			cis
-attribute	dc	domaincomponent			cis
-attribute	departmentnumber			cis
-attribute	description				cis
-attribute	destinationindicator			cis
-attribute	dnsrecord				cis
-attribute	documentidentifier			cis
-attribute	documentlocation			cis
-attribute	documentpublisher			cis
-attribute	documentseriestitle			cis
-attribute	documentstore				cis
-attribute	documenttitle				cis
-attribute	documenttitle				cis
-attribute	documentversion				cis
-attribute	donotdelete				cis
-attribute	donotmove				cis
-attribute	drink	favouritedrink			cis
-attribute	employeenumber				cis
-attribute	employeetype				cis
-attribute	expire					cis
-attribute	fileformat				cis
-attribute	filesize				cis
-attribute	fips55	fipsplacenumericcode		cis
-attribute	fipscountynumericcode			cis
-attribute	fipsstatealphacode			cis
-attribute	fipsstatenumericcode			cis
-attribute	givenname				cis
-attribute	height					cis
-attribute	homepostaladdress			cis
-attribute	host					cis
-attribute	hoursofoperation			cis
-attribute	info					cis
-attribute	initials				cis
-attribute	janetmailbox				cis
-attribute	joinable				cis
-attribute	keepnames				cis
-attribute	keywords				cis
-attribute	knowledgeinformation			cis
-attribute	kosher					cis
-attribute	krbname					cis
-attribute	l	localityname			cis
-attribute	lastmodifiedtime			cis
-attribute	mail	rfc822mailbox			cis
-attribute	mailpreferenceoption			cis
-attribute	max-price				cis
-attribute	maximuminparty				cis
-attribute	min-price				cis
-attribute	moderator				cis
-attribute	multilineabstract			cis
-attribute	multilinedescription			cis
-attribute	music					cis
-attribute	mxrecord				cis
-attribute	nobatchupdates				cis
-attribute	notice					cis
-attribute	notrecommended				cis
-attribute	notregistered				cis
-attribute	nsrecord				cis
-attribute	o	organizationname		cis
-attribute	objectclass				cis
-attribute	onvacation				cis
-attribute	organizationalstatus			cis
-attribute	othermailbox				cis
-attribute	ou	organizationalunitname		cis
-attribute	outdoorseating				cis
-attribute	parking					cis
-attribute	personaltitle				cis
-attribute	physicaldeliveryofficename		cis
-attribute	platform				cis
-attribute	postaladdress				cis
-attribute	postalcode				cis
-attribute	postofficebox				cis
-attribute	predominantcolor			cis
-attribute	preferreddeliverymethod			cis
-attribute	product					cis
-attribute	provider				cis
-attribute	qualityofservice			cis
-attribute	qualitypriceratio			cis
-attribute	ratingdescription			cis
-attribute	ratingtime				cis
-attribute	recommended				cis
-attribute	recommendedby				cis
-attribute	registeredaddress			cis
-attribute	registeredaddress			cis
-attribute	registrationstatus			cis
-attribute	replicahost				cis
-attribute	replicaport				cis
-attribute	replicaupdatefailedat			cis
-attribute	replicaupdatereplayed			cis
-attribute	replicaupdateschedule			cis
-attribute	replicabindmethod			cis
-attribute	replicausessl				cis
-attribute	reservation				cis
-attribute	resolution				cis
-attribute	rfc822errorsto				cis
-attribute	rfc822requeststo			cis
-attribute	roomnumber				cis
-attribute	serialnumber				cis
-attribute	servicearea				cis
-attribute	servicerating				cis
-attribute	servicespeed				cis
-attribute	sn	surname				cis
-attribute	soarecord				cis
-attribute	specialty				cis
-attribute	st	stateorprovincename		cis
-attribute	street	streetAddress			cis
-attribute	subject					cis
-attribute	supplementaryinformation		cis
-attribute	supportedapplicationcontext		cis
-attribute	supportedapplicationcontext		cis
-attribute	suppressnoemailerror			cis
-attribute	taux-de-frequentation			cis
-attribute	telexnumber				cis
-attribute	textencodedoraddress			cis
-attribute	title					cis
-attribute	transportationmeans			cis
-attribute	ttl	timetolive			cis
-attribute	uid					cis
-attribute	universityid				cis
-attribute	uniqueidentifier			cis
-attribute	updatesource				cis
-attribute	userclass				cis
-attribute	vacationmessage				cis
-attribute	width					cis
-
-attribute	aci					bin
-attribute	audio					bin
-attribute	authorityrevocationlist;binary		bin
-attribute	authorityrevocationlist			bin
-attribute	cacertificate;binary			bin
-attribute	cacertificate				bin
-attribute	certificate;binary			bin
-attribute	certificate				bin
-attribute	certificaterevocationlist;binary	bin
-attribute	certificaterevocationlist		bin
-attribute	crosscertificatepair;binary		bin
-attribute	crosscertificatepair			bin
-attribute	jpegphoto				bin
-attribute	personalsignature			bin
-attribute	personalsignature			bin
-attribute	photo					bin
-attribute	usercertificate;binary			bin
-attribute	usercertificate				bin
-attribute	x500uniqueidentifier			bin
-attribute	userpassword				bin
-attribute	replicacredentials			bin
-
-attribute	generation				ces
-attribute	internationalisdnnumber			ces
-attribute	labeleduri	labeledurl		ces
-attribute	nadfsearchguide				ces
-attribute	presentationaddress			ces
-attribute	searchguide				ces
-attribute	subtreeaci				ces
-attribute	x121address				ces
-
-attribute	facsimiletelephonenumber	fax	tel
-attribute	homephone				tel
-attribute	mobile	mobiletelephonenumber		tel
-attribute	pager	pagertelephonenumber		tel
-attribute	telephonenumber				tel
-
-attribute	aliasedobjectname			dn
-attribute	aliasedobjectname			dn
-attribute	associatedname				dn
-attribute	dependentupon				dn
-attribute	ditredirect				dn
-attribute	dn					dn
-attribute	documentauthor				dn
-attribute	documentauthor				dn
-attribute	documentavailable			dn
-attribute	errorsto				dn
-attribute	errorsto				dn
-attribute	imagefiles				dn
-attribute	lastmodifiedby				dn
-attribute	manager					dn
-attribute	member					dn
-attribute	memberofgroup				dn
-attribute	naminglink				dn
-attribute	naminglink				dn
-attribute	obsoletedbydocument			dn
-attribute	obsoletesdocument			dn
-attribute	owner					dn
-attribute	proxy					dn
-attribute	reciprocalnaminglink			dn
-attribute	reciprocalnaminglink			dn
-attribute	replicaroot				dn
-attribute	replicabinddn				dn
-attribute	requeststo				dn
-attribute	roleoccupant				dn
-attribute	secretary				dn
-attribute	seealso					dn
-attribute	uniqueMember				dn
-attribute	updatedbydocument			dn
-attribute	updatesdocument				dn
-
-attribute	ntUserDomainId				cis
-attribute	ntUserPriv					bin
-attribute	ntUserHomeDir				cis
-attribute   ntUserComment				cis
-attribute   ntUserFlags					bin
-attribute   ntUserScriptPath			cis
-attribute   ntUserAuthFlags				bin
-attribute   ntUserUsrComment			cis
-attribute   ntUserParms					cis
-attribute   ntUserWorkstations			cis
-attribute   ntUserLastLogon				cis
-attribute   ntUserLastLogoff			cis
-attribute   ntUserAcctExpires			cis
-attribute   ntUserMaxStorage			bin
-attribute   ntUserUnitsPerWeek			bin
-attribute   ntUserLogonHours			bin
-attribute   ntUserBadPwCount			bin
-attribute   ntUserNumLogons				bin
-attribute   ntUserLogonServer			cis
-attribute   ntUserCountryCode			cis
-attribute   ntUserCodePage				bin
-attribute   ntUserUniqueId				bin
-attribute   ntUserPrimaryGroupId		bin
-attribute   ntUserProfile				cis
-attribute   ntUserHomeDirDrive			cis
-attribute   ntUserPasswordExpired		bin
-attribute   ntUserCreateNewAccount		cis
-attribute   ntUserDeleteAccount			cis
-
-# attributes below added for Netscape Directory Server 1.02
-
-attribute	serverRoot					cis
-attribute	serverProductName			cis
-attribute	serverVersionNumber			cis
-attribute	installationTimeStamp		cis
-attribute	administratorContactInfo	cis
-attribute	adminURL					ces
-attribute	serverHostName			cis
-
-attribute	nsLicensedFor				cis
-attribute	nsLicenseStartTime			cis
-attribute	nsLicenseEndTime			cis
-
-attribute	preferredlanguage			cis
-attribute	usersmimecertificate;binary		bin
diff --git a/ldap/cm/v1confs/slapd.oc.conf b/ldap/cm/v1confs/slapd.oc.conf
deleted file mode 100644
index 649def18..00000000
--- a/ldap/cm/v1confs/slapd.oc.conf
+++ /dev/null
@@ -1,1109 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# slapd.oc.conf
-#
-objectclass top
-	requires
-		objectClass
-
-objectclass alias
-	requires
-		aliasedObjectName,
-		objectClass
-
-objectclass country
-	requires
-		objectClass,
-		c
-	allows
-		searchGuide,
-		description
-
-objectclass locality
-	requires
-		objectClass
-	allows
-		description,
-		l,
-		searchGuide,
-		seeAlso,
-		st,
-		street
-
-objectclass organization
-	requires
-		objectClass,
-		o
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass organizationalUnit
-	requires
-		objectClass,
-		ou
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass person
-	requires
-		objectClass,
-		sn,
-		cn
-	allows
-		description,
-		seeAlso,
-		telephoneNumber,
-		userPassword
-
-objectclass organizationalPerson
-	requires
-		objectClass,
-		sn,
-		cn
-	allows
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		title,
-		userPassword,
-		x121Address
-
-objectclass inetOrgPerson
-	requires
-		objectClass,
-		sn,
-                cn 
-	allows
-		audio,
-		businessCategory,
-		carLicense,
-		departmentNumber,
-		description,
-		destinationIndicator,
-		employeeType,
-		employeeNumber,
-		facsimileTelephoneNumber,
-		givenName,
-		homePhone,
-		homePostalAddress,
-		initials,
-		internationaliSDNNumber,
-		jpegPhoto,
-		l,
-		labeledURI,
-		ou,
-		manager,
-		mobile,
-		pager,
-		photo,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		preferredLanguage,
-		registeredAddress,
-		mail,
-		roomNumber,
-		secretary,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		title,
-		uid,
-		x500uniqueIdentifier,
-		userPassword,
-		userCertificate,
-		userCertificate;binary,
-		userSMimeCertificate;binary,
-		x121Address
- 
-objectclass ntUser
-	requires
-		objectClass,
-		ntUserDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntUserPriv,
-		ntUserHomeDir,
-		ntUserComment,
-		ntUserFlags,
-		ntUserScriptPath,
-		ntUserAuthFlags,
-		ntUserUsrComment,
-		ntUserParms,
-		ntUserWorkstations,
-		ntUserLastLogon,
-		ntUserLastLogoff,
-		ntUserAcctExpires,
-		ntUserMaxStorage,
-		ntUserUnitsPerWeek,
-		ntUserLogonHours,
-		ntUserBadPwCount,
-		ntUserNumLogons,
-		ntUserLogonServer,
-		ntUserCountryCode,
-		ntUserCodePage,
-		ntUserUniqueId,
-		ntUserPrimaryGroupId,
-		ntUserProfile,
-		ntUserHomeDirDrive,
-		ntUserPasswordExpired,
-		ntUserCreateNewAccount,
-		ntUserDeleteAccount
-
-objectclass organizationalRole
-	requires
-		objectClass,
-		cn
-	allows
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		roleOccupant,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass groupOfNames
-	requires
-		objectClass,
-		cn
-	allows
-		member,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfUniqueNames
-	requires
-		objectClass,
-		cn
-	allows
-		uniqueMember,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass residentialPerson
-	requires
-		objectClass,
-		sn,
-		cn,
-		l
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass applicationProcess
-	requires
-		objectClass,
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso
-
-objectclass LDAPServer
-	requires
-		objectClass,
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		generation,
-		changeLogMaximumAge,
-		changeLogMaximumSize
-
-objectclass LDAPReplica
-	requires
-		objectClass,
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		replicaRoot,
-		replicaHost,
-		replicaPort,
-		replicaBinddn,
-		replicaCredentials,
-		replicaBindMethod,
-		replicaUseSSL,
-		replicaUpdateSchedule,
-		replicaUpdateReplayed,
-		replicaUpdateFailedAt
-
-objectclass applicationEntity
-	requires
-		objectClass,
-		presentationAddress,
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		supportedApplicationContext
-
-objectclass dSA
-	requires
-		objectClass,
-		presentationAddress,
-		cn
-	allows
-		knowledgeInformation
-
-objectclass device
-	requires
-		objectClass,
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-objectclass strongAuthenticationUser
-	requires
-		objectClass,
-		userCertificate,
-		userCertificate;binary
-
-objectclass certificationAuthority
-	requires
-		objectClass,
-		cACertificate;binary
-	allows
-		authorityRevocationList;binary,
-		certificateRevocationList;binary,
-		crossCertificatePair;binary
-
-objectclass pilotObject
-	requires
-		objectClass
-	allows
-		audio,
-		dITRedirect,
-		info,
-		jpegPhoto,
-		lastModifiedBy,
-		lastModifiedTime,
-		manager,
-		photo,
-		uniqueIdentifier
-
-objectclass newPilotPerson
-	requires
-		objectClass,
-		sn,
-		cn
-	allows
-		businessCategory,
-		description,
-		drink,
-		homePhone,
-		homePostalAddress,
-		janetMailbox,
-		mail,
-		mailPreferenceOption,
-		mobile,
-		organizationalStatus,
-		otherMailbox,
-		pager,
-		personalSignature,
-		personalTitle,
-		preferredDeliveryMethod,
-		roomNumber,
-		secretary,
-		seeAlso,
-		telephoneNumber,
-		textEncodedORaddress,
-		uid,
-		userClass,
-		userPassword
-
-objectclass account
-	requires
-		objectClass,
-		uid
-	allows
-		description,
-		host,
-		l,
-		o,
-		ou,
-		seeAlso
-
-objectclass document
-	requires
-		objectClass,
-		documentIdentifier
-	allows
-		abstract,
-		audio,
-		authorCN,
-		authorSN,
-		cn,
-		dITRedirect,
-		description,
-		documentAuthor,
-		documentLocation,
-		documentPublisher,
-		documentStore,
-		documentTitle,
-		documentVersion,
-		info,
-		jpegPhoto,
-		keywords,
-		l,
-		lastModifiedBy,
-		lastModifiedTime,
-		manager,
-		o,
-		obsoletedByDocument,
-		obsoletesDocument,
-		ou,
-		photo,
-		seeAlso,
-		subject,
-		uniqueIdentifier,
-		updatedByDocument,
-		updatesDocument
-
-objectclass room
-	requires
-		objectClass,
-		cn
-	allows
-		description,
-		roomNumber,
-		seeAlso,
-		telephoneNumber
-
-objectclass documentSeries
-	requires
-		objectClass,
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		telephoneNumber
-
-objectclass domain
-	requires
-		objectClass,
-		dc
-	allows
-		associatedName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		manager,
-		o,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass RFC822localPart
-	requires
-		objectClass,
-		dc
-	allows
-		associatedName,
-		businessCategory,
-		cn,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		o,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		sn,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass DNSDomain
-	requires
-		objectClass,
-		dc
-	allows
-		associatedName,
-		businessCategory,
-		dNSRecord,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		o,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass domainRelatedObject
-	requires
-		objectClass,
-		associatedDomain
-
-objectclass friendlyCountry
-	requires
-		objectClass,
-		c,
-		co
-	allows
-		description,
-		searchGuide
-
-objectclass simpleSecurityObject
-	requires
-		objectClass,
-		userPassword
-
-objectclass pilotOrganization
-	requires
-		objectClass,
-		ou,
-		o
-	allows
-		buildingName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass nadfObject
-	requires
-		objectClass
-	allows
-		lastModifiedTime,
-		nadfSearchGuide,
-		supplementaryInformation
-
-objectclass usStateOrEquivalent
-	requires
-		objectClass,
-		st,
-		fipsStateAlphaCode,
-		fipsStateNumericCode,
-		l
-	allows
-		description,
-		lastModifiedTime,
-		nadfSearchGuide,
-		searchGuide,
-		seeAlso,
-		street,
-		supplementaryInformation
-
-objectclass usPlace
-	requires
-		objectClass,
-		fips55,
-		l
-	allows
-		description,
-		lastModifiedTime,
-		nadfSearchGuide,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		supplementaryInformation
-
-objectclass usCountyOrEquivalent
-	requires
-		objectClass,
-		fipsCountyNumericCode,
-		fips55,
-		l
-	allows
-		description,
-		lastModifiedTime,
-		nadfSearchGuide,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		supplementaryInformation
-
-objectclass ansiOrgObject
-	requires
-		objectClass,
-		ansiOrgNumericCode
-
-objectclass nadfApplicationEntity
-	requires
-		objectClass,
-		supportedApplicationContext,
-		presentationAddress,
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		supportedApplicationContext
-
-objectclass nadfADDMD
-	requires
-		objectClass,
-		ad
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		lastModifiedTime,
-		nadfSearchGuide,
-		o,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		supplementaryInformation,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass publicObject
-	requires
-		objectClass,
-		namingLink
-
-objectclass providerObject
-	requires
-		objectClass,
-		reciprocalNamingLink
-
-objectclass nationalObject
-	requires
-		objectClass,
-		c
-
-objectclass fips55Object
-	requires
-		objectClass,
-		fips55
-	allows
-		st
-
-objectclass restaurant
-	requires
-		objectClass,
-		description,
-		telephoneNumber,
-		street
-	allows
-		Ambiance,
-		Appearance,
-		Average-price,
-		Closed,
-		CreditCardsAccepted,
-		Kosher,
-		Max-price,
-		MaximumInParty,
-		Min-price,
-		Music,
-		NotRecommended,
-		OutdoorSeating,
-		Parking,
-		QualityOfService,
-		QualityPriceRatio,
-		Recommended,
-		RecommendedBy,
-		Reservation,
-		ServiceSpeed,
-		Specialty,
-		Taux-de-frequentation,
-		TransportationMeans,
-		facsimileTelephoneNumber,
-		postalAddress
-
-objectclass kerberosSecurityObject
-	requires
-		objectClass,
-		krbName
-
-objectclass umichPerson
-	requires
-		objectClass,
-		sn,
-		cn,
-		universityID
-	allows
-		affiliationCode,
-		audio,
-		businessCategory,
-		classStanding,
-		description,
-		destinationIndicator,
-		doNotDelete,
-		doNotMove,
-		drink,
-		expire,
-		facsimileTelephoneNumber,
-		homePhone,
-		homePostalAddress,
-		internationaliSDNNumber,
-		janetMailbox,
-		jpegPhoto,
-		keepNames,
-		krbName,
-		l,
-		labeledURI,
-		mail,
-		mailPreferenceOption,
-		memberOfGroup,
-		mobile,
-		multiLineDescription,
-		noBatchUpdates,
-		notRegistered,
-		notice,
-		onVacation,
-		organizationalStatus,
-		otherMailbox,
-		ou,
-		pager,
-		personalSignature,
-		personalTitle,
-		photo,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		proxy,
-		registeredAddress,
-		registrationStatus,
-		roomNumber,
-		secretary,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		textEncodedORaddress,
-		title,
-		uid,
-		updateSource,
-		userCertificate,
-		userCertificate;binary,
-		userClass,
-		userPassword,
-		vacationMessage,
-		x121Address,
-		xacl
-
-objectclass rfc822MailGroup
-	requires
-		objectClass,
-		owner,
-		cn
-	allows
-		associatedDomain,
-		autoMgt,
-		description,
-		destinationIndicator,
-		errorsTo,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		joinable,
-		krbName,
-		labeledURI,
-		mail,
-		member,
-		memberOfGroup,
-		moderator,
-		multiLineDescription,
-		notice,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		requestsTo,
-		rfc822ErrorsTo,
-		rfc822RequestsTo,
-		seeAlso,
-		street,
-		suppressNoEmailError,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address,
-		xacl
-
-objectclass image
-	requires
-		objectClass,
-		cn
-	allows
-		citation,
-		copyright,
-		imageFiles,
-		jpegPhoto,
-		keywords,
-		multiLineDescription,
-		owner,
-		predominantColor
-
-objectclass imageFile
-	requires
-		objectClass,
-		cn
-	allows
-		colorDepth,
-		documentLocation,
-		fileFormat,
-		fileSize,
-		height,
-		resolution,
-		seeAlso,
-		width
-
-objectclass service
-	requires
-		objectClass,
-		cn
-	allows
-		category,
-		dependentUpon,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		hoursOfOperation,
-		internationaliSDNNumber,
-		jpegPhoto,
-		keywords,
-		labeledURI,
-		mail,
-		multiLineDescription,
-		owner,
-		physicalDeliveryOfficeName,
-		platform,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		product,
-		provider,
-		ratingDescription,
-		ratingTime,
-		registeredAddress,
-		seeAlso,
-		serviceArea,
-		serviceRating,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass umichDocument
-	requires
-		objectClass,
-		documentIdentifier
-	allows
-		abstract,
-		audio,
-		authorCN,
-		authorSN,
-		category,
-		cn,
-		dITRedirect,
-		description,
-		documentAuthor,
-		documentAvailable,
-		documentLocation,
-		documentPublisher,
-		documentSeriesTitle,
-		documentStore,
-		documentTitle,
-		documentVersion,
-		info,
-		jpegPhoto,
-		keywords,
-		l,
-		labeledURI,
-		lastModifiedBy,
-		lastModifiedTime,
-		manager,
-		multiLineAbstract,
-		o,
-		obsoletedByDocument,
-		obsoletesDocument,
-		ou,
-		owner,
-		photo,
-		platform,
-		product,
-		seeAlso,
-		serviceArea,
-		subject,
-		uniqueIdentifier,
-		updatedByDocument,
-		updatesDocument
-
-objectclass documentDescription
-	requires
-		objectClass,
-		cn
-	allows
-		labeledURI,
-		multiLineDescription,
-		owner
-
-objectclass labeledURIObject
-	requires
-		objectClass
-	allows
-		labeledURI
-
-objectclass cacheObject
-	requires
-		objectClass
-	allows
-		ttl
-
-# objectclasses below added for Netscape Directory Server 1.02
-
-objectclass netscapeServer 
-	requires 
-		objectClass,
-		cn 
-	allows 
-		description,
-		serverRoot,
-		serverProductName,
-		serverVersionNumber,
-		installationTimeStamp,
-		administratorContactInfo,
-		userpassword,
-		adminURL,
-		serverHostName
-
-objectclass nsLicenseUser
-	requires
-		objectClass
-	allows
-		nsLicensedFor,
-		nsLicenseStartTime,
-		nsLicenseEndTime
diff --git a/ldap/cm/v3confs/ns-calendar-globopt.conf b/ldap/cm/v3confs/ns-calendar-globopt.conf
deleted file mode 100644
index 9b49a483..00000000
--- a/ldap/cm/v3confs/ns-calendar-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-index   nsCalXItemId    pres,eq,sub
diff --git a/ldap/cm/v3confs/ns-calendar-schema.conf b/ldap/cm/v3confs/ns-calendar-schema.conf
deleted file mode 100644
index 1c6b9b4c..00000000
--- a/ldap/cm/v3confs/ns-calendar-schema.conf
+++ /dev/null
@@ -1,167 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsCalAccess                 2.16.840.1.113730.3.1.112  cis     
-attribute nsCalAccessDomain           2.16.840.1.113730.3.1.113  cis     
-attribute nsCalAdmd                   2.16.840.1.113730.3.1.114  cis     
-attribute nsCalDefaultNoteReminder    2.16.840.1.113730.3.1.115  cis     
-attribute nsCalDefaultReminder        2.16.840.1.113730.3.1.116  cis     
-attribute nsCalDefaultTaskReminder    2.16.840.1.113730.3.1.117  cis     
-attribute nsCalDisplayPrefs           2.16.840.1.113730.3.1.118  cis     
-attribute nsCalFlags                  2.16.840.1.113730.3.1.119  cis     
-attribute nsCalHost                   2.16.840.1.113730.3.1.120  cis     
-attribute nsCalLanguageId             2.16.840.1.113730.3.1.121  cis     
-attribute nsCalNodeAlias              2.16.840.1.113730.3.1.122  cis     
-attribute nsCalNotifMechanism         2.16.840.1.113730.3.1.123  cis     
-attribute nsCalOperatingPrefs         2.16.840.1.113730.3.1.124  cis     
-attribute nsCalOrgUnit2               2.16.840.1.113730.3.1.125  cis     
-attribute nsCalOrgUnit3               2.16.840.1.113730.3.1.126  cis     
-attribute nsCalOrgUnit4               2.16.840.1.113730.3.1.127  cis     
-attribute nsCalPasswordRequired       2.16.840.1.113730.3.1.128  cis     
-attribute nsCalPrmd                   2.16.840.1.113730.3.1.129  cis     
-attribute nsCalRefreshPrefs           2.16.840.1.113730.3.1.130  cis     
-attribute nsCalResourceCapacity       2.16.840.1.113730.3.1.131  cis     
-attribute nsCalResourceNumber         2.16.840.1.113730.3.1.132  cis     
-attribute nsCalServerVersion          2.16.840.1.113730.3.1.133  cis     
-attribute nsCalSysopCanWritePassword  2.16.840.1.113730.3.1.134  cis     
-attribute nsCalTimezone               2.16.840.1.113730.3.1.135  cis     
-attribute nsCalXItemId                2.16.840.1.113730.3.1.136  cis     
-
-
-objectclass nsCalUser
-		oid 2.16.840.1.113730.3.2.14
-        requires
-                objectClass
-        allows
-                generationQualifier,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalRefreshPrefs,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass nsCalAdmin
-		oid 2.16.840.1.113730.3.2.15
-        requires
-                objectClass
-        allows
-                cn,
-                facsimileTelephoneNumber,
-                generationQualifier,
-                givenName,
-                initials,
-                ou,
-                postalAddress,
-                sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalXItemId
-
-objectclass nsCalResource
-		oid 2.16.840.1.113730.3.2.16
-        requires
-                objectClass
-        allows
-                cn,
-                facsimileTelephoneNumber,
-                postalAddress,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalPasswordRequired,
-                nsCalRefreshPrefs,
-                nsCalResourceCapacity,
-                nsCalResourceNumber,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass netscapeCalendarServer
-		oid 2.16.840.1.113730.3.2.17
-        requires
-                objectclass
-
-
-
diff --git a/ldap/cm/v3confs/ns-certificate-globopt.conf b/ldap/cm/v3confs/ns-certificate-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v3confs/ns-certificate-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v3confs/ns-certificate-schema.conf b/ldap/cm/v3confs/ns-certificate-schema.conf
deleted file mode 100644
index e24ae45d..00000000
--- a/ldap/cm/v3confs/ns-certificate-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeCertificateServer
-		oid 2.16.840.1.113730.3.2.18
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v3confs/ns-compass-globopt.conf b/ldap/cm/v3confs/ns-compass-globopt.conf
deleted file mode 100644
index 6c56c350..00000000
--- a/ldap/cm/v3confs/ns-compass-globopt.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	pipuid			pres,eq,sub
-index	pipstatus		eq
-
diff --git a/ldap/cm/v3confs/ns-compass-schema.conf b/ldap/cm/v3confs/ns-compass-schema.conf
deleted file mode 100644
index 52997ea4..00000000
--- a/ldap/cm/v3confs/ns-compass-schema.conf
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-
-# Compass server specific (not currently used) 
-
-objectclass netscapeCompassServer
-		oid 2.16.840.1.113730.3.2.19
-        requires        
-                objectclass
-
-
-# Attributes for personal interest profile classes
-
-attribute pipuid                      2.16.840.1.113730.3.1.137  cis     
-attribute pipcompassservers           2.16.840.1.113730.3.1.138  cis     
-attribute pipuniqueid                 2.16.840.1.113730.3.1.139  cis     
-attribute pipstatus                   2.16.840.1.113730.3.1.140  cis     
-attribute pipusertype                 2.16.840.1.113730.3.1.141  cis     
-attribute pipfrequency                2.16.840.1.113730.3.1.142  cis     
-attribute pipmedium                   2.16.840.1.113730.3.1.143  cis     
-attribute pipformat                   2.16.840.1.113730.3.1.144  cis     
-attribute piphour                     2.16.840.1.113730.3.1.145  cis     
-attribute pipmaxhits                  2.16.840.1.113730.3.1.146  cis     
-attribute pipresultset                2.16.840.1.113730.3.1.147  cis     
-attribute pipsortorder                2.16.840.1.113730.3.1.148  cis     
-attribute piptimestamp                2.16.840.1.113730.3.1.149  cis     
-attribute pipirlist                   2.16.840.1.113730.3.1.150  cis     
-attribute pipiroption                 2.16.840.1.113730.3.1.151  cis     
-attribute pippwp                      2.16.840.1.113730.3.1.152  cis     
-attribute piplastcount                2.16.840.1.113730.3.1.153  cis     
-attribute piptotalcount               2.16.840.1.113730.3.1.154  cis     
-attribute piptotalrun                 2.16.840.1.113730.3.1.155  cis     
-attribute pipnotify                   2.16.840.1.113730.3.1.156  cis     
-attribute pipprivilege                2.16.840.1.113730.3.1.157  cis     
-attribute pipgroup                    2.16.840.1.113730.3.1.158  cis     
-attribute pipidstcount                2.16.840.1.113730.3.1.159  cis     
-attribute pipstid                     2.16.840.1.113730.3.1.160  cis     
-attribute pipstname                   2.16.840.1.113730.3.1.161  cis     
-attribute pipstquery                  2.16.840.1.113730.3.1.162  cis     
-attribute pipsttaxonomy               2.16.840.1.113730.3.1.163  cis     
-attribute pipstinterest               2.16.840.1.113730.3.1.164  cis     
-attribute pipsttype                   2.16.840.1.113730.3.1.165  cis     
-attribute pipstprivacy                2.16.840.1.113730.3.1.166  cis     
-attribute pipststatus                 2.16.840.1.113730.3.1.167  cis     
-attribute pipstlastcount              2.16.840.1.113730.3.1.168  cis     
-attribute pipsttotalcount             2.16.840.1.113730.3.1.169  cis     
-attribute pipsttotalrun               2.16.840.1.113730.3.1.170  cis     
-attribute pipstcategory               2.16.840.1.113730.3.1.171  cis     
-attribute pipstfrequency              2.16.840.1.113730.3.1.172  cis     
-attribute pipstmedium                 2.16.840.1.113730.3.1.173  cis     
-attribute pipstformat                 2.16.840.1.113730.3.1.174  cis     
-attribute pipsthour                   2.16.840.1.113730.3.1.175  cis     
-attribute pipstmaxhits                2.16.840.1.113730.3.1.176  cis     
-attribute pipstresultset              2.16.840.1.113730.3.1.177  cis     
-attribute pipstsortorder              2.16.840.1.113730.3.1.178  cis     
-attribute pipsttimestamp              2.16.840.1.113730.3.1.179  cis     
-attribute pipstirlist                 2.16.840.1.113730.3.1.180  cis     
-attribute pipstiroption               2.16.840.1.113730.3.1.181  cis     
-attribute pipreservedcis1             2.16.840.1.113730.3.1.182  cis     
-attribute pipreservedcis2             2.16.840.1.113730.3.1.183  cis     
-attribute pipreservedcis3             2.16.840.1.113730.3.1.184  cis     
-attribute pipreservedcis4             2.16.840.1.113730.3.1.185  cis     
-attribute pipreservedcis5             2.16.840.1.113730.3.1.186  cis     
-attribute pipreservedcis6             2.16.840.1.113730.3.1.187  cis     
-attribute pipreservedces1             2.16.840.1.113730.3.1.188  ces     
-attribute pipreservedces2             2.16.840.1.113730.3.1.189  ces     
-attribute pipreservedces3             2.16.840.1.113730.3.1.190  ces     
-
-
-# Each interest profile is one of these and sits under the compass SIE
-
-objectclass personalInterestProfile 
-		oid 2.16.840.1.113730.3.2.20
-        requires        
-                objectclass,
-		pipuid
-	allows
-		pipuniqueid,
-		pipstatus,
-		pipusertype,
-		pipfrequency,
-		pipmedium,
-		pipformat,
-		piphour,
-		pipmaxhits,
-		pipresultset,
-		pipsortorder,
-		piptimestamp,
-		pipirlist,
-		pipiroption,
-		pippwp,
-		piplastcount,
-		piptotalcount,
-		piptotalrun,
-		pipnotify,
-		pipprivilege,
-		pipgroup,
-		pipidstcount,
-		pipstid,
-		pipstname,
-		pipstquery,
-		pipsttaxonomy,
-		pipstinterest,
-		pipsttype,
-		pipstprivacy,
-		pipststatus,
-		pipstlastcount,
-		pipsttotalcount,
-		pipsttotalrun,
-		pipstcategory,
-		pipstfrequency,
-		pipstmedium,
-		pipstformat,
-		pipsthour,
-		pipstmaxhits,
-		pipstresultset,
-		pipstsortorder,
-		pipsttimestamp,
-		pipstirlist,
-		pipstiroption,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
-
-# Replication of user info for template users, completeness, etc.
-# (not currently used)
-
-objectclass PIPUserInfo
-		oid 2.16.840.1.113730.3.2.21
-        requires        
-                objectclass
-	allows
-		cn,
-		mail,
-		userPassword,
-		description,
-		pipcompassservers,
-		pipuniqueid
-
-
-# Enhancements to a normal user entry (not currently used)
-
-objectclass PIPUser
-	oid 2.16.840.1.113730.3.2.22		
-	requires        
-        objectclass
-	allows
-		pipuniqueid,
-		pipcompassservers,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
diff --git a/ldap/cm/v3confs/ns-directory-globopt.conf b/ldap/cm/v3confs/ns-directory-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v3confs/ns-directory-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v3confs/ns-directory-schema.conf b/ldap/cm/v3confs/ns-directory-schema.conf
deleted file mode 100644
index 335dc675..00000000
--- a/ldap/cm/v3confs/ns-directory-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeDirectoryServer
-		oid 2.16.840.1.113730.3.2.23
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v3confs/ns-mail-globopt.conf b/ldap/cm/v3confs/ns-mail-globopt.conf
deleted file mode 100644
index 5c1075d9..00000000
--- a/ldap/cm/v3confs/ns-mail-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	uid,mail,mailAlternateAddress,mailHost	eq
-index	uniquemember,member	eq
diff --git a/ldap/cm/v3confs/ns-mail-schema.conf b/ldap/cm/v3confs/ns-mail-schema.conf
deleted file mode 100644
index d55a2ca4..00000000
--- a/ldap/cm/v3confs/ns-mail-schema.conf
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-attribute	mailAccessDomain	2.16.840.1.113730.3.1.12 cis
-attribute	mailAlternateAddress	2.16.840.1.113730.3.1.13 cis
-attribute	mailAutoReplyMode	2.16.840.1.113730.3.1.14 cis
-attribute	mailAutoReplyText	2.16.840.1.113730.3.1.15 cis
-attribute	mailDeliveryOption	2.16.840.1.113730.3.1.16 cis
-attribute	mailForwardingAddress	2.16.840.1.113730.3.1.17 cis
-attribute	mailHost		2.16.840.1.113730.3.1.18 cis
-attribute	mailQuota		2.16.840.1.113730.3.1.21 cis
-attribute   mailRoutingAddress      2.16.840.1.113730.3.1.47 cis
-
-attribute	mailMessageStore	2.16.840.1.113730.3.1.19 ces
-attribute	mailProgramDeliveryInfo	2.16.840.1.113730.3.1.20 ces
-
-objectClass mailRecipient
-	oid 2.16.840.1.113730.3.2.3
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAccessDomain,
-		mailAlternateAddress,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailHost,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota,
-		mailRoutingAddress,
-		multiLineDescription,
-		uid,
-		userPassword
-
-attribute	mgrpAllowedDomain	2.16.840.1.113730.3.1.23 cis
-attribute	mgrpMsgRejectAction	2.16.840.1.113730.3.1.28 cis
-attribute	mgrpRFC822MailMember	2.16.840.1.113730.3.1.30 cis
-attribute	mgrpMsgMaxSize		2.16.840.1.113730.3.1.32 cis
-
-attribute	mgrpAllowedBroadcaster	2.16.840.1.113730.3.1.22 ces
-attribute	mgrpDeliverTo		2.16.840.1.113730.3.1.25 ces
-attribute	mgrpErrorsTo		2.16.840.1.113730.3.1.26 ces
-attribute	mgrpModerator		2.16.840.1.113730.3.1.33 ces
-attribute	mgrpMsgRejectText	2.16.840.1.113730.3.1.29 ces
-
-#attribute	groupPassword		2.16.840.1.113730.3.1.27 bin
-
-objectClass mailGroup
-	oid 2.16.840.1.113730.3.2.4
-	requires
-		objectClass,
-		mail
-	allows
-		cn,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mgrpAllowedBroadcaster,
-		mgrpAllowedDomain,
-		mgrpDeliverTo,
-		mgrpErrorsTo,
-		mgrpModerator,
-		mgrpMsgMaxSize,
-		mgrpMsgRejectAction,
-		mgrpMsgRejectText,
-		mgrpRFC822MailMember,
-		owner
-
-attribute	mailEnhancedUniqueMember	2.16.840.1.113730.3.1.31 dn
-
-objectClass groupOfMailEnhancedUniqueNames
-	oid 2.16.840.1.113730.3.2.5
-	requires
-		objectClass,
-		cn
-	allows
-		businessCategory,
-		description,
-		mailEnhancedUniqueMember,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectClass	netscapeMailServer
-	oid 2.16.840.1.113730.3.2.24
-	requires
-		objectClass
diff --git a/ldap/cm/v3confs/ns-media-globopt.conf b/ldap/cm/v3confs/ns-media-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v3confs/ns-media-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v3confs/ns-media-schema.conf b/ldap/cm/v3confs/ns-media-schema.conf
deleted file mode 100644
index 01b2cf95..00000000
--- a/ldap/cm/v3confs/ns-media-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeMediaServer
-		oid 2.16.840.1.113730.3.2.25
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v3confs/ns-news-globopt.conf b/ldap/cm/v3confs/ns-news-globopt.conf
deleted file mode 100644
index 46dd80f7..00000000
--- a/ldap/cm/v3confs/ns-news-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	uniquemember,member	eq
-
diff --git a/ldap/cm/v3confs/ns-news-schema.conf b/ldap/cm/v3confs/ns-news-schema.conf
deleted file mode 100644
index 9d15c19e..00000000
--- a/ldap/cm/v3confs/ns-news-schema.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsnewsACL                   2.16.840.1.113730.3.1.191  cis     
-attribute nsaclrole                   2.16.840.1.113730.3.1.192  cis     
-attribute nsprettyname                2.16.840.1.113730.3.1.193  cis     
-attribute nsflags                     2.16.840.1.113730.3.1.194  cis     
-attribute nscreator                   2.16.840.1.113730.3.1.195  cis     
-attribute ngcomponent                 2.16.840.1.113730.3.1.196  dn      
-
-objectclass nginfo 
-	oid  2.16.840.1.113730.3.2.26
-	requires 
-		objectClass, 
-		ngcomponent 
-	allows 
-		nsnewsACL,  
-		subtreeACI, 
-		description,  
-		nsaclrole,  
-		nsprettyname, 
-		nsflags, 
-		nscreator 
-
-objectClass	netscapeNewsServer
-	oid 2.16.840.1.113730.3.2.27
-	requires
-		objectClass
-
diff --git a/ldap/cm/v3confs/ns-proxy-globopt.conf b/ldap/cm/v3confs/ns-proxy-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v3confs/ns-proxy-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v3confs/ns-proxy-schema.conf b/ldap/cm/v3confs/ns-proxy-schema.conf
deleted file mode 100644
index 3151c9c7..00000000
--- a/ldap/cm/v3confs/ns-proxy-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeProxyServer
-		oid 2.16.840.1.113730.3.2.28
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v3confs/ns-web-globopt.conf b/ldap/cm/v3confs/ns-web-globopt.conf
deleted file mode 100644
index 46dd80f7..00000000
--- a/ldap/cm/v3confs/ns-web-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	uniquemember,member	eq
-
diff --git a/ldap/cm/v3confs/ns-web-schema.conf b/ldap/cm/v3confs/ns-web-schema.conf
deleted file mode 100644
index 3b8b0435..00000000
--- a/ldap/cm/v3confs/ns-web-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeWebServer
-		oid 2.16.840.1.113730.3.2.29
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v3confs/slapd.at.conf b/ldap/cm/v3confs/slapd.at.conf
deleted file mode 100644
index 5e01e752..00000000
--- a/ldap/cm/v3confs/slapd.at.conf
+++ /dev/null
@@ -1,351 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.at.conf for Netscape Directory Server 3.1
-#
-#  DO NOT MODIFY! 
-#
-#  The attributes listed in this file are Standard Attributes and are
-#  expected to present in Directory Server 3.1. Editing this file could 
-#  cause interoperability problems.
-#
-#  User Defined Attributes should be added by selecting 
-#  Schema | Edit or View Attributes from the Admin Server. 
-#
-#  User Defined Attributes are placed in slapd.user_at.conf.  
-# 
-#  All attributes are viewable over LDAP in the cn=schema entry under
-#  attributetypes.
-# 
-#  The format of this file is:
-#
-#  attribute attribute-name [attribute-aliases] [attribute-oid] syntax
-#  
-#  If no OID is specified, <attribute-name>-oid will be used as the OID
-#
-
-########################################################################
-# X.500(93) User Schema for use with LDAP
-# Taken from <draft-ietf-asid-ldapv3schema-x500-00.txt>
-########################################################################
-
-attribute objectClass                                         2.5.4.0                    cis     
-attribute aliasedObjectName                                   2.5.4.1                    dn      
-attribute knowledgeInformation                                2.5.4.2                    cis     
-attribute cn                         commonName               2.5.4.3                    cis     
-attribute sn                         surName                  2.5.4.4                    cis     
-attribute serialNumber                                        2.5.4.5                    cis     
-attribute c                          countryName              2.5.4.6                    cis     
-attribute l   locality               localityname             2.5.4.7                    cis     
-attribute st                         stateOrProvinceName      2.5.4.8                    cis     
-attribute street                     streetaddress            2.5.4.9                    cis     
-attribute o                          organizationname         2.5.4.10                   cis     
-attribute ou                         organizationalUnitName   2.5.4.11                   cis     
-attribute title                                               2.5.4.12                   cis     
-attribute description                                         2.5.4.13                   cis     
-attribute searchGuide                                         2.5.4.14                   ces     
-attribute businessCategory                                    2.5.4.15                   cis     
-attribute postalAddress                                       2.5.4.16                   cis     
-attribute postalCode                                          2.5.4.17                   cis     
-attribute postOfficeBox                                       2.5.4.18                   cis     
-attribute physicalDeliveryOfficeName                          2.5.4.19                   cis     
-attribute telephoneNumber                                     2.5.4.20                   tel     
-attribute telexNumber                                         2.5.4.21                   cis     
-attribute teletexTerminalIdentifier                           2.5.4.22                   cis
-attribute facsimileTelephoneNumber   fax                      2.5.4.23                   tel     
-attribute x121Address                                         2.5.4.24                   ces     
-attribute internationalIsdnNumber                             2.5.4.25                   ces     
-attribute registeredAddress                                   2.5.4.26                   cis     
-attribute destinationIndicator                                2.5.4.27                   cis     
-attribute preferredDeliveryMethod                             2.5.4.28                   cis     
-attribute presentationAddress                                 2.5.4.29                   ces     
-attribute supportedApplicationContext                         2.5.4.30                   cis     
-attribute member                                              2.5.4.31                   dn      
-attribute owner                                               2.5.4.32                   dn      
-attribute roleOccupant                                        2.5.4.33                   dn      
-attribute seeAlso                                             2.5.4.34                   dn      
-attribute userPassword                                        2.5.4.35                   bin     
-attribute userCertificate;binary  userCertificate             2.5.4.36                   bin     
-attribute cACertificate;binary    cACertificate               2.5.4.37                   bin     
-attribute authorityRevocationList;binary authorityRevocationList     2.5.4.38            bin     
-attribute certificateRevocationList;binary certificateRevocationList 2.5.4.39            bin
-attribute crossCertificatePair;binary      crossCertificatePair      2.5.4.40            bin     
-attribute givenName                                           2.5.4.42                   cis     
-attribute initials                                            2.5.4.43                   cis     
-attribute generationQualifier                                 2.5.4.44                   cis
-attribute x500UniqueIdentifier                                2.5.4.45                   bin     
-attribute dnQualifier                                         2.5.4.46                   cis     
-attribute enhancedSearchGuide                                 2.5.4.47                   cis
-attribute protocolInformation                                 2.5.4.48                   cis
-attribute dn distinguishedName                                2.5.4.49                   dn 
-attribute uniqueMember                                        2.5.4.50                   dn      
-attribute houseIdentifier                                     2.5.4.51                   cis
-attribute supportedAlgorithms;binary                          2.5.4.52                   bin       
-attribute deltaRevocationList;binary                          2.5.4.53                   bin
-
-#######################################################################
-# LDAP Attributes                                                     #
-# Taken from <draft-ietf-asid-ldapv3-attributes-07.txt>               #
-#######################################################################
-
-attribute createTimestamp                                     2.5.18.1                   cis
-attribute modifyTimestamp                                     2.5.18.2                   cis
-attribute creatorsName                                        2.5.18.3                   dn
-attribute modifiersName                                       2.5.18.4                   dn
-attribute subschemaSubentry                                   2.5.18.10                  dn
-attribute attributeTypes                                      2.5.21.5                   cis
-attribute objectClasses                                       2.5.21.6                   cis
-attribute matchingRules                                       2.5.21.4                   cis
-attribute matchingRuleUse                                     2.5.21.8                   cis
-attribute dITStructureRules                                   2.5.21.1                   cis
-attribute dITContentRules                                     2.5.21.2                   cis
-attribute nameForms                                           2.5.21.7                   cis
-
-attribute namingContexts                                      1.3.6.1.4.1.1466.101.120.5 dn
-attribute altServer                                           1.3.6.1.4.1.1466.101.120.6 ces
-attribute supportedExtension                                  1.3.6.1.4.1.1466.101.120.7 cis
-attribute supportedControl                                    1.3.6.1.4.1.1466.101.120.13 cis
-attribute supportedSASLMechanisms                             1.3.6.1.4.1.1466.101.120.14 cis
-attribute supportedLDAPVersion                                1.3.6.1.4.1.1466.101.120.15 int
-attribute ldapSyntaxes                                        1.3.6.1.4.1.1466.101.120.16 cis
-
-#######################################################################
-# Pilot X.500 schema for use in LDAPv3                                #
-# Taken from <draft-ietf-asid-schema-pilot-00.txt>                    #
-#######################################################################
-
-attribute uid                                                 0.9.2342.19200300.100.1.1  cis     
-attribute textEncodedORAddress                                0.9.2342.19200300.100.1.2  cis     
-attribute mail                       rfc822mailbox            0.9.2342.19200300.100.1.3  cis     
-attribute info                                                0.9.2342.19200300.100.1.4  cis     
-attribute drink                                               0.9.2342.19200300.100.1.5  cis     
-attribute roomNumber                                          0.9.2342.19200300.100.1.6  cis     
-attribute userClass                                           0.9.2342.19200300.100.1.8  cis     
-attribute host                                                0.9.2342.19200300.100.1.9  cis     
-attribute manager                                             0.9.2342.19200300.100.1.10 dn      
-attribute documentIdentifier                                  0.9.2342.19200300.100.1.11 cis     
-attribute documentTitle                                       0.9.2342.19200300.100.1.12 cis     
-attribute documentVersion                                     0.9.2342.19200300.100.1.13 cis     
-attribute documentAuthor                                      0.9.2342.19200300.100.1.14 dn      
-attribute documentLocation                                    0.9.2342.19200300.100.1.15 cis     
-attribute homePhone                                           0.9.2342.19200300.100.1.20 tel     
-attribute secretary                                           0.9.2342.19200300.100.1.21 dn      
-attribute otherMailbox                                        0.9.2342.19200300.100.1.22 cis     
-attribute dc                         domaincomponent          0.9.2342.19200300.100.1.25 cis     
-attribute dNSRecord                                           0.9.2342.19200300.100.1.26 cis     
-attribute associatedName                                      0.9.2342.19200300.100.1.38 dn      
-attribute homePostalAddress                                   0.9.2342.19200300.100.1.39 cis     
-attribute personalTitle                                       0.9.2342.19200300.100.1.40 cis     
-attribute mobile                     mobileTelephoneNumber    0.9.2342.19200300.100.1.41 tel     
-attribute pager                      pagerTelephoneNumber     0.9.2342.19200300.100.1.42 tel     
-attribute co                         friendlycountryname      0.9.2342.19200300.100.1.43 cis     
-attribute uniqueIdentifier                                    0.9.2342.19200300.100.1.44 cis     
-attribute organizationalStatus                                0.9.2342.19200300.100.1.45 cis     
-attribute janetMailbox                                        0.9.2342.19200300.100.1.46 cis
-attribute mailPreferenceOption                                0.9.2342.19200300.100.1.47 int single     
-attribute buildingName                                        0.9.2342.19200300.100.1.48 cis     
-attribute dSAQuality                                          0.9.2342.19200300.100.1.49 cis single
-attribute singleLevelQuality                                  0.9.2342.19200300.100.1.50 cis single
-attribute subtreeMinimumQuality                               0.9.2342.19200300.100.1.51 cis single
-attribute subtreeMaximumQuality                               0.9.2342.19200300.100.1.52 cis single
-attribute personalSignature                                   0.9.2342.19200300.100.1.53 bin     
-attribute ditRedirect                                         0.9.2342.19200300.100.1.54 dn      
-attribute audio                                               0.9.2342.19200300.100.1.55 bin     
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis     
-attribute jpegPhoto                                           0.9.2342.19200300.100.1.60 bin     
-
-#definitions subsequent to RFC 1274
-
-attribute labeledUri                 labeledurl               1.3.6.1.4.1.250.1.57       ces
-
-
-############################################################################
-# Netscape Defined Attributes
-#
-# The Netscape base OID is                          2.16.840.1.113730 
-# The base OID for the Netscape Directory Server is 2.16.840.1.113730.3 
-# Netscape defined attributes have base             2.16.840.1.113730.3.1
-#
-# More Netscape defined attributes can be found included in ns-schema.conf
-############################################################################
-
-attribute carLicense                                          2.16.840.1.113730.3.1.1    cis     
-attribute departmentNumber                                    2.16.840.1.113730.3.1.2    cis     
-attribute employeeNumber                                      2.16.840.1.113730.3.1.3    cis     
-attribute employeeType                                        2.16.840.1.113730.3.1.4    cis     
-attribute changeNumber                                        2.16.840.1.113730.3.1.5    int     
-attribute targetDn                                            2.16.840.1.113730.3.1.6    dn      
-attribute changeType                                          2.16.840.1.113730.3.1.7    cis     
-attribute changes                                             2.16.840.1.113730.3.1.8    bin     
-attribute newRdn                                              2.16.840.1.113730.3.1.9    dn      
-attribute deleteOldRdn                                        2.16.840.1.113730.3.1.10   cis     
-attribute newSuperior                                         2.16.840.1.113730.3.1.11   dn      
-attribute ref                                                 2.16.840.1.113730.3.1.34   ces     
-attribute nsLicensedFor                                       2.16.840.1.113730.3.1.36   cis     
-attribute nsLicenseStartTime                                  2.16.840.1.113730.3.1.37   cis     
-attribute nsLicenseEndTime                                    2.16.840.1.113730.3.1.38   cis     
-attribute preferredLanguage                                   2.16.840.1.113730.3.1.39   cis
-attribute userSMIMECertificate;binary                          2.16.840.1.113730.3.1.40   bin
-attribute ntUserDomainId                                      2.16.840.1.113730.3.1.41   cis single    
-attribute ntUserCreateNewAccount                              2.16.840.1.113730.3.1.42   cis single     
-attribute ntUserDeleteAccount                                 2.16.840.1.113730.3.1.43   cis single     
-attribute ntGroupDomainId                                     2.16.840.1.113730.3.1.44   cis single
-attribute ntGroupCreateNewGroup                               2.16.840.1.113730.3.1.45   cis single
-attribute ntGroupDeleteGroup                                  2.16.840.1.113730.3.1.46   cis single
-attribute ntGroupType                                  2.16.840.1.113730.3.1.47   cis single
-attribute replicaPort                                         2.16.840.1.113730.3.1.48   cis              
-attribute replicaUpdateFailedAt                               2.16.840.1.113730.3.1.49   cis              
-attribute replicaBeginOrc                                     2.16.840.1.113730.3.1.50   cis              
-attribute replicaUpdateReplayed                               2.16.840.1.113730.3.1.51   cis              
-attribute replicaUpdateSchedule                               2.16.840.1.113730.3.1.52   cis              
-attribute replicaBindMethod                                   2.16.840.1.113730.3.1.53   cis              
-attribute replicaUseSSL                                       2.16.840.1.113730.3.1.54   cis              
-attribute aci                                                 2.16.840.1.113730.3.1.55   bin              
-attribute lastModifiedBy                                      0.9.2342.19200300.100.1.24 dn               
-attribute replicaRoot                                         2.16.840.1.113730.3.1.57   dn               
-attribute replicaBindDn                                       2.16.840.1.113730.3.1.58   dn               
-attribute ntUserPriv                                          2.16.840.1.113730.3.1.59   bin single  
-attribute ntUserAuthFlags                                     2.16.840.1.113730.3.1.60   bin single  
-attribute ntUserUsrComment                                    2.16.840.1.113730.3.1.61   cis single  
-attribute ntUserParms                                         2.16.840.1.113730.3.1.62   cis single  
-attribute ntUserUnitsPerWeek                                  2.16.840.1.113730.3.1.63   bin single  
-attribute ntUserNumLogons                                     2.16.840.1.113730.3.1.64   bin single  
-attribute ntUserLogonServer                                   2.16.840.1.113730.3.1.65   cis single  
-attribute ntUserUniqueId                                      2.16.840.1.113730.3.1.66   bin single  
-attribute ntUserProfile                                       2.16.840.1.113730.3.1.67   cis single  
-attribute ntUserPasswordExpired                               2.16.840.1.113730.3.1.68   bin single  
-attribute subtreeACI                                          2.16.840.1.113730.3.1.69   ces              
-attribute serverRoot                                          2.16.840.1.113730.3.1.70   cis              
-attribute serverProductName                                   2.16.840.1.113730.3.1.71   cis              
-attribute serverVersionNumber                                 2.16.840.1.113730.3.1.72   cis              
-attribute installationTimeStamp                               2.16.840.1.113730.3.1.73   cis              
-attribute administratorContactInfo                            2.16.840.1.113730.3.1.74   cis              
-attribute adminUrl                                            2.16.840.1.113730.3.1.75   ces              
-attribute serverHostName                                      2.16.840.1.113730.3.1.76   cis              
-attribute changeTime                                          2.16.840.1.113730.3.1.77   cis              
-attribute cirReplicaRoot                                      2.16.840.1.113730.3.1.79   dn               
-attribute cirHost                                             2.16.840.1.113730.3.1.80   cis              
-attribute cirPort                                             2.16.840.1.113730.3.1.81   cis              
-attribute cirBindDn                                           2.16.840.1.113730.3.1.82   dn               
-attribute cirUsePersistentSearch                              2.16.840.1.113730.3.1.83   cis              
-attribute cirUseSsl                                           2.16.840.1.113730.3.1.84   cis              
-attribute cirBindCredentials                                  2.16.840.1.113730.3.1.85   ces              
-attribute cirLastUpdateApplied                                2.16.840.1.113730.3.1.86   cis              
-attribute cirUpdateSchedule                                   2.16.840.1.113730.3.1.87   cis              
-attribute cirUpdateFailedat                                   2.16.840.1.113730.3.1.88   cis              
-attribute cirSyncInterval                                     2.16.840.1.113730.3.1.89   cis              
-attribute cirBeginORC                                         2.16.840.1.113730.3.1.90   cis              
-attribute passwordExpirationTime                              2.16.840.1.113730.3.1.91   cis operational         
-attribute passwordExpWarned                                   2.16.840.1.113730.3.1.92   cis operational         
-attribute passwordRetryCount                                  2.16.840.1.113730.3.1.93   cis operational         
-attribute retryCountResetTime                                 2.16.840.1.113730.3.1.94   cis operational         
-attribute accountUnlockTime                                   2.16.840.1.113730.3.1.95   cis operational         
-attribute passwordHistory                                     2.16.840.1.113730.3.1.96   bin operational         
-attribute passwordMaxAge                                      2.16.840.1.113730.3.1.97   cis             
-attribute passwordExp                                         2.16.840.1.113730.3.1.98   cis                 
-attribute passwordMinLength                                   2.16.840.1.113730.3.1.99   cis                 
-attribute passwordKeepHistory                                 2.16.840.1.113730.3.1.100  cis                 
-attribute passwordInHistory                                   2.16.840.1.113730.3.1.101  cis                 
-attribute passwordChange                                      2.16.840.1.113730.3.1.102  cis                 
-attribute passwordCheckSyntax                                 2.16.840.1.113730.3.1.103  cis                 
-attribute passwordWarning								      2.16.840.1.113730.3.1.104  cis                 
-attribute passwordLockout                                     2.16.840.1.113730.3.1.105  cis                 
-attribute passwordMaxFailure                                  2.16.840.1.113730.3.1.106  cis                 
-attribute passwordResetDuration                               2.16.840.1.113730.3.1.107  cis                 
-attribute passwordUnlock				    				  2.16.840.1.113730.3.1.108  cis                 
-attribute passwordLockoutDuration                             2.16.840.1.113730.3.1.109  cis                 
-attribute ntGroupId                                           2.16.840.1.113730.3.1.110  bin single  
-attribute replicaHost                                         2.16.840.1.113730.3.1.197  cis              
-attribute memberURL                                           2.16.840.1.113730.3.1.198  ces              
-attribute memberCertificateDescription                        2.16.840.1.113730.3.1.199  ces              
-attribute replicaCredentials                                  2.16.840.1.113730.3.1.202  bin     
-attribute replicaEntryFilter                                  2.16.840.1.113730.3.1.203  ces
-attribute replicaNickName                                     2.16.840.1.113730.3.1.204  cis
-attribute filterInfo										  2.16.840.1.113730.3.1.206  cis
-attribute replicaCFUpdated                                    2.16.840.1.113730.3.1.217  cis
-attribute replicaAbandonedChanges                             2.16.840.1.113730.3.1.218  cis
-
-#
-# Attribute types with OIDs
-#
-
-attribute associatedDomain                                    0.9.2342.19200300.100.1.37 cis     
-attribute ntUserHomeDir                                       1.2.840.113556.1.4.44      cis single     
-attribute ntUserComment                                       1.2.840.113556.1.4.156     cis single     
-attribute ntUserFlags                                         1.2.840.113556.1.4.38      bin single     
-attribute ntUserScriptPath                                    1.2.840.113556.1.4.62      cis single     
-attribute ntUserWorkstations                                  1.2.840.113556.1.4.86      cis single     
-attribute ntUserLastLogon                                     1.2.840.113556.1.4.52      cis single     
-attribute ntUserLastLogoff                                    1.2.840.113556.1.4.51      cis single     
-attribute ntUserAcctExpires                                   1.2.840.113556.1.4.159     cis single     
-attribute ntUserMaxStorage                                    1.2.840.113556.1.4.76      bin single     
-attribute ntUserLogonHours                                    1.2.840.113556.1.4.64      bin single     
-attribute ntUserBadPwCount                                    1.2.840.113556.1.4.12      bin single     
-attribute ntUserCountryCode                                   1.2.840.113556.1.4.25      cis single     
-attribute ntUserCodePage                                      1.2.840.113556.1.4.16      bin single     
-attribute ntUserPrimaryGroupId                                1.2.840.113556.1.4.98      bin single     
-attribute ntUserHomeDirDrive                                  1.2.840.113556.1.4.45      cis single     
-attribute ntGroupAttributes                                   1.2.840.113556.1.4.152     bin single
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis single
-
-
-# 
-# Attributes which are used by some objectClass, but with unknown OID
-# 
-
-attribute abstract                                            abstract-oid               cis     
-attribute authorCn                   documentauthorcommonname authorcn-oid               cis     
-attribute authorSn                   documentauthorsurname    authorsn-oid               cis     
-attribute changeLog                                           2.16.840.1.113730.3.1.35   dn
-attribute changeLogMaximumAge                                 2.16.840.1.113730.3.1.200  cis     
-attribute changeLogMaximumSize                                2.16.840.1.113730.3.1.201  cis     
-attribute documentStore                                       documentStore-oid          cis     
-attribute keyWords                                            keyWords-oid               cis     
-attribute lastModifiedTime                                    0.9.2342.19200300.100.1.23 cis     
-attribute multiLineDescription                                multiLineDescription-oid   cis     
-attribute subject                                             subject-oid                cis     
-attribute ttl                        timeToLive               1.3.6.1.4.1.250.1.60       cis     
-attribute photo                                               0.9.2342.19200300.100.1.7  bin     
-attribute generation                                          generation-oid             ces     
-attribute obsoletedByDocument                                 obsoletedByDocument-oid    dn      
-attribute obsoletesDocument                                   obsoletesDocument-oid      dn      
-attribute reciprocalNamingLink                                reciprocalNaminglink-oid   dn      
-attribute updatedByDocument                                   updatedByDocument-oid      dn      
-attribute updatesDocument                                     updatesDocument-oid        dn      
-
diff --git a/ldap/cm/v3confs/slapd.oc.conf b/ldap/cm/v3confs/slapd.oc.conf
deleted file mode 100644
index f1d75e7b..00000000
--- a/ldap/cm/v3confs/slapd.oc.conf
+++ /dev/null
@@ -1,811 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.oc.conf for Netscape Directory Server 3.1
-#
-#  DO NOT MODIFY! 
-#
-#  The ObjectClasses in this file are Standard ObjectClasses and are expected
-#  to be present in Directory Server 3.1 unchanged. Modifing this file may
-#  cause interoperability problems.
-#
-#  User Defined ObjectClasses should be added by selecting 
-#  Schema | Create ObjectClasses from the Admin Server. 
-#
-#  User Defined ObjectClasses are saved in slapd.user_oc.conf
-#  
-#  All ObjectClasses are viewable in the cn=schema entry under objectclasses.
-#
-# The format of this file is:
-#
-#  objectclass ObjectClassName
-#       [ oid ObjectIdentifier ]
-#       [ superior ParentObjectClass ]
-#       [ requires <comma separated list of required attributes> ]
-#       [ allows   <comma separated list of allowed attributes>  ]
-#  
-
-objectclass top
-	oid 2.5.6.0
-	requires
-		objectClass
-	allows
-		aci
-
-objectclass alias
-	oid 2.5.6.1
-	superior top
-	requires
-		aliasedObjectName
-
-objectclass country
-	oid 2.5.6.2
-	superior top
-	requires
-		c
-	allows
-		searchGuide,
-		description
-
-objectclass locality
-	oid 2.5.6.3
-	superior top
-	allows
-		description,
-		l,
-		searchGuide,
-		seeAlso,
-		st,
-		street
-
-objectclass organization
-	oid 2.5.6.4
-	superior top
-	requires
-		o
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass organizationalUnit
-	oid 2.5.6.5
-	superior top
-	requires
-		ou
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass person
-	oid 2.5.6.6
-	superior top
-	requires
-		sn,
-		cn
-	allows
-		description,
-		seeAlso,
-		telephoneNumber,
-		userPassword
-
-objectclass organizationalPerson
-	oid 2.5.6.7
-	superior person
-	allows
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		title,
-		x121Address
-
-objectclass inetOrgPerson
-    oid 2.16.840.1.113730.3.2.2
-    superior organizationalPerson
-	allows
-		audio,
-		businessCategory,
-		carLicense,
-		departmentNumber,
-		employeeType,
-		employeeNumber,
-		givenName,
-		homePhone,
-		homePostalAddress,
-		initials,
-		jpegPhoto,
-		labeledURI,
-		manager,
-		mobile,
-		pager,
-		photo,
-		preferredLanguage,
-		mail,
-		roomNumber,
-		secretary,
-		uid,
-		x500uniqueIdentifier,
-		userCertificate,
-		userCertificate;binary,
-		userSMimeCertificate;binary
- 
-objectclass ntUser
-	oid 2.16.840.1.113730.3.2.8
-	superior top
-	requires
-		ntUserDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntUserPriv,
-		ntUserHomeDir,
-		ntUserComment,
-		ntUserFlags,
-		ntUserScriptPath,
-		ntUserAuthFlags,
-		ntUserUsrComment,
-		ntUserParms,
-		ntUserWorkstations,
-		ntUserLastLogon,
-		ntUserLastLogoff,
-		ntUserAcctExpires,
-		ntUserMaxStorage,
-		ntUserUnitsPerWeek,
-		ntUserLogonHours,
-		ntUserBadPwCount,
-		ntUserNumLogons,
-		ntUserLogonServer,
-		ntUserCountryCode,
-		ntUserCodePage,
-		ntUserUniqueId,
-		ntUserPrimaryGroupId,
-		ntUserProfile,
-		ntUserHomeDirDrive,
-		ntUserPasswordExpired,
-		ntUserCreateNewAccount,
-		ntUserDeleteAccount
-
-objectclass ntGroup
-	oid 2.16.840.1.113730.3.2.9
-	superior top
-	requires
-		ntGroupDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntGroupId,
-		ntGroupAttributes,
-		ntGroupCreateNewGroup,
-		ntGroupDeleteGroup,
-		ntGroupType
-
-objectclass organizationalRole
-   oid 2.5.6.8
-   superior top  
-	requires
-		cn
-	allows
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		roleOccupant,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass groupOfNames
-   oid 2.5.6.9
-   superior top  
-	requires
-		cn
-	allows
-		member,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfUniqueNames
-    oid 2.5.6.17
-    superior top  
-	requires
-		cn
-	allows
-		uniqueMember,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfCertificates
-    oid 2.16.840.1.113730.3.2.31
-    superior top  
-	requires
-		cn
-	allows
-		memberCertificateDescription,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfURLs
-    oid  2.16.840.1.113730.3.2.33
-    superior top  
-	requires
-		cn
-	allows
-		memberURL,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass residentialPerson
-   oid 2.5.6.10
-   superior person  
-	requires
-		l
-	allows
-		businessCategory,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass applicationProcess
-    oid 2.5.6.11
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso
-
-objectclass LDAPServer
-	oid 2.16.840.1.113730.3.2.35
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		generation,
-		changeLogMaximumAge,
-		changeLogMaximumSize
-
-objectclass LDAPReplica
-	oid 2.16.840.1.113730.3.2.36
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		replicaRoot,
-		replicaHost,
-		replicaPort,
-		replicaBindDn,
-		replicaCredentials,
-		replicaBindMethod,
-		replicaUseSSL,
-		replicaUpdateSchedule,
-		replicaUpdateReplayed,
-		replicaUpdateFailedAt,
-		replicaBeginORC,
-		replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList,
-		replicaCFUpdated,
-		replicaAbandonedChanges
-
-objectclass applicationEntity
-    oid 2.5.6.12
-    superior top  
-	requires
-		presentationAddress,
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		supportedApplicationContext
-
-objectclass dSA
-   oid 2.5.6.13
-   superior applicationEntity  
-	allows
-		knowledgeInformation
-
-objectclass device
-    oid 2.5.6.14
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-objectclass strongAuthenticationUser
-    oid 2.5.6.15
-    superior top 
-	requires
-		userCertificate,
-		userCertificate;binary
-
-objectclass certificationAuthority
-    oid 2.5.6.16
-    superior top 
-	requires
-		cACertificate;binary
-	allows
-		authorityRevocationList;binary,
-		certificateRevocationList;binary,
-		crossCertificatePair;binary
-
-objectclass pilotObject
-    oid 0.9.2342.19200300.100.4.3
-    superior top  
-	allows
-		audio,
-		dITRedirect,
-		info,
-		jpegPhoto,
-		lastModifiedBy,
-		lastModifiedTime,
-		manager,
-		photo,
-		uniqueIdentifier
-
-objectclass newPilotPerson
-    oid 0.9.2342.19200300.100.4.4
-    superior person 
-	allows
-		businessCategory,
-		drink,
-		homePhone,
-		homePostalAddress,
-		janetMailbox,
-		mail,
-		mailPreferenceOption,
-		mobile,
-		organizationalStatus,
-		otherMailbox,
-		pager,
-		personalSignature,
-		personalTitle,
-		preferredDeliveryMethod,
-		roomNumber,
-		secretary,
-		textEncodedORAddress,
-		uid,
-		userClass
-
-objectclass account
-    oid 0.9.2342.19200300.100.4.5
-    superior top  
-    requires
-		uid
-	allows
-		description,
-		host,
-		l,
-		o,
-		ou,
-		seeAlso
-
-objectclass document
-    oid 0.9.2342.19200300.100.4.6
-    superior pilotObject 
-	requires
-		documentIdentifier
-	allows
-		abstract,
-		authorCN,
-		authorSN,
-		cn,
-		description,
-		documentAuthor,
-		documentLocation,
-		documentPublisher,
-		documentStore,
-		documentTitle,
-		documentVersion,
-		keywords,
-		l,
-		o,
-		obsoletedByDocument,
-		obsoletesDocument,
-		ou,
-		seeAlso,
-		subject,
-		updatedByDocument,
-		updatesDocument
-
-objectclass room
-    oid 0.9.2342.19200300.100.4.7
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		roomNumber,
-		seeAlso,
-		telephoneNumber
-
-objectclass documentSeries
-    oid 0.9.2342.19200300.100.4.9
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		telephoneNumber
-
-objectclass domain
-    oid 0.9.2342.19200300.100.4.13
-    superior top  
-	requires
-		dc
-	allows
-		associatedName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		manager,
-		o,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass RFC822localPart
-    oid 0.9.2342.19200300.100.4.14
-    superior domain 
-	allows
-		cn,
-		sn
-
-objectclass DNSDomain
-    oid 0.9.2342.19200300.100.4.15
-    superior domain  
-	allows
-		dNSRecord
-
-objectclass domainRelatedObject
-    oid 0.9.2342.19200300.100.4.17
-    superior top 
-	requires
-		associatedDomain
-
-objectclass friendlyCountry
-    oid 0.9.2342.19200300.100.4.18
-    superior country 
-	requires
-		co
-
-objectclass simpleSecurityObject
-	oid 0.9.2342.19200300.100.4.19
-	superior top 
-	requires
-		userPassword
-
-objectclass pilotOrganization
-	oid pilotOrganization-OID
-	superior top
-	requires
-		ou,
-		o
-	allows
-		buildingName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-
-objectclass labeledURIObject
-	oid 1.3.6.1.4.1.250.3.15 
-	superior top
-	allows
-		labeledURI
-
-objectclass cacheObject
-	oid 1.3.6.1.4.1.250.3.18 
-	superior top
-	allows
-		ttl
-
-# objectclasses below added since Netscape Directory Server 1.01
-
-objectclass netscapeServer 
-	oid 2.16.840.1.113730.3.2.10
-	superior top
-	requires 
-		cn 
-	allows 
-		description,
-		serverRoot,
-		serverProductName,
-		serverVersionNumber,
-		installationTimeStamp,
-		administratorContactInfo,
-		userpassword,
-		adminURL,
-		serverHostName
-
-objectclass nsLicenseUser
-	oid 2.16.840.1.113730.3.2.7
-	superior top
-	allows
-		nsLicensedFor,
-		nsLicenseStartTime,
-		nsLicenseEndTime
-
-objectclass changeLogEntry
-	oid 2.16.840.1.113730.3.2.1
-	superior top
-	requires
-		targetdn,
-		changeTime,
-		changenumber,
-		changeType
-	allows
-		changes,
-		newrdn,
-		deleteoldrdn,
-		newsuperior,
-		filterinfo
-
-objectclass cirReplicaSource
-	oid 2.16.840.1.113730.3.2.11
-	requires 
-		cn
-	allows
-		cirReplicaRoot,
-                cirHost,
-                cirPort,
-                cirBindDN,
-                cirUsePersistentSearch,
-                cirUseSSL,
-                cirBindCredentials,
-                cirLastUpdateApplied,
-                cirUpdateSchedule,
-                cirSyncInterval,
-                cirUpdateFailedAt,
-                cirBeginORC,
-                replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList
-
-objectclass referral
-	oid 2.16.840.1.113730.3.2.6
-	allows
-		ref
-
-objectclass passwordObject
-		oid  2.16.840.1.113730.3.2.12
-        requires
-                objectClass
-        allows
-                passwordExpirationTime,
-                passwordExpWarned,
-                passwordRetryCount,
-                retryCountResetTime,
-                accountUnlockTime,
-                passwordHistory
-
-objectclass passwordPolicy
-		oid  2.16.840.1.113730.3.2.13
-        requires
-                objectClass
-        allows
-		passwordMaxAge,		
-		passwordExp,
-		passwordMinLength,
-		passwordKeepHistory,
-		passwordInHistory,
-		passwordChange,
-		passwordWarning,
-		passwordLockout,
-		passwordMaxFailure,
-		passwordResetDuration,
-		passwordUnlock,
-		passwordLockoutDuration,
-		passwordCheckSyntax
-
-objectclass glue
-		oid  2.16.840.1.113730.3.2.30
-		superior top
-
-objectclass netscapeMachineData
-		oid  2.16.840.1.113730.3.2.32
-		superior top
-
-objectclass dcObject
-	oid 1.3.6.1.4.1.1466.344
-	superior top
-	requires 
-		dc
-
-objectclass subschema
-	oid 2.5.20.1
-	superior top
-	allows 
-		cn,
-		dITStructureRules,
-		nameForms,
-		dITContentRules,
-		objectClasses,
-		attributeTypes,
-		matchingRules,
-		matchingRuleUse
diff --git a/ldap/cm/v4confs/40/java-object-schema.conf b/ldap/cm/v4confs/40/java-object-schema.conf
deleted file mode 100644
index 7a6c0ef5..00000000
--- a/ldap/cm/v4confs/40/java-object-schema.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Schema for storing java objects and java object references
-
-attribute javaClassName			1.3.6.1.4.1.42.2.27.4.1.6	ces	single
-
-attribute javaCodebase			1.3.6.1.4.1.42.2.27.4.1.7	ces
-
-attribute javaSerializedData	1.3.6.1.4.1.42.2.27.4.1.8	bin single
-
-attribute javaFactory			1.3.6.1.4.1.42.2.27.4.1.10	ces single
-
-attribute javaReferenceAddress	1.3.6.1.4.1.42.2.27.4.1.11	ces
-
-attribute javaDoc	1.3.6.1.4.1.42.2.27.4.1.12	ces
-
-attribute javaClassNames	1.3.6.1.4.1.42.2.27.4.1.13	ces
-
-objectclass javaContainer
-	oid 1.3.6.1.4.1.42.2.27.4.2.1
-	superior top
-	requires
-		cn
-
-objectclass javaObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.4
-	superior top
-	requires
-		javaClassName
-	allows
-		javaClassNames,
-		javaCodebase,
-		javaDoc,
-		description
-
-objectclass javaSerializedObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.5
-	superior javaObject
-	requires
-		javaSerializedData
-
-objectclass javaNamingReference
-	oid 1.3.6.1.4.1.42.2.27.4.2.7
-	superior javaObject
-	allows
-		javaReferenceAddress,
-        javaFactory
-
-objectclass javaMarshalledObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.8
-	superior javaObject
-	requires
-		javaSerializedData
diff --git a/ldap/cm/v4confs/40/ns-admin-schema.conf b/ldap/cm/v4confs/40/ns-admin-schema.conf
deleted file mode 100644
index 3e0acf62..00000000
--- a/ldap/cm/v4confs/40/ns-admin-schema.conf
+++ /dev/null
diff --git a/ldap/cm/v4confs/40/ns-calendar-globopt.conf b/ldap/cm/v4confs/40/ns-calendar-globopt.conf
deleted file mode 100644
index 9b49a483..00000000
--- a/ldap/cm/v4confs/40/ns-calendar-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-index   nsCalXItemId    pres,eq,sub
diff --git a/ldap/cm/v4confs/40/ns-calendar-schema.conf b/ldap/cm/v4confs/40/ns-calendar-schema.conf
deleted file mode 100644
index 1df0b736..00000000
--- a/ldap/cm/v4confs/40/ns-calendar-schema.conf
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsCalAccess                 2.16.840.1.113730.3.1.112  cis     
-attribute nsCalAccessDomain           2.16.840.1.113730.3.1.113  cis     
-attribute nsCalAdmd                   2.16.840.1.113730.3.1.114  cis     
-attribute nsCalDefaultNoteReminder    2.16.840.1.113730.3.1.115  cis     
-attribute nsCalDefaultReminder        2.16.840.1.113730.3.1.116  cis     
-attribute nsCalDefaultTaskReminder    2.16.840.1.113730.3.1.117  cis     
-attribute nsCalDisplayPrefs           2.16.840.1.113730.3.1.118  cis     
-attribute nsCalFlags                  2.16.840.1.113730.3.1.119  cis     
-attribute nsCalHost                   2.16.840.1.113730.3.1.120  cis     
-attribute nsCalLanguageId             2.16.840.1.113730.3.1.121  cis     
-attribute nsCalNodeAlias              2.16.840.1.113730.3.1.122  cis     
-attribute nsCalNotifMechanism         2.16.840.1.113730.3.1.123  cis     
-attribute nsCalOperatingPrefs         2.16.840.1.113730.3.1.124  cis     
-attribute nsCalOrgUnit2               2.16.840.1.113730.3.1.125  cis     
-attribute nsCalOrgUnit3               2.16.840.1.113730.3.1.126  cis     
-attribute nsCalOrgUnit4               2.16.840.1.113730.3.1.127  cis     
-attribute nsCalPasswordRequired       2.16.840.1.113730.3.1.128  cis     
-attribute nsCalPrmd                   2.16.840.1.113730.3.1.129  cis     
-attribute nsCalRefreshPrefs           2.16.840.1.113730.3.1.130  cis     
-attribute nsCalResourceCapacity       2.16.840.1.113730.3.1.131  cis     
-attribute nsCalResourceNumber         2.16.840.1.113730.3.1.132  cis     
-attribute nsCalServerVersion          2.16.840.1.113730.3.1.133  cis     
-attribute nsCalSysopCanWritePassword  2.16.840.1.113730.3.1.134  cis     
-attribute nsCalTimezone               2.16.840.1.113730.3.1.135  cis     
-attribute nsCalXItemId                2.16.840.1.113730.3.1.136  cis     
-
-
-objectclass nsCalUser
-		oid 2.16.840.1.113730.3.2.14
-        requires
-                objectClass
-        allows
-		c,
-		employeeNumber,
-                generationQualifier,
-		givenName,
-		initials,
-		mail,
-		o,
-		ou,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalRefreshPrefs,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass nsCalAdmin
-		oid 2.16.840.1.113730.3.2.15
-        requires
-                objectClass
-        allows
-		c,
-                cn,
-                facsimileTelephoneNumber,
-                generationQualifier,
-                givenName,
-                initials,
-		mail,
-		o,
-                ou,
-                postalAddress,
-                sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalXItemId
-
-objectclass nsCalResource
-		oid 2.16.840.1.113730.3.2.16
-        requires
-                objectClass
-        allows
-                cn,
-                facsimileTelephoneNumber,
-		givenName,
-		mail,
-                postalAddress,
-		sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalPasswordRequired,
-                nsCalRefreshPrefs,
-                nsCalResourceCapacity,
-                nsCalResourceNumber,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass netscapeCalendarServer
-		oid 2.16.840.1.113730.3.2.17
-        requires
-                objectclass
-
-
-
diff --git a/ldap/cm/v4confs/40/ns-certificate-globopt.conf b/ldap/cm/v4confs/40/ns-certificate-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/40/ns-certificate-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/40/ns-certificate-schema.conf b/ldap/cm/v4confs/40/ns-certificate-schema.conf
deleted file mode 100644
index 02efd5a2..00000000
--- a/ldap/cm/v4confs/40/ns-certificate-schema.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-attribute 	nsCertConfig 	cis
-
-objectclass netscapeCertificateServer
-                oid 2.16.840.1.113730.3.2.18
-        requires
-                objectclass
-
-objectclass nsCertificateServer
-        requires
-                objectclass,
-                nsServerID
-        allows
-                serverHostName,
-                nsServerPort,
-		nsCertConfig
-
-
diff --git a/ldap/cm/v4confs/40/ns-common-schema.conf b/ldap/cm/v4confs/40/ns-common-schema.conf
deleted file mode 100644
index f436bacc..00000000
--- a/ldap/cm/v4confs/40/ns-common-schema.conf
+++ /dev/null
@@ -1,277 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Common LDAP schema configuration file
-#
-# Version: 4.0
-# Description:
-#   This configuration file contains objectclasses and attributes 
-#   common to the Mission Control Framework
-#
-
-#############################################################
-# Attributes
-#############################################################
-
-#
-# Common Attributes
-#
-attribute nsServerID  			cis
-attribute nsBaseDN    			cis
-attribute nsBindDN    			cis
-attribute nsBindPassword 		cis
-attribute nsServerPort			cis
-attribute nsServerAddress 		cis
-attribute nsDirectoryInfoRef		dn
-attribute nsDirectoryURL		ces
-
-#
-# nsAdminDomain
-#
-attribute	nsAdminDomainName	cis
-
-#
-# nsHost
-#
-attribute	nsHostLocation 		cis
-attribute	nsHardwarePlatform	cis
-attribute	nsOsVersion		cis
-
-#
-# nsAdminGroup
-#
-attribute	nsAdminGroupName	cis
-attribute	nsConfigRoot		cis
-attribute 	nsAdminSIEDN		dn
-
-#
-# nsApplication
-#
-attribute	nsVendor		cis
-attribute	nsProductName		cis
-attribute	nsNickName		cis
-attribute	nsProductVersion	cis
-attribute	nsBuildNumber		cis
-attribute	nsRevisionNumber	cis
-attribute	nsSerialNumber		cis
-attribute	nsInstalledLocation	cis
-attribute	nsExpirationDate	cis
-attribute	nsBuildSecurity		cis
-attribute	nsServerMigrationClassname	cis
-attribute	nsServerCreationClassname	cis
-attribute       nsLdapSchemaVersion     cis
-
-#
-# nsConfig
-#
-attribute	nsSuiteSpotUser		cis
-attribute	nsErrorLog		cis
-attribute	nsPidLog		cis
-attribute	nsAccessLog		cis
-attribute	nsDefaultAcceptLanguage	cis
-attribute	nsServerSecurity	cis
-
-#
-# nsEncryptionConfig
-#
-attribute	nsCertfile		cis
-attribute	nsKeyfile		cis
-attribute	nsSSL2			cis
-attribute	nsSSL3			cis
-attribute	nsSSLClientAuth		cis
-attribute	nsSSLSessionTimeout	cis
-attribute	nsSSL3SessionTimeout	cis
-attribute	nsSSL2Ciphers		cis
-attribute	nsSSL3Ciphers		cis
-
-#
-# nsEncryptionModule
-#
-attribute	nsSSLToken		cis
-attribute	nsSSLPersonalitySSL	cis
-attribute	nsSSLActivation		cis
-
-#
-# nsTask
-#
-attribute	nsTaskLabel		cis
-attribute	nsHelpRef		cis
-attribute	nsExecRef		cis
-attribute	nsLogSuppress		cis
-
-#
-# nsAdminObject
-#
-attribute	nsJarfilename		cis
-attribute	nsClassname		cis
-
-
-#############################################################
-# Object Classes
-#############################################################
-objectclass nsAdminDomain
-    superior organizationalUnit
-    allows
-	nsAdminDomainName
-
-objectclass nsHost
-    superior top
-    requires
-        cn
-    allows
-        serverHostName,
-        description,
-        l,
-        nsHostLocation,
-        nsHardwarePlatform,
-        nsOsVersion
-
-objectclass nsAdminGroup
-    superior top
-    requires
-        cn
-    allows
-	nsAdminGroupName,
-        description,
-        nsConfigRoot,
-	nsAdminSIEDN
-
-objectclass nsApplication
-    superior top
-    requires 
-        cn
-    allows 
-        nsVendor,
-        description, 
-        nsProductName,                 
-        nsNickName,           
-        nsProductVersion,              
-        nsBuildNumber, 
-        nsRevisionNumber,       
-        nsSerialNumber, 
-        nsInstalledLocation,    
-        installationTimeStamp,
-        nsExpirationDate,       
-        nsBuildSecurity,
-	nsLdapSchemaVersion,
-        nsServerMigrationClassname,
-        nsServerCreationClassname
-
-objectclass nsEncryptionConfig
-    superior top
-    requires
-        cn
-    allows
-        nsCertfile,
-        nsKeyfile,
-        nsSSL2,
-        nsSSL3,
-        nsSSLSessionTimeout,
-        nsSSL3SessionTimeout,
-        nsSSLClientAuth,
-        nsSSL2Ciphers,
-        nsSSL3Ciphers
- 
-objectclass nsEncryptionModule
-    superior top
-    requires
-        cn
-    allows
-        nsSSLToken,
-        nsSSLPersonalityssl,
-        nsSSLActivation
-
-
-objectclass nsResourceRef
-    superior top
-    requires
-        cn
-    allows
-        seeAlso
-            
-objectclass nsTask
-    superior top
-    requires
-        cn
-    allows
-        nsTaskLabel,
-        nsHelpref,
-        nsExecref,
-        nsLogSuppress
-    
-objectclass nsTaskGroup
-    superior top
-    requires
-        cn
-    allows
-        nsTaskLabel
-
-objectclass nsAdminObject
-    superior top
-    requires
-        cn
-    allows
-        nsJarFilename,
-        nsClassName    
-        
-objectclass nsConfig
-    superior top
-    requires
-        cn
-    allows
-        description,
-        nsServerPort,
-	nsServerAddress,
-        nsSuiteSpotUser,
-        nsErrorLog,
-        nsPidLog,
-        nsAccessLog,
-        nsDefaultAcceptLanguage,
-	nsServerSecurity
-
-objectclass nsDirectoryInfo
-    superior top
-    requires 
-	cn
-    allows
-	nsBindDN,
-	nsBindPassword,
-	nsDirectoryURL,
-	nsDirectoryInfoRef
diff --git a/ldap/cm/v4confs/40/ns-compass-globopt.conf b/ldap/cm/v4confs/40/ns-compass-globopt.conf
deleted file mode 100644
index 6c56c350..00000000
--- a/ldap/cm/v4confs/40/ns-compass-globopt.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	pipuid			pres,eq,sub
-index	pipstatus		eq
-
diff --git a/ldap/cm/v4confs/40/ns-compass-schema.conf b/ldap/cm/v4confs/40/ns-compass-schema.conf
deleted file mode 100644
index 52997ea4..00000000
--- a/ldap/cm/v4confs/40/ns-compass-schema.conf
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-
-# Compass server specific (not currently used) 
-
-objectclass netscapeCompassServer
-		oid 2.16.840.1.113730.3.2.19
-        requires        
-                objectclass
-
-
-# Attributes for personal interest profile classes
-
-attribute pipuid                      2.16.840.1.113730.3.1.137  cis     
-attribute pipcompassservers           2.16.840.1.113730.3.1.138  cis     
-attribute pipuniqueid                 2.16.840.1.113730.3.1.139  cis     
-attribute pipstatus                   2.16.840.1.113730.3.1.140  cis     
-attribute pipusertype                 2.16.840.1.113730.3.1.141  cis     
-attribute pipfrequency                2.16.840.1.113730.3.1.142  cis     
-attribute pipmedium                   2.16.840.1.113730.3.1.143  cis     
-attribute pipformat                   2.16.840.1.113730.3.1.144  cis     
-attribute piphour                     2.16.840.1.113730.3.1.145  cis     
-attribute pipmaxhits                  2.16.840.1.113730.3.1.146  cis     
-attribute pipresultset                2.16.840.1.113730.3.1.147  cis     
-attribute pipsortorder                2.16.840.1.113730.3.1.148  cis     
-attribute piptimestamp                2.16.840.1.113730.3.1.149  cis     
-attribute pipirlist                   2.16.840.1.113730.3.1.150  cis     
-attribute pipiroption                 2.16.840.1.113730.3.1.151  cis     
-attribute pippwp                      2.16.840.1.113730.3.1.152  cis     
-attribute piplastcount                2.16.840.1.113730.3.1.153  cis     
-attribute piptotalcount               2.16.840.1.113730.3.1.154  cis     
-attribute piptotalrun                 2.16.840.1.113730.3.1.155  cis     
-attribute pipnotify                   2.16.840.1.113730.3.1.156  cis     
-attribute pipprivilege                2.16.840.1.113730.3.1.157  cis     
-attribute pipgroup                    2.16.840.1.113730.3.1.158  cis     
-attribute pipidstcount                2.16.840.1.113730.3.1.159  cis     
-attribute pipstid                     2.16.840.1.113730.3.1.160  cis     
-attribute pipstname                   2.16.840.1.113730.3.1.161  cis     
-attribute pipstquery                  2.16.840.1.113730.3.1.162  cis     
-attribute pipsttaxonomy               2.16.840.1.113730.3.1.163  cis     
-attribute pipstinterest               2.16.840.1.113730.3.1.164  cis     
-attribute pipsttype                   2.16.840.1.113730.3.1.165  cis     
-attribute pipstprivacy                2.16.840.1.113730.3.1.166  cis     
-attribute pipststatus                 2.16.840.1.113730.3.1.167  cis     
-attribute pipstlastcount              2.16.840.1.113730.3.1.168  cis     
-attribute pipsttotalcount             2.16.840.1.113730.3.1.169  cis     
-attribute pipsttotalrun               2.16.840.1.113730.3.1.170  cis     
-attribute pipstcategory               2.16.840.1.113730.3.1.171  cis     
-attribute pipstfrequency              2.16.840.1.113730.3.1.172  cis     
-attribute pipstmedium                 2.16.840.1.113730.3.1.173  cis     
-attribute pipstformat                 2.16.840.1.113730.3.1.174  cis     
-attribute pipsthour                   2.16.840.1.113730.3.1.175  cis     
-attribute pipstmaxhits                2.16.840.1.113730.3.1.176  cis     
-attribute pipstresultset              2.16.840.1.113730.3.1.177  cis     
-attribute pipstsortorder              2.16.840.1.113730.3.1.178  cis     
-attribute pipsttimestamp              2.16.840.1.113730.3.1.179  cis     
-attribute pipstirlist                 2.16.840.1.113730.3.1.180  cis     
-attribute pipstiroption               2.16.840.1.113730.3.1.181  cis     
-attribute pipreservedcis1             2.16.840.1.113730.3.1.182  cis     
-attribute pipreservedcis2             2.16.840.1.113730.3.1.183  cis     
-attribute pipreservedcis3             2.16.840.1.113730.3.1.184  cis     
-attribute pipreservedcis4             2.16.840.1.113730.3.1.185  cis     
-attribute pipreservedcis5             2.16.840.1.113730.3.1.186  cis     
-attribute pipreservedcis6             2.16.840.1.113730.3.1.187  cis     
-attribute pipreservedces1             2.16.840.1.113730.3.1.188  ces     
-attribute pipreservedces2             2.16.840.1.113730.3.1.189  ces     
-attribute pipreservedces3             2.16.840.1.113730.3.1.190  ces     
-
-
-# Each interest profile is one of these and sits under the compass SIE
-
-objectclass personalInterestProfile 
-		oid 2.16.840.1.113730.3.2.20
-        requires        
-                objectclass,
-		pipuid
-	allows
-		pipuniqueid,
-		pipstatus,
-		pipusertype,
-		pipfrequency,
-		pipmedium,
-		pipformat,
-		piphour,
-		pipmaxhits,
-		pipresultset,
-		pipsortorder,
-		piptimestamp,
-		pipirlist,
-		pipiroption,
-		pippwp,
-		piplastcount,
-		piptotalcount,
-		piptotalrun,
-		pipnotify,
-		pipprivilege,
-		pipgroup,
-		pipidstcount,
-		pipstid,
-		pipstname,
-		pipstquery,
-		pipsttaxonomy,
-		pipstinterest,
-		pipsttype,
-		pipstprivacy,
-		pipststatus,
-		pipstlastcount,
-		pipsttotalcount,
-		pipsttotalrun,
-		pipstcategory,
-		pipstfrequency,
-		pipstmedium,
-		pipstformat,
-		pipsthour,
-		pipstmaxhits,
-		pipstresultset,
-		pipstsortorder,
-		pipsttimestamp,
-		pipstirlist,
-		pipstiroption,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
-
-# Replication of user info for template users, completeness, etc.
-# (not currently used)
-
-objectclass PIPUserInfo
-		oid 2.16.840.1.113730.3.2.21
-        requires        
-                objectclass
-	allows
-		cn,
-		mail,
-		userPassword,
-		description,
-		pipcompassservers,
-		pipuniqueid
-
-
-# Enhancements to a normal user entry (not currently used)
-
-objectclass PIPUser
-	oid 2.16.840.1.113730.3.2.22		
-	requires        
-        objectclass
-	allows
-		pipuniqueid,
-		pipcompassservers,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
diff --git a/ldap/cm/v4confs/40/ns-cos-schema.conf b/ldap/cm/v4confs/40/ns-cos-schema.conf
deleted file mode 100644
index abea53fd..00000000
--- a/ldap/cm/v4confs/40/ns-cos-schema.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Attributes used by Class of Service
-
-attribute cosAttribute 2.16.840.1.113730.3.1.550 cis
-attribute cosSpecifier 2.16.840.1.113730.3.1.551 cis
-attribute cosTargetTree 2.16.840.1.113730.3.1.552 cis
-attribute cosTemplateDn 2.16.840.1.113730.3.1.553 cis
-
-# Object classes used by Class of Service
-
-objectclass cosDefinition
-	oid 2.16.840.1.113730.3.2.84
-	superior top
-	requires
-		objectclass
-	allows
-		aci,
-		cn,
-		uid,
-		costargettree,
-		costemplatedn,
-		cosspecifier,
-		cosattribute
diff --git a/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
deleted file mode 100644
index 57e510f5..00000000
--- a/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Netscape Delegated Administrator LDAP Schema
-#
-# Version: 1.0
-#
-# Attributes and objectclasses for:
-#
-# Netscape Delegated Administrator 1.0
-#
-# DT 9/24/98
-
-#############################################################
-# Delegated User Administration Attributes
-#############################################################
-
-attribute       nsNumUsers		cis
-attribute	nsMaxUsers		cis
-attribute	nsNumDepts		cis
-attribute	nsMaxDepts		cis
-attribute	nsNumDomains		cis
-attribute	nsDefaultMaxDeptSize	cis
-attribute	nsSearchFilter	        cis
-
-#############################################################
-# Delegated User Administration Objectclasses
-#############################################################
-
-objectclass nsManagedISP
-	superior top
-	allows
-		nsNumDomains
-
-objectclass nsManagedDomain
-	superior top
-	allows
-		owner,
-		nsNumUsers,
-		nsMaxUsers,
-		nsNumDepts,
-		nsMaxDepts,
-		nsDefaultMaxDeptSize
-
-objectclass nsManagedDept
-	superior groupofuniquenames
-	allows
-		owner,
-		nsNumUsers,
-		nsMaxUsers
-
-objectclass nsManagedPerson
-	superior top
-	allows
-		owner,
-		nsSearchFilter
-
diff --git a/ldap/cm/v4confs/40/ns-directory-globopt.conf b/ldap/cm/v4confs/40/ns-directory-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/40/ns-directory-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/40/ns-directory-schema.conf b/ldap/cm/v4confs/40/ns-directory-schema.conf
deleted file mode 100644
index ef4ed640..00000000
--- a/ldap/cm/v4confs/40/ns-directory-schema.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute	nsSecureServerPort 		cis
-
-objectclass netscapeDirectoryServer
-		oid 2.16.840.1.113730.3.2.23
-        requires        
-                objectclass
-
-objectclass nsDirectoryServer
-        requires
-                objectclass,
-                nsServerID
-        allows
-                serverHostName,
-                nsServerPort,
-                nsSecureServerPort,
-                nsBindPassword,
-                nsBindDN,
-                nsBaseDN
diff --git a/ldap/cm/v4confs/40/ns-legacy-schema.conf b/ldap/cm/v4confs/40/ns-legacy-schema.conf
deleted file mode 100644
index 5bd96446..00000000
--- a/ldap/cm/v4confs/40/ns-legacy-schema.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-attribute    url                    	cis
-
-#use by Netscape Admin Server 4.0 for LegacyServers
-
-objectclass nsLegacyAdminGroup
-	superior
-		nsAdminGroup
-	allows
-		adminUrl
-
-objectclass nsLegacyApplication
-	superior 
-	     nsApplication
-	allows 
-
-objectclass nsLegacyAdminServer
-        superior
-                nsAdminServer
-        allows
-
-objectclass nsLegacyServer 
-	superior 
-	     netscapeServer
-	allows 
-	     nsServerID,
-	     url
diff --git a/ldap/cm/v4confs/40/ns-mail-globopt.conf b/ldap/cm/v4confs/40/ns-mail-globopt.conf
deleted file mode 100644
index cf392ea4..00000000
--- a/ldap/cm/v4confs/40/ns-mail-globopt.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Messaging Server
-index	mailAlternateAddress	eq
-index	mailHost	eq
-#index	uid,mail	eq
-#index	uniquemember,member	eq
diff --git a/ldap/cm/v4confs/40/ns-mail-schema.conf b/ldap/cm/v4confs/40/ns-mail-schema.conf
deleted file mode 100644
index 4b816214..00000000
--- a/ldap/cm/v4confs/40/ns-mail-schema.conf
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-attribute	mailAccessDomain	2.16.840.1.113730.3.1.12 cis
-attribute	mailAlternateAddress	2.16.840.1.113730.3.1.13 cis
-attribute	mailAutoReplyMode	2.16.840.1.113730.3.1.14 cis
-attribute	mailAutoReplyText	2.16.840.1.113730.3.1.15 cis
-attribute	mailDeliveryOption	2.16.840.1.113730.3.1.16 cis
-attribute	mailForwardingAddress	2.16.840.1.113730.3.1.17 cis
-attribute	mailHost		2.16.840.1.113730.3.1.18 cis
-attribute	mailQuota		2.16.840.1.113730.3.1.21 cis
-attribute	mailRoutingAddress      2.16.840.1.113730.3.1.47 cis
-
-attribute	mailMessageStore	2.16.840.1.113730.3.1.19 ces
-attribute	mailProgramDeliveryInfo	2.16.840.1.113730.3.1.20 ces
-
-# mailRecipient is used to designate an LDAP entry as representing some
-# entity that can receive mail, e.g. a mail user or mail group.
-# Note: attributes 'mailAccessDomain' through 'userPassword' do not
-# belong to mailRecipient, but are included here for backward compatibility.
-objectClass mailRecipient
-	oid 2.16.840.1.113730.3.2.3
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mailAccessDomain,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota,
-		multiLineDescription,
-		uid,
-		userPassword
-
-# nsMessagingServerUser is used to designate an LDAP entry as representing a
-# Netscape Messaging Server user account.  It is used in combination with
-# mailRecipient.
-objectClass nsMessagingServerUser
-	oid 2.16.840.113730.3.2.37
-	requires
-		objectClass
-	allows
-		cn,
-		mailAccessDomain,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota
-
-attribute	mgrpAllowedDomain	2.16.840.1.113730.3.1.23 cis
-attribute	mgrpMsgRejectAction	2.16.840.1.113730.3.1.28 cis
-attribute	mgrpRFC822MailMember	2.16.840.1.113730.3.1.30 cis
-attribute	mgrpMsgMaxSize		2.16.840.1.113730.3.1.32 cis single
-attribute	mgrpBroadcasterPolicy	cis single
-attribute	mgrpNoDuplicateChecks	cis single
-attribute	mgrpRemoveHeader	cis
-
-attribute	mgrpAllowedBroadcaster	2.16.840.1.113730.3.1.22 ces
-attribute	mgrpDeliverTo		2.16.840.1.113730.3.1.25 ces
-attribute	mgrpErrorsTo		2.16.840.1.113730.3.1.26 ces single
-attribute	mgrpModerator		2.16.840.1.113730.3.1.33 ces
-attribute	mgrpMsgRejectText	2.16.840.1.113730.3.1.29 ces
-attribute	mgrpAddHeader		ces
-
-attribute	mgrpApprovePassword	ces single
-
-# mailGroup is used to designate an LDAP entry as representing a mail group
-# (mailing list).  It is used in combination with mailRecipient.
-# Note: attributes 'mail' through 'mailRoutingAddress' belong to mailRecipient,
-# but are also included here for backward compatibility.
-objectClass mailGroup
-	oid 2.16.840.1.113730.3.2.4
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mgrpAddHeader,
-		mgrpAllowedBroadcaster,
-		mgrpAllowedDomain,
-		mgrpApprovePassword,
-		mgrpBroadcasterPolicy,
-		mgrpDeliverTo,
-		mgrpErrorsTo,
-		mgrpModerator,
-		mgrpMsgMaxSize,
-		mgrpMsgRejectAction,
-		mgrpMsgRejectText,
-		mgrpNoDuplicateChecks,
-		mgrpRemoveHeader,
-		mgrpRFC822MailMember,
-		owner
-
-attribute	mailEnhancedUniqueMember	2.16.840.1.113730.3.1.31 dn
-
-objectClass groupOfMailEnhancedUniqueNames
-	oid 2.16.840.1.113730.3.2.5
-	requires
-		objectClass,
-		cn
-	allows
-		businessCategory,
-		description,
-		mailEnhancedUniqueMember,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectClass	netscapeMailServer
-	oid 2.16.840.1.113730.3.2.24
-	requires
-		objectClass
diff --git a/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
deleted file mode 100644
index a7e0be55..00000000
--- a/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# ns-mcd-browser-schema.conf
-#
-# Netscape Mission Control Desktop browser client schema
-# This schema is used to hold browser client preferences.
-#
-
-attribute nsBCStartupBrowser              2.16.840.1.113730.3.1.409  cis
-attribute nsBCStartupMail                 2.16.840.1.113730.3.1.410  cis
-attribute nsBCStartupEditor               2.16.840.1.113730.3.1.411  cis
-attribute nsBCStartupCalendar             2.16.840.1.113730.3.1.412  cis
-attribute nsBCChromeButtonStyle           2.16.840.1.113730.3.1.413  cis
-attribute nsBCUseDocumentFonts            2.16.840.1.113730.3.1.414  cis
-attribute nsBCForegroundColor             2.16.840.1.113730.3.1.415  cis
-attribute nsBCBackgroundColor             2.16.840.1.113730.3.1.416  cis
-attribute nsBCAnchorColor                 2.16.840.1.113730.3.1.417  cis
-attribute nsBCVisitedColor                2.16.840.1.113730.3.1.418  cis
-attribute nsBCUnderlineAnchors            2.16.840.1.113730.3.1.419  cis
-attribute nsBCUseDocumentColors           2.16.840.1.113730.3.1.420  cis
-attribute nsBCStartupPage                 2.16.840.1.113730.3.1.421  cis
-attribute nsBCStartupHomePage             2.16.840.1.113730.3.1.422  cis
-attribute nsBCLinkExpiration              2.16.840.1.113730.3.1.423  cis
-attribute nsBCIntlAcceptLanguages         2.16.840.1.113730.3.1.424  cis
-attribute nsBCMimeType                    2.16.840.1.113730.3.1.425  cis
-attribute nsBCMimeAllowAdd                2.16.840.1.113730.3.1.426  cis
-attribute nsBCMimeAllowEdit               2.16.840.1.113730.3.1.427  cis
-attribute nsBCMimeAllowRemove             2.16.840.1.113730.3.1.428  cis
-attribute nsBCRelatedEnabled              2.16.840.1.113730.3.1.429  cis
-attribute nsBCRelatedAutoload             2.16.840.1.113730.3.1.430  cis
-attribute nsBCRelatedDisabledForDomains   2.16.840.1.113730.3.1.431  cis
-attribute nsBCGoBrowsingEnabled           2.16.840.1.113730.3.1.432  cis
-attribute nsBCOfflineStartupState         2.16.840.1.113730.3.1.433  cis
-attribute nsBCOfflineSendUnsentMessages   2.16.840.1.113730.3.1.434  cis
-attribute nsBCOfflinePromptSynchOnExit    2.16.840.1.113730.3.1.435  cis
-attribute nsBCAlwaysLoadImages            2.16.840.1.113730.3.1.436  cis
-attribute nsBCEnableJava                  2.16.840.1.113730.3.1.437  cis
-attribute nsBCEnableJavaScript            2.16.840.1.113730.3.1.438  cis
-attribute nsBCEnableStyleSheets           2.16.840.1.113730.3.1.439  cis
-attribute nsBCEmailAsFtpPassword          2.16.840.1.113730.3.1.440  cis
-attribute nsBCCookieBehavior              2.16.840.1.113730.3.1.441  cis
-attribute nsBCWarnAboutCookies            2.16.840.1.113730.3.1.442  cis
-attribute nsBCMemoryCacheSize             2.16.840.1.113730.3.1.443  cis
-attribute nsBCDiskCacheSize               2.16.840.1.113730.3.1.444  cis
-attribute nsBCCheckDocFrequency           2.16.840.1.113730.3.1.445  cis
-attribute nsBCProxyType                   2.16.840.1.113730.3.1.446  cis
-attribute nsBCProxyHttp                   2.16.840.1.113730.3.1.447  cis
-attribute nsBCProxySsl                    2.16.840.1.113730.3.1.448  cis
-attribute nsBCProxyFtp                    2.16.840.1.113730.3.1.449  cis
-attribute nsBCProxySocks                  2.16.840.1.113730.3.1.450  cis
-attribute nsBCProxyGopher                 2.16.840.1.113730.3.1.451  cis
-attribute nsBCProxyWais                   2.16.840.1.113730.3.1.452  cis
-attribute nsBCNoProxiesOn                 2.16.840.1.113730.3.1.453  cis
-attribute nsBCProxyAutoConfigUrl          2.16.840.1.113730.3.1.454  cis
-attribute nsBCAutoUpdateEnabled           2.16.840.1.113730.3.1.455  cis
-attribute nsBCAutoUpdateConfirmInstall    2.16.840.1.113730.3.1.456  cis
-
-
-objectclass nsBrowserClient 
-	oid 2.16.840.1.113730.3.2.78
-    superior top 
-    allows 
-	nsBCStartupBrowser,
-	nsBCStartupMail,
-	nsBCStartupEditor,
-	nsBCStartupCalendar,
-	nsBCChromeButtonStyle,
-	nsBCUseDocumentFonts,
-	nsBCForegroundColor,
-	nsBCBackgroundColor,
-	nsBCAnchorColor,
-	nsBCVisitedColor,
-	nsBCUnderlineAnchors,
-	nsBCUseDocumentColors,
-	nsBCStartupPage,
-	nsBCStartupHomePage,
-	nsBCLinkExpiration,
-	nsBCIntlAcceptLanguages,
-	nsBCMimeType,
-	nsBCMimeAllowAdd,
-	nsBCMimeAllowEdit,
-	nsBCMimeAllowRemove,
-	nsBCRelatedEnabled,
-	nsBCRelatedAutoload,
-	nsBCRelatedDisabledForDomains,
-	nsBCGoBrowsingEnabled,
-	nsBCOfflineStartupState,
-	nsBCOfflineSendUnsentMessages,
-	nsBCOfflinePromptSynchOnExit,
-	nsBCAlwaysLoadImages,
-	nsBCEnableJava,
-	nsBCEnableJavaScript,
-	nsBCEnableStyleSheets,
-	nsBCEmailAsFtpPassword,
-	nsBCCookieBehavior,
-	nsBCWarnAboutCookies,
-	nsBCMemoryCacheSize,
-	nsBCDiskCacheSize,
-	nsBCCheckDocFrequency,
-	nsBCProxyType,
-	nsBCProxyHttp,
-	nsBCProxySsl,
-	nsBCProxyFtp,
-	nsBCProxySocks,
-	nsBCProxyGopher,
-	nsBCProxyWais,
-	nsBCNoProxiesOn,
-	nsBCProxyAutoConfigUrl,
-	nsBCAutoUpdateEnabled,
-	nsBCAutoUpdateConfirmInstall
-
-# 
-# Netscape Mission Control Desktop browser security schema
-# This schema is used to hold browser security preferences.
-#
-
-attribute nsBSAskForPassword              2.16.840.1.113730.3.1.457  cis
-attribute nsBSPasswordLifetime            2.16.840.1.113730.3.1.458  cis
-attribute nsBSWarnEnteringSecure          2.16.840.1.113730.3.1.459  cis
-attribute nsBSWarnLeavingSecure           2.16.840.1.113730.3.1.460  cis
-attribute nsBSWarnViewingMixed            2.16.840.1.113730.3.1.461  cis
-attribute nsBSWarnSubmitInsecure          2.16.840.1.113730.3.1.462  cis
-attribute nsBSEnableSsl2                  2.16.840.1.113730.3.1.463  cis
-attribute nsBSEnableSsl3                  2.16.840.1.113730.3.1.464  cis
-attribute nsBSCertmgmtDisableFunctionMsg  2.16.840.1.113730.3.1.465  cis
-attribute nsBSSsl2Rc4128                  2.16.840.1.113730.3.1.466  cis
-attribute nsBSSsl2Rc2128                  2.16.840.1.113730.3.1.467  cis
-attribute nsBSSsl2DesEd3192               2.16.840.1.113730.3.1.468  cis
-attribute nsBSSsl2Des64                   2.16.840.1.113730.3.1.469  cis
-attribute nsBSSsl2Rc440                   2.16.840.1.113730.3.1.470  cis
-attribute nsBSSsl2Rc240                   2.16.840.1.113730.3.1.471  cis
-attribute nsBSSsl3RsaRc4128Md5            2.16.840.1.113730.3.1.472  cis
-attribute nsBSSsl3FipsDesEd3Sha           2.16.840.1.113730.3.1.473  cis
-attribute nsBSSsl3RsaRc4128Md5            2.16.840.1.113730.3.1.474  cis
-attribute nsBSSsl3RsaFipsDesSha           2.16.840.1.113730.3.1.475  cis
-attribute nsBSSsl3RsaDesSha               2.16.840.1.113730.3.1.476  cis
-attribute nsBSSsl3RsaRc440Md5             2.16.840.1.113730.3.1.477  cis
-attribute nsBSSsl3RsaRc240Md5             2.16.840.1.113730.3.1.478  cis
-attribute nsBSSsl3RsaNullMd5              2.16.840.1.113730.3.1.479  cis
-attribute nsBSSsl3FortezzaFortezzaSha     2.16.840.1.113730.3.1.480  cis
-attribute nsBSSsl3FortezzaRc4Sha          2.16.840.1.113730.3.1.481  cis
-
-
-objectclass nsBrowserSecurity
-	oid 2.16.840.1.113730.3.2.79
-    superior top 
-    allows 
-	nsBSAskForPassword,
-	nsBSPasswordLifetime,
-	nsBSWarnEnteringSecure,
-	nsBSWarnLeavingSecure,
-	nsBSWarnViewingMixed,
-	nsBSWarnSubmitInsecure,
-	nsBSEnableSsl2,
-	nsBSEnableSsl3,
-	nsBSCertmgmtDisableFunctionMsg,
-	nsBSSsl2Rc4128,
-	nsBSSsl2Rc2128,
-	nsBSSsl2DesEd3192,
-	nsBSSsl2Des64,
-	nsBSSsl2Rc440,
-	nsBSSsl2Rc240,
-	nsBSSsl3RsaRc4128Md5,
-	nsBSSsl3FipsDesEd3Sha,
-	nsBSSsl3RsaRc4128Md5,
-	nsBSSsl3RsaFipsDesSha,
-	nsBSSsl3RsaDesSha,
-	nsBSSsl3RsaRc440Md5,
-	nsBSSsl3RsaRc240Md5,
-	nsBSSsl3RsaNullMd5,
-	nsBSSsl3FortezzaFortezzaSha,
-	nsBSSsl3FortezzaRc4Sha
-
diff --git a/ldap/cm/v4confs/40/ns-mcd-config-schema.conf b/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
deleted file mode 100644
index 2eeb6856..00000000
--- a/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# 
-# ns-mcd-config-schema.conf
-# 
-# Netscape Mission Control Desktop schema
-# This schema is used to set MCD "config()" preferences.
-#
-
-attribute nsMcdUserAgent                 2.16.840.1.113730.3.1.482  cis
-attribute nsMcdUseXSender                2.16.840.1.113730.3.1.483  cis
-attribute nsMcdToolbarLogoUrl            2.16.840.1.113730.3.1.484  cis
-attribute nsMcdToolbarLogoWinSmallFile   2.16.840.1.113730.3.1.485  cis
-attribute nsMcdToolbarLogoWinLargeFile   2.16.840.1.113730.3.1.486  cis
-attribute nsMcdToolbarLogoFrames         2.16.840.1.113730.3.1.487  cis
-attribute nsMcdMacAnimationFile          2.16.840.1.113730.3.1.488  cis
-attribute nsMcdXAnimationFile            2.16.840.1.113730.3.1.489  cis
-attribute nsMcdNetSearchUrl              2.16.840.1.113730.3.1.490  cis
-attribute nsMcdMoreInfoPluginUrl         2.16.840.1.113730.3.1.491  cis
-attribute nsMcdAutoAdminConfigUrl        2.16.840.1.113730.3.1.492  cis
-attribute nsMcdAutoAdminAppendEmail      2.16.840.1.113730.3.1.493  cis
-attribute nsMcdAutoAdminRefreshInterval  2.16.840.1.113730.3.1.494  cis
-attribute nsMcdUseGuideButton            2.16.840.1.113730.3.1.495  cis
-attribute nsMcdGuideButtonProperties     2.16.840.1.113730.3.1.496  cis
-attribute nsMcdGuideMenuProperties       2.16.840.1.113730.3.1.497  cis
-attribute nsMcdHelpMenuProperties        2.16.840.1.113730.3.1.498  cis
-
-
-objectclass nsMcdConfig
-	oid 2.16.840.1.113730.3.2.80
-    superior top 
-    allows 
-	nsMcdUserAgent,
-	nsMcdUseXSender,
-	nsMcdToolbarLogoUrl,
-	nsMcdToolbarLogoWinSmallFile,
-	nsMcdToolbarLogoWinLargeFile,
-	nsMcdToolbarLogoFrames,
-	nsMcdMacAnimationFile,
-	nsMcdXAnimationFile,
-	nsMcdNetSearchUrl,
-	nsMcdMoreInfoPluginUrl,
-	nsMcdAutoAdminConfigUrl,
-	nsMcdAutoAdminAppendEmail,
-	nsMcdAutoAdminRefreshInterval,
-	nsMcdUseGuideButton,
-	nsMcdGuideButtonProperties,
-	nsMcdGuideMenuProperties,
-	nsMcdHelpMenuProperties
-	
diff --git a/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
deleted file mode 100644
index 290c9062..00000000
--- a/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Index required by Mission Control Desktop: Location Independence
-index nsLIProfileName eq
diff --git a/ldap/cm/v4confs/40/ns-mcd-li-schema.conf b/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
deleted file mode 100644
index 82034846..00000000
--- a/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# ns-mcd-li-schema.conf
-#
-# Netscape Mission Control Desktop Location Independence schema
-#
-
-attribute nsLIPtrURL           2.16.840.1.113730.3.1.399        ces           
-attribute nsLIPrefs            2.16.840.1.113730.3.1.400        ces 
-attribute nsLIProfileName      2.16.840.1.113730.3.1.401        cis         
-attribute nsLIData             2.16.840.1.113730.3.1.402        bin 
-attribute nsLIElementType      2.16.840.1.113730.3.1.403        cis        
-attribute nsLIServerType       2.16.840.1.113730.3.1.404        cis
-attribute nsLIVersion          2.16.840.1.113730.3.1.405        int
-
-objectclass nsLIPtr
-	oid 2.16.840.1.113730.3.2.74
-	requires
-		objectclass
-	allows
-		nsliptrurl,
-		owner
-
-objectclass nsLIProfile
-	oid  2.16.840.1.113730.3.2.75
-	requires
-		objectclass,
-		nsliprofilename
-	allows
-		nsliprefs,
-		uid,
-		owner
-
-objectclass nsLIProfileElement
-	oid  2.16.840.1.113730.3.2.76
-	requires
-		objectclass,
-		nslielementtype
-	allows
-		owner,
-		nslidata,
-		nsliversion
-
-objectclass nsLIServer
-	oid  2.16.840.1.113730.3.2.77
-	requires
-		objectclass,
-		serverhostname
-	allows
-		description,
-		cn,
-		nsserverport,
-		nsliservertype,
-		serverroot
diff --git a/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
deleted file mode 100644
index b232563f..00000000
--- a/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
+++ /dev/null
@@ -1,251 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# 
-# ns-mcd-mail-schema.conf
-# 
-# Netscape Mission Control Desktop mail client schema
-# This schema is used to hold mail client preferences.
-#
-
-attribute nsMCHTMLCompose								2.16.840.1.113730.3.1.331		 cis
-attribute nsMCDefaultHTMLAction							2.16.840.1.113730.3.1.332		 cis
-attribute nsMCRequestReturnReceipt						2.16.840.1.113730.3.1.333		 cis
-attribute nsMCIncorporateReturnReceipt					2.16.840.1.113730.3.1.334		 cis
-attribute nsMCMDNReportEnabled							2.16.840.1.113730.3.1.335		 cis
-attribute nsMCMDNReportNotInToCC						2.16.840.1.113730.3.1.336		 cis
-attribute nsMCMDNReportOutsideDomain					2.16.840.1.113730.3.1.337		 cis
-attribute nsMCMDNReportOther							2.16.840.1.113730.3.1.338		 cis
-attribute nsMCForwardMessageMode						2.16.840.1.113730.3.1.339		 cis
-attribute nsMCAutoQuote									2.16.840.1.113730.3.1.340		 cis
-attribute nsMCReplyOnTop								2.16.840.1.113730.3.1.341		 cis
-attribute nsMCSpellCheckBeforeSend						2.16.840.1.113730.3.1.342		 cis
-attribute nsMCWrapLongLines								2.16.840.1.113730.3.1.343		 cis
-attribute nsMCWrapLength								2.16.840.1.113730.3.1.344		 cis
-attribute nsMCStrictlyMime								2.16.840.1.113730.3.1.345		 cis
-attribute nsMCAutoCompleteUseAddressBooks				2.16.840.1.113730.3.1.346		 cis
-attribute nsMCAutoCompleteUseDirectory					2.16.840.1.113730.3.1.347		 cis
-attribute nsMCAutoCompleteEnabledServerName				2.16.840.1.113730.3.1.348		 cis
-attribute nsMCAutoCompleteShowDlgForMultipleMatches     2.16.840.1.113730.3.1.349		 cis
-attribute nsMCSkipDirectoryIfLocalMatchFound			2.16.840.1.113730.3.1.350		 cis
-attribute nsMCAddrBookLastnameFirst						2.16.840.1.113730.3.1.351		 cis
-attribute nsMCLimitMessageSize							2.16.840.1.113730.3.1.352		 cis
-attribute nsMCMaxMessageSize							2.16.840.1.113730.3.1.353		 cis
-attribute nsMCPromptPurgeThreshold     	      	      	2.16.840.1.113730.3.1.354		 cis
-attribute nsMCPurgeThreshold							2.16.840.1.113730.3.1.355		 cis
-attribute nsMCNewsKeepMethod							2.16.840.1.113730.3.1.356		 cis
-attribute nsMCNewsKeepDays								2.16.840.1.113730.3.1.357		 cis
-attribute nsMCNewsKeepCount								2.16.840.1.113730.3.1.358		 cis
-attribute nsMCNewsKeepOnlyUnread						2.16.840.1.113730.3.1.359		 cis
-attribute nsMCNewsRemoveBodiesByAge						2.16.840.1.113730.3.1.360		 cis
-attribute nsMCNewsRemoveBodiesDays						2.16.840.1.113730.3.1.361		 cis
-attribute nsMCSmtpServer								2.16.840.1.113730.3.1.362		 cis
-attribute nsMCSmtpUserName								2.16.840.1.113730.3.1.363		 cis
-attribute nsMCSmtpUseSSL								2.16.840.1.113730.3.1.364		 cis
-attribute nsMCImapServer								2.16.840.1.113730.3.1.365		 cis
-attribute nsMCImapServerProperties						2.16.840.1.113730.3.1.366		 cis
-attribute nsMCPopServer									2.16.840.1.113730.3.1.367		 cis
-attribute nsMCPopServerProperties						2.16.840.1.113730.3.1.368		 cis
-attribute nsMCLdapServer								2.16.840.1.113730.3.1.369		 cis
-attribute nsMCLdapServerProperties						2.16.840.1.113730.3.1.370		 cis
-attribute nsMCQuotedStyle								2.16.840.1.113730.3.1.371		 cis
-attribute nsMCQuotedSize								2.16.840.1.113730.3.1.372		 cis
-attribute nsMCCitationColor								2.16.840.1.113730.3.1.373		 cis
-attribute nsMCFixedWidthMessages						2.16.840.1.113730.3.1.374		 cis
-attribute nsMCPlaySound									2.16.840.1.113730.3.1.375		 cis
-attribute nsMCRememberSelectedMessage					2.16.840.1.113730.3.1.376		 cis
-attribute nsMCReuseMessageWindow						2.16.840.1.113730.3.1.377		 cis
-attribute nsMCConfirmMoveFoldersToTrash					2.16.840.1.113730.3.1.378		 cis
-attribute nsMCUseMapiServer								2.16.840.1.113730.3.1.379		 cis
-attribute nsMCNewsTimeout								2.16.840.1.113730.3.1.380		 cis
-attribute nsMCNavCrossesFolders							2.16.840.1.113730.3.1.381		 cis
-attribute nsMCSearchServer								2.16.840.1.113730.3.1.382		 cis
-attribute nsMCSearchSubFolders							2.16.840.1.113730.3.1.383		 cis
-attribute nsMCEncryptOutgoingMail						2.16.840.1.113730.3.1.384		 cis
-attribute nsMCCryptoSignOutgoingMail					2.16.840.1.113730.3.1.385		 cis
-attribute nsMCCryptoSignOutgoingNews					2.16.840.1.113730.3.1.386		 cis
-attribute nsMCWarnForwardEncrypted						2.16.840.1.113730.3.1.387		 cis
-attribute nsMCWarnReplyUnencrypted						2.16.840.1.113730.3.1.388		 cis
-attribute nsMCAllowAtSignInUserName						2.16.840.1.113730.3.1.389		 cis
-attribute nsMCReceiptRequestHeaderType					2.16.840.1.113730.3.1.390		 cis
-attribute nsMCPop3GetsNewMail							2.16.840.1.113730.3.1.391		 cis
-attribute nsMCImapAutoSubscribeOnOpen					2.16.840.1.113730.3.1.392		 cis
-attribute nsMCImapMimePartsOnDemand						2.16.840.1.113730.3.1.393		 cis
-attribute nsMCImapMimePartsOnDemandThreshold			2.16.840.1.113730.3.1.394		 cis
-attribute nsMCUseAltMail								2.16.840.1.113730.3.1.395		 cis
-attribute nsMCAltMailDll								2.16.840.1.113730.3.1.396		 cis
-attribute nsMCUseAltMailForNews							2.16.840.1.113730.3.1.397		 cis
-attribute nsPrefMap		     					     	2.16.840.1.113730.3.1.398		 cis	 
-attribute nsMCAuthLogin			                        2.16.840.1.113730.3.1.499        cis
-attribute nsMNCNavCrossesFolders	                    2.16.840.1.113730.3.1.500        cis
-attribute nsMNCMessageInThreadWindow	                2.16.840.1.113730.3.1.501        cis
-attribute nsMCAllowAtSignInUserName	                    2.16.840.1.113730.3.1.502        cis
-attribute nsMCImapOnlineDraftSent	                    2.16.840.1.113730.3.1.503        cis
-attribute nsMCCustomHeaders		                        2.16.840.1.113730.3.1.504        cis
-attribute nsMCHtmlDomains		                        2.16.840.1.113730.3.1.505        cis
-attribute nsMNCForceAsciiSearch		                    2.16.840.1.113730.3.1.506        cis
-attribute nsMCAddrBookLdapDisabled	                    2.16.840.1.113730.3.1.507        cis
-attribute nsMNCReuseThreadWindow	                    2.16.840.1.113730.3.1.508        cis
-attribute nsMCShowHeaders		                        2.16.840.1.113730.3.1.509        cis
-attribute nsMCIdentityDefaultdomain	                    2.16.840.1.113730.3.1.510       cis
-
-
-
-
-objectclass nsMailClient
-	oid 2.16.840.1.113730.3.2.72 
-    superior top 
-    allows 
-	 nsMCHTMLCompose, 
-	 nsMCDefaultHTMLAction, 
-	 nsMCRequestReturnReceipt, 
-	 nsMCIncorporateReturnReceipt, 
-	 nsMCMDNReportEnabled, 
-	 nsMCMDNReportNotInToCC, 
-	 nsMCMDNReportOutsideDomain, 
-	 nsMCMDNReportOther, 
-	 nsMCForwardMessageMode, 
-	 nsMCAutoQuote, 
-	 nsMCReplyOnTop,
-  	 nsMCSpellCheckBeforeSend,
-	 nsMCWrapLongLines, 
-	 nsMCWrapLength, 
-	 nsMCStrictlyMime,
-	 nsMCAutoCompleteUseAddressBooks,
-	 nsMCAutoCompleteUseDirectory,
-	 nsMCAutoCompleteEnabledServerName,
-	 nsMCAutoCompleteShowDlgForMultipleMatches,
-	 nsMCSkipDirectoryIfLocalMatchFound,
-	 nsMCAddrBookLastnameFirst,
-	 nsMCLimitMessageSize,
-	 nsMCMaxMessageSize,
-	 nsMCPromptPurgeThreshold,
-	 nsMCPurgeThreshold,
-	 nsMCNewsKeepMethod,
-	 nsMCNewsKeepDays,
-	 nsMCNewsKeepCount,
-	 nsMCNewsKeepOnlyUnread,
-	 nsMCNewsRemoveBodiesByAge,
-	 nsMCNewsRemoveBodiesDays,
-	 nsMCSmtpServer,
-	 nsMCSmtpUserName,
-	 nsMCSmtpUseSSL,
-	 nsMCImapServer,
-	 nsMCImapServerProperties,
-	 nsMCPopServer,
-	 nsMCPopServerProperties, 
-	 nsMCLdapServer,
-	 nsMCLdapServerProperties,
-	 nsMCQuotedStyle,
-	 nsMCQuotedSize,
-	 nsMCCitationColor,
-	 nsMCFixedWidthMessages,
-	 nsMCPlaySound,
-	 nsMCRememberSelectedMessage,
-	 nsMCReuseMessageWindow,
-	 nsMCConfirmMoveFoldersToTrash,
-	 nsMCUseMapiServer,
-	 nsMCNewsTimeout,
-	 nsMCNavCrossesFolders,
-	 nsMCSearchServer,
-	 nsMCSearchSubFolders,
- 	 nsMCEncryptOutgoingMail,
-	 nsMCCryptoSignOutgoingMail,
-	 nsMCCryptoSignOutgoingNews,
-	 nsMCWarnForwardEncrypted,
-	 nsMCWarnReplyUnencrypted,
-	 nsMCAllowAtSignInUserName,
-	 nsMCReceiptRequestHeaderType,
-	 nsMCPop3GetsNewMail,
-	 nsMCImapAutoSubscribeOnOpen,
-	 nsMCImapMimePartsOnDemand,
-	 nsMCImapMimePartsOnDemandThreshold,
-	 nsMCUseAltMail,
-	 nsMCAltMailDll,
-	 nsMCUseAltMailForNews,
-	 nsMCAuthLogin,
-	 nsMNCNavCrossesFolders,
-	 nsMNCMessageInThreadWindow,
-	 nsMCAllowAtSignInUserName,
-	 nsMCImapOnlineDraftSent,
-	 nsMCCustomHeaders,
-	 nsMCHtmlDomains,
-	 nsMNCForceAsciiSearch,
-	 nsMCAddrBookLdapDisabled,
-	 nsMNCReuseThreadWindow,
-	 nsMCShowHeaders,
-	 nsMCIdentityDefaultdomain
-	 
-
-# 
-# Netscape Mission Control Desktop Messenger security schema
-# This schema is used to hold Messenger security preferences.
-#
-
-attribute nsMSEncryptOutgoingMail		2.16.840.1.113730.3.1.511 cis
-attribute nsMSSignOutgoingMail			2.16.840.1.113730.3.1.512 cis
-attribute nsMSSignOutgoingNews			2.16.840.1.113730.3.1.513 cis
-attribute nsMSSmimeDesEde3			    2.16.840.1.113730.3.1.514 cis
-attribute nsMSSmimeRc2128			    2.16.840.1.113730.3.1.515 cis
-attribute nsMSSmimeDes				    2.16.840.1.113730.3.1.516 cis
-attribute nsMSSmimeRc264			    2.16.840.1.113730.3.1.517 cis
-attribute nsMSSmimeRc240			    2.16.840.1.113730.3.1.518 cis
-attribute nsMSSmimeFortezza			    2.16.840.1.113730.3.1.519 cis
-
-objectclass nsMailSecurity
-	oid  2.16.840.1.113730.3.2.81
-    superior top 
-    allows 
-	nsMSEncryptOutgoingMail,
-	nsMSSignOutgoingMail,
-	nsMSSignOutgoingNews,
-	nsMSSmimeDesEde3,
-	nsMSSmimeRc2128,
-	nsMSSmimeDes,
-	nsMSSmimeRc264,
-	nsMSSmimeRc240,
-	nsMSSmimeFortezza
-
-objectclass netscapePreferenceMap 
-    oid 2.16.840.1.113730.3.2.73
-    superior top 
-	allows
-	  	nsPrefMap,
-		uid
-
diff --git a/ldap/cm/v4confs/40/ns-media-globopt.conf b/ldap/cm/v4confs/40/ns-media-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/40/ns-media-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/40/ns-media-schema.conf b/ldap/cm/v4confs/40/ns-media-schema.conf
deleted file mode 100644
index 01b2cf95..00000000
--- a/ldap/cm/v4confs/40/ns-media-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeMediaServer
-		oid 2.16.840.1.113730.3.2.25
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v4confs/40/ns-mlm-schema.conf b/ldap/cm/v4confs/40/ns-mlm-schema.conf
deleted file mode 100644
index 8cd3c379..00000000
--- a/ldap/cm/v4confs/40/ns-mlm-schema.conf
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# LDAP object classes used by MLM
-#
-
-attribute	mgmemMemberOfGroup		cis
-attribute	mgmemRefDN			ces  single
-attribute	mgmemMailUserPassword		bin  single
-attribute	mgmemGroupMemberParam		ces
-attribute	mgmemGroupServerParam		ces
-
-attribute	mgmanJoinability		ces
-attribute	mgmanJoinLocalType		cis  single
-attribute	mgmanMemberVisibility		ces
-attribute	mgmanIntroText			ces  single
-attribute	mgmanGroupStat			ces
-attribute	mgmanHidden			cis  single
-attribute	mgmanGroupKey			cis  single
-attribute	mgmanAllowSubscribe		cis
-attribute	mgmanDenySubscribe		cis
-
-attribute	mgmanGConfNewGroupParent	dn   single
-attribute	mgmanGConfRemoteUserParent	dn   single
-attribute	mgmanGConfSearchBase		dn   single
-attribute	mgmanGConfGroupCreationUser	dn
-attribute	mgmanGConfSearchGroupUser	dn
-attribute	mgmanGConfAdmin			dn
-attribute	mgmanGConfGroupTemplate		dn   single
-attribute	mgmanGConfDefaultInheritance	cis
-attribute	mgmanGConfKey			cis
-attribute	mgmanGConfSearchAttribute	cis
-attribute	mgmanGConfSearchRelationship	cis
-attribute	mgmanGConfSearchTreeNode	cis
-
-
-objectClass mailGroupMember
-	requires
-		objectClass,
-		mail
-	allows
-		mgmemMemberOfGroup,
-		mgmemRefDN,
-		preferredLanguage,
-		userCertificate,
-		mgmemMailUserPassword,
-		mgmemGroupMemberParam,
-		mgmemGroupServerParam,
-		c,
-		cn,
-		sn,
-		givenName
-
-
-objectClass mailGroupManagement
-	requires
-		objectClass
-	allows
-		description,
-		labeledURL,
-		mgmanAllowSubscribe,
-		mgmanDenySubscribe,
-		mgmanGroupKey,
-		mgmanGroupStat,
-		mgmanHidden,
-		mgmanIntroText,
-		mgmanJoinability,
-		mgmanJoinLocalType,
-		mgmanMemberVisibility,
-		multilineDescription,
-		userCertificate,
-		userPassword
-
-objectClass mailGroupManagement_GlobalConfig
-	requires
-		objectClass
-	allows
-		cn,
-		mgmanGConfAdmin,
-		mgmanGConfDefaultInheritance,
-		mgmanGConfGroupCreationUser,
-		mgmanGConfGroupTemplate,
-		mgmanGConfKey,
-		mgmanGConfNewGroupParent,
-		mgmanGConfRemoteUserParent,
-		mgmanGConfSearchAttribute,
-		mgmanGConfSearchBase,
-		mgmanGConfSearchGroupUser,
-		mgmanGConfSearchRelationship,
-		mgmanGConfSearchTreeNode
diff --git a/ldap/cm/v4confs/40/ns-msg-schema.conf b/ldap/cm/v4confs/40/ns-msg-schema.conf
deleted file mode 100644
index 5355f3e9..00000000
--- a/ldap/cm/v4confs/40/ns-msg-schema.conf
+++ /dev/null
@@ -1,722 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#used by Netscape Messaging Server 4.0
-#
-#
-attribute	nsmsgaccounturl	cis
-attribute	nsmsgadddeliveredto	cis
-attribute	nsmsgaddheaders	cis
-attribute	nsmsgadmins	cis
-attribute	nsmsgalias		cis
-attribute	nsmsgallowanonymouslogin	cis
-attribute	nsmsgallowbarelf	cis
-attribute	nsmsgallowbdat	cis
-attribute	nsmsgallowehlo	cis
-attribute	nsmsgallowetrn	cis
-attribute	nsmsgallowexpn	cis
-attribute	nsmsgallowhelp	cis
-attribute	nsmsgallowonex	cis
-attribute	nsmsgallowsize	cis
-attribute	nsmsgallowverb	cis
-attribute	nsmsgallowvrfy	cis
-attribute	nsmsgaltqueues	cis
-attribute	nsmsgalwaysqueue	cis
-attribute	nsmsgauthcachesize	cis
-attribute	nsmsgauthcachettl	cis
-attribute	nsmsgauthmaildomain	cis
-attribute	nsmsgbanner	cis
-attribute	nsmsgbinarypath	cis
-attribute	nsmsgbuffersize	cis
-attribute	nsmsgcheckdeferredqueue	cis
-attribute	nsmsgcleanupage		cis
-attribute	nsmsgclearcontrolinterval	cis
-attribute	nsmsgclearcontrolsafetime	cis
-attribute	nsmsgcollectiondeltatime	cis
-attribute	nsmsgconfigversion		cis
-attribute	nsmsgcontact		cis
-attribute	nsmsgcounterdeltatime	cis
-attribute	nsmsgdbcachesize	cis
-attribute	nsmsgdbtmpdir	cis
-attribute	nsmsgdefaultacl	cis
-attribute	nsmsgdefaultdomain	cis
-attribute	nsmsgdefaultecho	cis
-attribute	nsmsgdefaultgid	cis
-attribute	nsmsgdefaultmailboxquota	cis
-attribute	nsmsgdefaultoverquota	cis
-attribute	nsmsgdefaultpartition	cis
-attribute	nsmsgdefaultreply	cis
-attribute	nsmsgdefaultuid	cis
-attribute	nsmsgdefaultvacation	cis
-attribute	nsmsgdeferredperiod	cis
-attribute	nsmsgdeleteheaders	cis
-attribute	nsmsgdescription		cis
-attribute	nsmsgdiskflushinterval		cis
-attribute	nsmsgdnsresolveclient	cis
-attribute	nsmsgdocanonicalize	cis
-attribute	nsmsgdoclientdnslookup	cis
-attribute	nsmsgdodsn	cis
-attribute	nsmsgdoetrn	cis
-attribute	nsmsgdomainallowed	cis
-attribute	nsmsgdomainlangtable	cis
-attribute	nsmsgdomainname	cis
-attribute	nsmsgdomainnotallowed	cis
-attribute	nsmsgdorewritefromusingauth	cis
-attribute	nsmsgdorewritesenderusingauth	cis
-attribute	nsmsgenable		cis
-attribute	nsmsgenablesslport	cis
-attribute	nsmsgenveloperewritemethod	cis
-attribute	nsmsgexclusive	cis
-attribute	nsmsgexpirestart	cis
-attribute	nsmsgexpirytime	cis
-attribute	nsmsgexternalmxserverip	cis
-attribute	nsmsgfallbacksearchmethod	cis
-attribute	nsmsgfilemode	cis
-attribute	nsmsgfilterurl	cis
-attribute	nsmsgflushinterval	cis
-attribute	nsmsgfolderpattern	cis
-attribute	nsmsgfoldersizebytes	cis
-attribute	nsmsgfolderurl	cis
-attribute	nsmsgforeignpercentaddr	cis
-attribute	nsmsgformsigkey	cis
-attribute	nsmsghidehostname	cis
-attribute	nsmsghopcountexceedactions	cis
-attribute	nsmsghostoncommandline	cis
-attribute	nsmsghostrewrites	cis
-attribute	nsmsgidletimeout	cis
-attribute	nsmsginstalledlanguages	cis
-attribute	nsmsginternalmxserverip	cis
-attribute	nsmsgldapmemcache	cis
-attribute	nsmsgldapmemcachesize	cis
-attribute	nsmsgldapmemcachettl	cis
-attribute	nsmsgldappoolsize	cis
-attribute	nsmsgldaputilconfig	cis
-attribute	nsmsglistenaddr	cis
-attribute	nsmsglistenq	cis
-attribute	nsmsglisturl	cis
-attribute	nsmsglocaldefaultmaxruncount	cis
-attribute	nsmsglocaldefaultminruncount	cis
-attribute	nsmsglocalmaildomains	cis
-attribute	nsmsglocation		cis
-attribute	nsmsglog	cis
-attribute	nsmsglogdir	cis
-attribute	nsmsgloglevel	cis
-attribute	nsmsglogtype		cis
-attribute	nsmsgmaildeliveryprogram	cis
-attribute	nsmsgmasterhost	cis
-attribute	nsmsgmasterport	cis
-attribute	nsmsgmaxbadcommands	cis
-attribute	nsmsgmaxbranches	cis
-attribute	nsmsgmaxcontrolrecipients cis
-attribute	nsmsgmaxcputime	cis
-attribute	nsmsgmaxerrorobjectsize	cis
-attribute	nsmsgmaxheaderlines	cis
-attribute	nsmsgmaxlogfiles	cis
-attribute	nsmsgmaxlogfilesize	cis
-attribute	nsmsgmaxlogsize	cis
-attribute	nsmsgmaxmessagesize	cis
-attribute	nsmsgmaxmtahops	cis
-attribute	nsmsgmaxqueuetime	cis
-attribute	nsmsgmaxruncount	cis
-attribute	nsmsgmaxruncountdeferred	cis
-attribute	nsmsgmaxscriptsize	cis
-attribute	nsmsgmaxsessions	cis
-attribute	nsmsgmaxstateobjectsize	cis
-attribute	nsmsgmaxthreads	cis
-attribute	nsmsgmessagecount	cis
-attribute	nsmsgmessagedays	cis
-attribute	nsmsgmessagehostname	cis
-attribute	nsmsgmessagesize	cis
-attribute	nsmsgmessagesizedays	cis
-attribute	nsmsgminfreediskspace	cis
-attribute	nsmsgminruncount	cis
-attribute	nsmsgmsgalarmdescription	cis
-attribute	nsmsgmsgalarmnoticehost	cis
-attribute	nsmsgmsgalarmnoticeport	cis
-attribute	nsmsgmsgalarmnoticercpt	cis
-attribute	nsmsgmsgalarmnoticesender	cis
-attribute	nsmsgmsgalarmnoticetemplate	cis
-attribute	nsmsgmsgalarmstatinterval	cis
-attribute	nsmsgmsgalarmthreshold	cis
-attribute	nsmsgmsgalarmthresholddirection	cis
-attribute	nsmsgmsgalarmwarninginterval	cis
-attribute	nsmsgmtaid		cis
-attribute	nsmsgmtaname		cis
-attribute	nsmsgneedsender	cis
-attribute	nsmsgnegativehostattr	cis
-attribute	nsmsgnestedgroups	cis
-attribute	nsmsgnetworkdefaultmaxruncount	cis
-attribute	nsmsgnetworkdefaultminruncount	cis
-attribute	nsmsgnewsprefix	cis
-attribute	nsmsgnewsspool	cis
-attribute	nsmsgnewuserforms	cis
-attribute	nsmsgntaccount	cis
-attribute	nsmsgntpassword	cis
-attribute	nsmsgntrunoptn	cis
-attribute	nsmsgnumdays	cis
-attribute	nsmsgnumenvelopequeuefiles	cis
-attribute	nsmsgnummessages	cis
-attribute	nsmsgnumprocesses	cis
-attribute	nsmsgorganization		cis
-attribute	nsmsgpartition	cis
-attribute	nsmsgpath	cis
-attribute	nsmsgplaintextloginpause	cis
-attribute	nsmsgplaintextmincipher	cis
-attribute	nsmsgpopminpoll	cis
-attribute	nsmsgport	cis
-attribute	nsmsgpositivehostattr	cis
-attribute	nsmsgprotocolubeconfig	cis
-attribute	nsmsgquotaexceededactions	cis
-attribute	nsmsgquotaexceededmsg	cis
-attribute	nsmsgquotaexceededmsginterval	cis
-attribute	nsmsgquotagraceperiod	cis
-attribute	nsmsgquotawarn	cis
-attribute	nsmsgreadtimeout	cis
-attribute	nsmsgrenotifyinterval	cis
-attribute	nsmsgrequirecrlf	cis
-attribute	nsmsgreserved0	cis
-attribute	nsmsgreserved1	cis
-attribute	nsmsgreserved2	cis
-attribute	nsmsgreserved3	cis
-attribute	nsmsgreserved4	cis
-attribute	nsmsgreserved5	cis
-attribute	nsmsgreserved6	cis
-attribute	nsmsgreserved7	cis
-attribute	nsmsgreserved8	cis
-attribute	nsmsgreserved9	cis
-attribute	nsmsgrewritetocc	cis
-attribute	nsmsgrolloverdelta	cis
-attribute	nsmsgrolloversize	cis
-attribute	nsmsgrollovertime	cis
-attribute	nsmsgroutingattribute	cis
-attribute	nsmsgroutstripimapfolders	cis
-attribute	nsmsgshellpath	cis
-attribute	nsmsgsitelanguage	cis
-attribute	nsmsgsmtphost	cis
-attribute	nsmsgsmtpport	cis
-attribute	nsmsgsmtprewritestyle	cis
-attribute	nsmsgsslcachesize	cis
-attribute	nsmsgsslpasswdfile	cis
-attribute	nsmsgsslport		cis
-attribute	nsmsgsslusessl	cis
-attribute	nsmsgsslusesslrelay	cis
-attribute	nsmsgstripcr	cis
-attribute	nsmsgsystemmaildir	cis
-attribute	nsmsgtimeoutcommand	cis
-attribute	nsmsgtimeoutdata	cis
-attribute	nsmsgtimeoutdatadot	cis
-attribute	nsmsgtimeoutdatasend	cis
-attribute	nsmsgtimeoutgreet	cis
-attribute	nsmsgtimeouthelo	cis
-attribute	nsmsgtimeoutmail	cis
-attribute	nsmsgtimeoutquit	cis
-attribute	nsmsgtimeoutrcpt	cis
-attribute	nsmsgtimeoutrset	cis
-attribute	nsmsgumask	cis
-attribute	nsmsgunknownacctsactions	cis
-attribute	nsmsgusemx	cis
-attribute	nsmsgverifyrcpts	cis
-attribute	nsmsgversion		cis
-
-objectclass netscapeMessagingServer
-	superior top
-	requires
-		cn,
-		nsServerID
-	allows
-		description
-
-objectclass nsmsgcfgcontainer
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfggen
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgaccounturl,
-		nsmsgconfigversion,
-		nsmsgfilterurl,
-		nsmsgfolderurl,
-		nsmsginstalledlanguages,
-		nsmsglisturl,
-		nsmsgnewuserforms,
-		nsmsgsitelanguage
-		
-objectclass nsmsgcfgsnmp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgcontact,
-		nsmsgcollectiondeltatime,
-		nsmsgdescription,
-		nsmsgenable,
-		nsmsglocation,
-		nsmsgmtaid,
-		nsmsgmtaname,
-		nsmsgmasterhost,
-		nsmsgmasterport,
-		nsmsgorganization,
-		nsmsgversion
-		
-objectclass nsmsgcfgstore
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgadmins,
-		nsmsgcleanupage,
-		nsmsgdbcachesize,
-		nsmsgdbtmpdir,
-		nsmsgdefaultacl,
-		nsmsgdefaultmailboxquota,
-		nsmsgdefaultpartition,
-		nsmsgdiskflushinterval,
-		nsmsgexpirestart,
-		nsmsgquotaexceededmsg,
-		nsmsgquotaexceededmsginterval,
-		nsmsgquotagraceperiod,
-		nsmsgquotawarn,
-		nsmsgumask
-
-objectclass nsmsgcfgexpirerule
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgfolderpattern,
-		nsmsgexclusive,
-		nsmsgfoldersizebytes,
-		nsmsgmessagecount,
-		nsmsgmessagedays,
-		nsmsgmessagesize,
-		nsmsgmessagesizedays
-
-objectclass nsmsgcfgpartition
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgpath
-
-objectclass nsmsgcfguser
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgpublic
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgalias
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgalias
-
-objectclass nsmsgcfglog
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgbuffersize,
-		nsmsgexpirytime,
-		nsmsgflushinterval,
-		nsmsglogdir,
-		nsmsgloglevel,
-		nsmsglogtype,
-		nsmsgmaxlogfiles,
-		nsmsgmaxlogfilesize,
-		nsmsgmaxlogsize,
-		nsmsgminfreediskspace,
-		nsmsgrollovertime
-
-objectclass nsmsgcfgservice
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgauthcachesize,
-		nsmsgauthcachettl,
-		nsmsgdnsresolveclient,
-		nsmsgldapmemcache,
-		nsmsgldapmemcachesize,
-		nsmsgldapmemcachettl,
-		nsmsglistenaddr,
-		nsmsgplaintextloginpause,
-		nsmsgreadtimeout,
-		nsmsgsslpasswdfile
-
-objectclass nsmsgcfgpop
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowanonymouslogin,
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgidletimeout,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgpopminpoll,
-		nsmsgport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgimap
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowanonymouslogin,
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgidletimeout,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgsslcachesize,
-		nsmsgsslport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfghttp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowanonymouslogin,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgidletimeout,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgsmtphost,
-		nsmsgsmtpport,
-		nsmsgsslcachesize,
-		nsmsgsslport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgnntp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgnewsprefix,
-		nsmsgnewsspool,
-		nsmsgpartition,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgsslport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgmta
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgaltqueues,
-		nsmsgauthmaildomain,
-		nsmsgbanner,
-		nsmsgclearcontrolinterval,
-		nsmsgclearcontrolsafetime,
-		nsmsgcounterdeltatime,
-		nsmsgdefaultdomain,
-		nsmsgdeferredperiod,
-		nsmsgdocanonicalize,
-		nsmsgdoclientdnslookup,
-		nsmsgdodsn,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgdomainname,
-		nsmsgdomainlangtable,
-		nsmsgenable,
-		nsmsgforeignpercentaddr,
-		nsmsgldappoolsize,
-		nsmsgldaputilconfig,
-		nsmsglocaldefaultmaxruncount,
-		nsmsglocaldefaultminruncount,
-		nsmsgmaxheaderlines,
-		nsmsgmaxqueuetime,
-		nsmsgmessagehostname,
-		nsmsgnetworkdefaultmaxruncount,
-		nsmsgnetworkdefaultminruncount,
-		nsmsgnumenvelopequeuefiles,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgprotocolubeconfig,
-		nsmsgreserved0,
-		nsmsgreserved1,
-		nsmsgreserved2,
-		nsmsgreserved3,
-		nsmsgreserved4,
-		nsmsgreserved5,
-		nsmsgreserved6,
-		nsmsgreserved7,
-		nsmsgreserved8,
-		nsmsgreserved9,
-		nsmsgrolloverdelta,
-		nsmsgrolloversize,
-		nsmsgroutstripimapfolders,
-		nsmsgsslusessl,
-		nsmsgsslusesslrelay
-
-objectclass nsmsgcfgmtalog
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsglog,
-		nsmsgminruncount,
-		nsmsgmaxruncount,
-		nsmsgmaxruncountdeferred
-
-objectclass nsmsgcfgmtaautoreplyhandler
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultecho,
-		nsmsgdefaultreply,
-		nsmsgdefaultvacation
-
-objectclass nsmsgcfgmtaerrorhandler
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgformsigkey,
-		nsmsghopcountexceedactions,
-		nsmsgquotaexceededactions,
-		nsmsgrenotifyinterval,
-		nsmsgunknownacctsactions
-
-objectclass nsmsgcfgmtamboxdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgmtaprogdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultgid,
-		nsmsgdefaultuid,
-		nsmsgshellpath,
-		nsmsgntrunoptn, 
-		nsmsgntaccount, 
-		nsmsgntpassword
-
-objectclass nsmsgcfgmtaaccept
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowbdat,
-		nsmsgallowehlo,
-		nsmsgallowetrn,
-		nsmsgallowexpn,
-		nsmsgallowhelp,
-		nsmsgallowonex,
-		nsmsgallowsize,
-		nsmsgallowverb,
-		nsmsgallowvrfy,
-		nsmsghidehostname,
-		nsmsgmaxbadcommands,
-		nsmsgmaxmessagesize,
-		nsmsgminfreediskspace,
-		nsmsgnegativehostattr,
-		nsmsgpositivehostattr,
-		nsmsgrequirecrlf,
-		nsmsgtimeoutcommand,
-		nsmsgtimeoutdata,
-		nsmsgverifyrcpts
-
-objectclass nsmsgcfgmtasmtpdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowbarelf,
-		nsmsgalwaysqueue,
-		nsmsgcheckdeferredqueue,
-		nsmsgdoetrn,
-		nsmsgexternalmxserverip,
-		nsmsginternalmxserverip,
-		nsmsgtimeoutdata,
-		nsmsgtimeoutdatadot,
-		nsmsgtimeoutdatasend,
-		nsmsgtimeoutgreet,
-		nsmsgtimeouthelo,
-		nsmsgtimeoutmail,
-		nsmsgtimeoutquit,
-		nsmsgtimeoutrcpt,
-		nsmsgtimeoutrset,
-		nsmsgusemx
-
-objectclass nsmsgcfgmtarouter
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgadddeliveredto,
-		nsmsgaddheaders,
-		nsmsgdeleteheaders,
-		nsmsgdorewritefromusingauth,
-		nsmsgdorewritesenderusingauth,
-		nsmsgenveloperewritemethod,
-		nsmsgfallbacksearchmethod,
-		nsmsghostrewrites,
-		nsmsglocalmaildomains,
-		nsmsgmaxcontrolrecipients,
-		nsmsgmaxmtahops,
-		nsmsgnestedgroups,
-		nsmsgrewritetocc,
-		nsmsgroutingattribute,
-		nsmsgsmtprewritestyle
-
-objectclass nsmsgcfgmtaunixdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultgid,
-		nsmsgdefaultuid,
-		nsmsgfilemode,
-		nsmsgmaildeliveryprogram,
-		nsmsgneedsender,
-		nsmsgstripcr,
-		nsmsgsystemmaildir
-
-objectclass nsmsgcfgreport
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgalarmcontainer
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgmsgalarmnoticehost,
-		nsmsgmsgalarmnoticeport,
-		nsmsgmsgalarmnoticercpt,
-		nsmsgmsgalarmnoticesender,
-		nsmsgmsgalarmnoticetemplate
-
-objectclass nsmsgcfgalarm
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgmsgalarmdescription,
-		nsmsgmsgalarmstatinterval,
-		nsmsgmsgalarmthreshold,
-		nsmsgmsgalarmthresholddirection,
-		nsmsgmsgalarmwarninginterval
-
-objectclass nsmsgcfgscript
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgenable,
-		nsmsgbinarypath,
-		nsmsgloglevel,
-		nsmsgmaxscriptsize,
-		nsmsgmaxbranches,
-		nsmsgmaxcputime,
-		nsmsgmaxerrorobjectsize,
-		nsmsgmaxstateobjectsize
diff --git a/ldap/cm/v4confs/40/ns-netshare-schema.conf b/ldap/cm/v4confs/40/ns-netshare-schema.conf
deleted file mode 100644
index 8a03e929..00000000
--- a/ldap/cm/v4confs/40/ns-netshare-schema.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Enterprise Server
-attribute       netshareHomeURL            ces  single
-attribute       netshareServerType         cis  single
-attribute       netshareHomeTheme          cis  single
-attribute       netsharePrivate            cis  single
-attribute       netshareMemberOf           dn
-attribute       netshareUIConfig           bin  single
- 
-# added to either users or groups/projects to enable
-# as netshare user accounts or netshare projects
-objectclass netshareAccount
-       requires
-                objectclass,
-                netshareHomeURL
-       allows
-                netshareServerType,
-                netshareHomeTheme,
-                netsharePrivate,
-                netshareMemberOf,
-                netshareUIConfig
- 
-
-attribute       netsharePMNewProjParent            dn   single
-attribute       netsharePMSearchBase               dn   single
-attribute       netsharePMProjCreationUser         dn   single
-attribute       netsharePMAdmin                    dn
- 
-# this is for the netshare project management utility/CGI 
-# that is created under the SIE; this parallels the messaging
-# MLM schema somewhat to enable end-user maintenance/creation 
-# of netshare projects
-objectclass netshareProjectManagementGlobalConfig
-        requires
-                objectclass
-        allows
-                netsharePMNewProjParent,
-                netsharePMSearchBase,
-                netsharePMProjCreationUser,
-                netsharePMAdmin,
-                cn
diff --git a/ldap/cm/v4confs/40/ns-news-globopt.conf b/ldap/cm/v4confs/40/ns-news-globopt.conf
deleted file mode 100644
index 6f7b2f3b..00000000
--- a/ldap/cm/v4confs/40/ns-news-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape News Server
-#index	uniquemember,member	eq
-
diff --git a/ldap/cm/v4confs/40/ns-news-schema.conf b/ldap/cm/v4confs/40/ns-news-schema.conf
deleted file mode 100644
index 9d15c19e..00000000
--- a/ldap/cm/v4confs/40/ns-news-schema.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsnewsACL                   2.16.840.1.113730.3.1.191  cis     
-attribute nsaclrole                   2.16.840.1.113730.3.1.192  cis     
-attribute nsprettyname                2.16.840.1.113730.3.1.193  cis     
-attribute nsflags                     2.16.840.1.113730.3.1.194  cis     
-attribute nscreator                   2.16.840.1.113730.3.1.195  cis     
-attribute ngcomponent                 2.16.840.1.113730.3.1.196  dn      
-
-objectclass nginfo 
-	oid  2.16.840.1.113730.3.2.26
-	requires 
-		objectClass, 
-		ngcomponent 
-	allows 
-		nsnewsACL,  
-		subtreeACI, 
-		description,  
-		nsaclrole,  
-		nsprettyname, 
-		nsflags, 
-		nscreator 
-
-objectClass	netscapeNewsServer
-	oid 2.16.840.1.113730.3.2.27
-	requires
-		objectClass
-
diff --git a/ldap/cm/v4confs/40/ns-proxy-globopt.conf b/ldap/cm/v4confs/40/ns-proxy-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/40/ns-proxy-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/40/ns-proxy-schema.conf b/ldap/cm/v4confs/40/ns-proxy-schema.conf
deleted file mode 100644
index 3151c9c7..00000000
--- a/ldap/cm/v4confs/40/ns-proxy-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeProxyServer
-		oid 2.16.840.1.113730.3.2.28
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v4confs/40/ns-value-schema.conf b/ldap/cm/v4confs/40/ns-value-schema.conf
deleted file mode 100644
index a7ee4f3b..00000000
--- a/ldap/cm/v4confs/40/ns-value-schema.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Schema for defining schemaless config for LDAP 
-# 
-
-attribute nsValueCIS          2.16.840.1.113730.3.1.243 cis
-attribute nsValueCES          2.16.840.1.113730.3.1.244 ces
-attribute nsValueTel          2.16.840.1.113730.3.1.245 tel
-attribute nsValueInt          2.16.840.1.113730.3.1.246 int
-attribute nsValueBin          2.16.840.1.113730.3.1.247 bin
-attribute nsValueDN           2.16.840.1.113730.3.1.248 dn
-attribute nsValueType         2.16.840.1.113730.3.1.249 cis
-attribute nsValueDefault      2.16.840.1.113730.3.1.250 cis
-attribute nsValueFlags        2.16.840.1.113730.3.1.251 cis
-attribute nsValueDescription  2.16.840.1.113730.3.1.252 cis
-attribute nsValueSyntax       2.16.840.1.113730.3.1.253 cis
-attribute nsValueHelpURL      2.16.840.1.113730.3.1.254 ces
-
-objectClass nsValueItem
-    oid 2.16.840.1.113730.3.2.45
-    requires
-        objectClass,
-        cn
-    allows
-        nsValueCIS,
-        nsValueCES,
-        nsValueTel,
-        nsValueInt,
-        nsValueBin,
-        nsValueDN,
-        nsValueType,
-        nsValueSyntax,
-        nsValueDescription,
-        nsValueHelpURL,
-        nsValueFlags,
-        nsValueDefault 
-
diff --git a/ldap/cm/v4confs/40/ns-wcal-globopt.conf b/ldap/cm/v4confs/40/ns-wcal-globopt.conf
deleted file mode 100644
index 9d8ad189..00000000
--- a/ldap/cm/v4confs/40/ns-wcal-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#used by Netscape Calendar Hosting Server 1.0
-
-index nswcalCALID pres,eq
diff --git a/ldap/cm/v4confs/40/ns-wcal-schema.conf b/ldap/cm/v4confs/40/ns-wcal-schema.conf
deleted file mode 100644
index 3d4f85d5..00000000
--- a/ldap/cm/v4confs/40/ns-wcal-schema.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Calendar Hosting Server
-
-# Login calendar URI for this user
-attribute nswcalCALID			2.16.840.1.113730.3.1.537 cis single
-
-# Calendar client specific user preferences for this user
-attribute nswcalExtendedUserPrefs	2.16.840.1.113730.3.1.538 cis
-
-# Lists calendar protocols not allowed to be used by this user
-attribute nswcalDisallowAccess	2.16.840.1.113730.3.1.539 cis single
-
-# Calendar host for this user's login calendar
-attribute nswcalHost			2.16.840.1.113730.3.1.540 cis
-
-# Quota associated with this user's calendars
-attribute nswcalQuota			2.16.840.1.113730.3.1.541 cis single
-
-# Used to designate a LDAP entry as representing a Netscape Calendar
-# Hosting Server user account. These first 10 attributes are
-# referenced by Netscape Calendar Hosting Server and the last 3
-# attributes are reserved for future use.
-objectClass nswcalUser
-	oid 2.16.840.1.113730.3.2.83
-	requires
-		objectClass
-	allows
-		cn,
-		givenName,
-		mail,
-		preferredlanguage,
-		sn,
-		uid,
-		userPassword,
-		nswcalCALID,
-		nswcalDisallowAccess,
-		nswcalExtendedUserPrefs,
-		nslicensedfor,
-		nswcalHost,
-		nswcalQuota
-
-# From http://www.imc.org/draft-ietf-calsch-locating
-attribute calCalURI              1.2.840.113556.1.4.478 cis
-attribute calFBURL               1.2.840.113556.1.4.479 cis
-attribute calCAPURI              1.2.840.113556.1.4.480 cis
-attribute calCalAdrURI           1.2.840.113556.1.4.481 cis
-attribute calOtherCalURIs        1.2.840.113556.1.4.482 cis
-attribute calOtherFBURLs         1.2.840.113556.1.4.483 cis
-attribute calOtherCAPURIs        1.2.840.113556.1.4.484 cis
-attribute calOtherCalAdrURIs     1.2.840.113556.1.4.485 cis
-
-# Used to designate a LDAP entry as representing a calendar user.
-objectClass calEntry
-	oid 1.2.840.113556.1.5.87
-	requires
-		objectClass
-	allows
-		calCalURI,
-		calFBURL,
-		calCAPURI,
-		calCalAdrURI,
-		calOtherCalURIs,
-		calOtherFBURLs,
-		calOtherCAPURIs,
-		calOtherCalAdrURIs
diff --git a/ldap/cm/v4confs/40/ns-web-globopt.conf b/ldap/cm/v4confs/40/ns-web-globopt.conf
deleted file mode 100644
index 6d19f242..00000000
--- a/ldap/cm/v4confs/40/ns-web-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Enterprise Server
-#index	uniquemember,member	eq
-
diff --git a/ldap/cm/v4confs/40/ns-web-schema.conf b/ldap/cm/v4confs/40/ns-web-schema.conf
deleted file mode 100644
index 08868577..00000000
--- a/ldap/cm/v4confs/40/ns-web-schema.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeWebServer
-        oid 2.16.840.1.113730.3.2.29
-        superior top
-        requires
-                cn,
-                nsServerID
-        allows
-                description,
-                nsServerPort
-
diff --git a/ldap/cm/v4confs/40/slapd.at.conf b/ldap/cm/v4confs/40/slapd.at.conf
deleted file mode 100644
index 620b1348..00000000
--- a/ldap/cm/v4confs/40/slapd.at.conf
+++ /dev/null
@@ -1,423 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.at.conf for Netscape Directory Server 4.0
-#
-#  DO NOT MODIFY! 
-#
-#  The attributes listed in this file are Standard Attributes and are
-#  expected to present in Directory Server 4.0. Editing this file could 
-#  cause interoperability problems.
-#
-#  User Defined Attributes should be added by selecting 
-#  Schema | Edit or View Attributes from the Admin Server. 
-#
-#  User Defined Attributes are placed in slapd.user_at.conf.  
-# 
-#  All attributes are viewable over LDAP in the cn=schema entry under
-#  attributetypes.
-# 
-#  The format of this file is:
-#
-#  attribute attribute-name [attribute-aliases] [attribute-oid] syntax
-#  
-#  If no OID is specified, <attribute-name>-oid will be used as the OID
-#
-
-########################################################################
-# X.500(93) User Schema for use with LDAP
-# Taken from <draft-ietf-asid-ldapv3schema-x500-00.txt>
-########################################################################
-
-attribute objectClass                                         2.5.4.0                    cis     
-attribute aliasedObjectName                                   2.5.4.1                    dn      
-attribute knowledgeInformation                                2.5.4.2                    cis     
-attribute cn                         commonName               2.5.4.3                    cis     
-attribute sn                         surName                  2.5.4.4                    cis     
-attribute serialNumber                                        2.5.4.5                    cis     
-attribute c                          countryName              2.5.4.6                    cis     
-attribute l   locality               localityname             2.5.4.7                    cis     
-attribute st                         stateOrProvinceName      2.5.4.8                    cis     
-attribute street                     streetaddress            2.5.4.9                    cis     
-attribute o                          organizationname         2.5.4.10                   cis     
-attribute ou                         organizationalUnitName   2.5.4.11                   cis     
-attribute title                                               2.5.4.12                   cis     
-attribute description                                         2.5.4.13                   cis     
-attribute searchGuide                                         2.5.4.14                   ces     
-attribute businessCategory                                    2.5.4.15                   cis     
-attribute postalAddress                                       2.5.4.16                   cis     
-attribute postalCode                                          2.5.4.17                   cis     
-attribute postOfficeBox                                       2.5.4.18                   cis     
-attribute physicalDeliveryOfficeName                          2.5.4.19                   cis     
-attribute telephoneNumber                                     2.5.4.20                   tel     
-attribute telexNumber                                         2.5.4.21                   cis     
-attribute teletexTerminalIdentifier                           2.5.4.22                   cis
-attribute facsimileTelephoneNumber   fax                      2.5.4.23                   tel     
-attribute x121Address                                         2.5.4.24                   ces     
-attribute internationalIsdnNumber                             2.5.4.25                   ces     
-attribute registeredAddress                                   2.5.4.26                   cis     
-attribute destinationIndicator                                2.5.4.27                   cis     
-attribute preferredDeliveryMethod                             2.5.4.28                   cis     
-attribute presentationAddress                                 2.5.4.29                   ces     
-attribute supportedApplicationContext                         2.5.4.30                   cis     
-attribute member                                              2.5.4.31                   dn      
-attribute owner                                               2.5.4.32                   dn      
-attribute roleOccupant                                        2.5.4.33                   dn      
-attribute seeAlso                                             2.5.4.34                   dn      
-attribute userPassword                                        2.5.4.35                   bin     
-attribute userCertificate                                     2.5.4.36                   bin     
-attribute cACertificate               cACertificate           2.5.4.37                   bin     
-attribute authorityRevocationList     authorityRevocationList 2.5.4.38                   bin     
-attribute certificateRevocationList certificateRevocationList 2.5.4.39                   bin
-attribute crossCertificatePair        crossCertificatePair    2.5.4.40                   bin     
-attribute givenName                                           2.5.4.42                   cis     
-attribute initials                                            2.5.4.43                   cis     
-attribute generationQualifier                                 2.5.4.44                   cis
-attribute x500UniqueIdentifier                                2.5.4.45                   bin     
-attribute dnQualifier                                         2.5.4.46                   cis     
-attribute enhancedSearchGuide                                 2.5.4.47                   cis
-attribute protocolInformation                                 2.5.4.48                   cis
-attribute dn distinguishedName                                2.5.4.49                   dn 
-attribute uniqueMember                                        2.5.4.50                   dn      
-attribute houseIdentifier                                     2.5.4.51                   cis
-attribute supportedAlgorithms                                 2.5.4.52                   bin       
-attribute deltaRevocationList                                 2.5.4.53                   bin
-
-#######################################################################
-# LDAP Attributes                                                     #
-# Taken from <draft-ietf-asid-ldapv3-attributes-07.txt>               #
-#######################################################################
-
-attribute createTimestamp                                     2.5.18.1                   cis
-attribute modifyTimestamp                                     2.5.18.2                   cis
-attribute creatorsName                                        2.5.18.3                   dn
-attribute modifiersName                                       2.5.18.4                   dn
-attribute subschemaSubentry                                   2.5.18.10                  dn
-attribute attributeTypes                                      2.5.21.5                   cis
-attribute objectClasses                                       2.5.21.6                   cis
-attribute matchingRules                                       2.5.21.4                   cis
-attribute matchingRuleUse                                     2.5.21.8                   cis
-attribute dITStructureRules                                   2.5.21.1                   cis
-attribute dITContentRules                                     2.5.21.2                   cis
-attribute nameForms                                           2.5.21.7                   cis
-
-attribute namingContexts                                      1.3.6.1.4.1.1466.101.120.5 dn
-attribute altServer                                           1.3.6.1.4.1.1466.101.120.6 ces
-attribute supportedExtension                                  1.3.6.1.4.1.1466.101.120.7 cis
-attribute supportedControl                                    1.3.6.1.4.1.1466.101.120.13 cis
-attribute supportedSASLMechanisms                             1.3.6.1.4.1.1466.101.120.14 cis
-attribute supportedLDAPVersion                                1.3.6.1.4.1.1466.101.120.15 int
-attribute ldapSyntaxes                                        1.3.6.1.4.1.1466.101.120.16 cis
-
-#######################################################################
-# Pilot X.500 schema for use in LDAPv3                                #
-# Taken from <draft-ietf-asid-schema-pilot-00.txt>                    #
-#######################################################################
-
-attribute uid                                                 0.9.2342.19200300.100.1.1  cis     
-attribute textEncodedORAddress                                0.9.2342.19200300.100.1.2  cis     
-attribute mail                       rfc822mailbox            0.9.2342.19200300.100.1.3  cis     
-attribute info                                                0.9.2342.19200300.100.1.4  cis     
-attribute drink                                               0.9.2342.19200300.100.1.5  cis     
-attribute roomNumber                                          0.9.2342.19200300.100.1.6  cis     
-attribute userClass                                           0.9.2342.19200300.100.1.8  cis     
-attribute host                                                0.9.2342.19200300.100.1.9  cis     
-attribute manager                                             0.9.2342.19200300.100.1.10 dn      
-attribute documentIdentifier                                  0.9.2342.19200300.100.1.11 cis     
-attribute documentTitle                                       0.9.2342.19200300.100.1.12 cis     
-attribute documentVersion                                     0.9.2342.19200300.100.1.13 cis     
-attribute documentAuthor                                      0.9.2342.19200300.100.1.14 dn      
-attribute documentLocation                                    0.9.2342.19200300.100.1.15 cis     
-attribute homePhone                                           0.9.2342.19200300.100.1.20 tel     
-attribute secretary                                           0.9.2342.19200300.100.1.21 dn      
-attribute otherMailbox                                        0.9.2342.19200300.100.1.22 cis     
-attribute dc                         domaincomponent          0.9.2342.19200300.100.1.25 cis     
-attribute dNSRecord                                           0.9.2342.19200300.100.1.26 cis     
-attribute associatedName                                      0.9.2342.19200300.100.1.38 dn      
-attribute homePostalAddress                                   0.9.2342.19200300.100.1.39 cis     
-attribute personalTitle                                       0.9.2342.19200300.100.1.40 cis     
-attribute mobile                     mobileTelephoneNumber    0.9.2342.19200300.100.1.41 tel     
-attribute pager                      pagerTelephoneNumber     0.9.2342.19200300.100.1.42 tel     
-attribute co                         friendlycountryname      0.9.2342.19200300.100.1.43 cis     
-attribute uniqueIdentifier                                    0.9.2342.19200300.100.1.44 cis     
-attribute organizationalStatus                                0.9.2342.19200300.100.1.45 cis     
-attribute janetMailbox                                        0.9.2342.19200300.100.1.46 cis
-attribute mailPreferenceOption                                0.9.2342.19200300.100.1.47 int single     
-attribute buildingName                                        0.9.2342.19200300.100.1.48 cis     
-attribute dSAQuality                                          0.9.2342.19200300.100.1.49 cis single
-attribute singleLevelQuality                                  0.9.2342.19200300.100.1.50 cis single
-attribute subtreeMinimumQuality                               0.9.2342.19200300.100.1.51 cis single
-attribute subtreeMaximumQuality                               0.9.2342.19200300.100.1.52 cis single
-attribute personalSignature                                   0.9.2342.19200300.100.1.53 bin     
-attribute ditRedirect                                         0.9.2342.19200300.100.1.54 dn      
-attribute audio                                               0.9.2342.19200300.100.1.55 bin     
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis     
-attribute jpegPhoto                                           0.9.2342.19200300.100.1.60 bin     
-
-#definitions subsequent to RFC 1274
-
-attribute labeledUri                 labeledurl               1.3.6.1.4.1.250.1.57       ces
-
-
-############################################################################
-# Netscape Defined Attributes
-#
-# The Netscape base OID is                          2.16.840.1.113730 
-# The base OID for the Netscape Directory Server is 2.16.840.1.113730.3 
-# Netscape defined attributes have base             2.16.840.1.113730.3.1
-#
-# More Netscape defined attributes can be found included in ns-schema.conf
-############################################################################
-
-attribute carLicense                                          2.16.840.1.113730.3.1.1    cis     
-attribute departmentNumber                                    2.16.840.1.113730.3.1.2    cis     
-attribute employeeNumber                                      2.16.840.1.113730.3.1.3    cis     
-attribute employeeType                                        2.16.840.1.113730.3.1.4    cis     
-attribute changeNumber                                        2.16.840.1.113730.3.1.5    int     
-attribute targetDn                                            2.16.840.1.113730.3.1.6    dn      
-attribute changeType                                          2.16.840.1.113730.3.1.7    cis     
-attribute changes                                             2.16.840.1.113730.3.1.8    bin     
-attribute newRdn                                              2.16.840.1.113730.3.1.9    dn      
-attribute deleteOldRdn                                        2.16.840.1.113730.3.1.10   cis     
-attribute newSuperior                                         2.16.840.1.113730.3.1.11   dn      
-attribute ref                                                 2.16.840.1.113730.3.1.34   ces     
-attribute nsLicensedFor                                       2.16.840.1.113730.3.1.36   cis     
-attribute nsLicenseStartTime                                  2.16.840.1.113730.3.1.37   cis     
-attribute nsLicenseEndTime                                    2.16.840.1.113730.3.1.38   cis     
-attribute preferredLanguage                                   2.16.840.1.113730.3.1.39   cis single
-attribute userSMIMECertificate                                 2.16.840.1.113730.3.1.40   bin
-attribute ntUserDomainId                                      2.16.840.1.113730.3.1.41   cis single    
-attribute ntUserCreateNewAccount                              2.16.840.1.113730.3.1.42   cis single     
-attribute ntUserDeleteAccount                                 2.16.840.1.113730.3.1.43   cis single     
-attribute ntGroupDomainId                                     2.16.840.1.113730.3.1.44   cis single
-attribute ntGroupCreateNewGroup                               2.16.840.1.113730.3.1.45   cis single
-attribute ntGroupDeleteGroup                                  2.16.840.1.113730.3.1.46   cis single
-attribute ntGroupType                                  2.16.840.1.113730.3.1.47   cis single
-attribute replicaPort                                         2.16.840.1.113730.3.1.48   cis              
-attribute replicaUpdateFailedAt                               2.16.840.1.113730.3.1.49   cis              
-attribute replicaBeginOrc                                     2.16.840.1.113730.3.1.50   cis              
-attribute replicaUpdateReplayed                               2.16.840.1.113730.3.1.51   cis              
-attribute replicaUpdateSchedule                               2.16.840.1.113730.3.1.52   cis              
-attribute replicaBindMethod                                   2.16.840.1.113730.3.1.53   cis              
-attribute replicaUseSSL                                       2.16.840.1.113730.3.1.54   cis              
-attribute aci                                                 2.16.840.1.113730.3.1.55   bin              
-attribute lastModifiedBy                                      0.9.2342.19200300.100.1.24 dn               
-attribute replicaRoot                                         2.16.840.1.113730.3.1.57   dn               
-attribute replicaBindDn                                       2.16.840.1.113730.3.1.58   dn               
-attribute ntUserPriv                                          2.16.840.1.113730.3.1.59   bin single  
-attribute ntUserAuthFlags                                     2.16.840.1.113730.3.1.60   bin single  
-attribute ntUserUsrComment                                    2.16.840.1.113730.3.1.61   cis single  
-attribute ntUserParms                                         2.16.840.1.113730.3.1.62   cis single  
-attribute ntUserUnitsPerWeek                                  2.16.840.1.113730.3.1.63   bin single  
-attribute ntUserNumLogons                                     2.16.840.1.113730.3.1.64   bin single  
-attribute ntUserLogonServer                                   2.16.840.1.113730.3.1.65   cis single  
-attribute ntUserUniqueId                                      2.16.840.1.113730.3.1.66   bin single  
-attribute ntUserProfile                                       2.16.840.1.113730.3.1.67   cis single  
-attribute ntUserPasswordExpired                               2.16.840.1.113730.3.1.68   bin single  
-attribute subtreeACI                                          2.16.840.1.113730.3.1.69   ces              
-attribute serverRoot                                          2.16.840.1.113730.3.1.70   cis              
-attribute serverProductName                                   2.16.840.1.113730.3.1.71   cis              
-attribute serverVersionNumber                                 2.16.840.1.113730.3.1.72   cis              
-attribute installationTimeStamp                               2.16.840.1.113730.3.1.73   cis              
-attribute administratorContactInfo                            2.16.840.1.113730.3.1.74   cis              
-attribute adminUrl                                            2.16.840.1.113730.3.1.75   ces              
-attribute serverHostName                                      2.16.840.1.113730.3.1.76   cis              
-attribute changeTime                                          2.16.840.1.113730.3.1.77   cis              
-attribute cirReplicaRoot                                      2.16.840.1.113730.3.1.79   dn               
-attribute cirHost                                             2.16.840.1.113730.3.1.80   cis              
-attribute cirPort                                             2.16.840.1.113730.3.1.81   cis              
-attribute cirBindDn                                           2.16.840.1.113730.3.1.82   dn               
-attribute cirUsePersistentSearch                              2.16.840.1.113730.3.1.83   cis              
-attribute cirUseSsl                                           2.16.840.1.113730.3.1.84   cis              
-attribute cirBindCredentials                                  2.16.840.1.113730.3.1.85   ces              
-attribute cirLastUpdateApplied                                2.16.840.1.113730.3.1.86   cis              
-attribute cirUpdateSchedule                                   2.16.840.1.113730.3.1.87   cis              
-attribute cirUpdateFailedat                                   2.16.840.1.113730.3.1.88   cis              
-attribute cirSyncInterval                                     2.16.840.1.113730.3.1.89   cis              
-attribute cirBeginORC                                         2.16.840.1.113730.3.1.90   cis              
-attribute passwordExpirationTime                              2.16.840.1.113730.3.1.91   cis operational         
-attribute passwordExpWarned                                   2.16.840.1.113730.3.1.92   cis operational         
-attribute passwordRetryCount                                  2.16.840.1.113730.3.1.93   cis operational         
-attribute retryCountResetTime                                 2.16.840.1.113730.3.1.94   cis operational         
-attribute accountUnlockTime                                   2.16.840.1.113730.3.1.95   cis operational         
-attribute passwordHistory                                     2.16.840.1.113730.3.1.96   bin operational         
-attribute passwordMaxAge                                      2.16.840.1.113730.3.1.97   cis             
-attribute passwordExp                                         2.16.840.1.113730.3.1.98   cis                 
-attribute passwordMinLength                                   2.16.840.1.113730.3.1.99   cis                 
-attribute passwordKeepHistory                                 2.16.840.1.113730.3.1.100  cis                 
-attribute passwordInHistory                                   2.16.840.1.113730.3.1.101  cis                 
-attribute passwordChange                                      2.16.840.1.113730.3.1.102  cis                 
-attribute passwordCheckSyntax                                 2.16.840.1.113730.3.1.103  cis                 
-attribute passwordWarning								      2.16.840.1.113730.3.1.104  cis                 
-attribute passwordLockout                                     2.16.840.1.113730.3.1.105  cis                 
-attribute passwordMaxFailure                                  2.16.840.1.113730.3.1.106  cis                 
-attribute passwordResetDuration                               2.16.840.1.113730.3.1.107  cis                 
-attribute passwordUnlock				    				  2.16.840.1.113730.3.1.108  cis                 
-attribute passwordLockoutDuration                             2.16.840.1.113730.3.1.109  cis                 
-attribute ntGroupId                                           2.16.840.1.113730.3.1.110  bin single  
-attribute replicaHost                                         2.16.840.1.113730.3.1.197  cis              
-attribute memberURL                                           2.16.840.1.113730.3.1.198  ces              
-attribute memberCertificateDescription                        2.16.840.1.113730.3.1.199  ces              
-attribute replicaCredentials                                  2.16.840.1.113730.3.1.202  bin     
-attribute replicaEntryFilter                                  2.16.840.1.113730.3.1.203  ces
-attribute replicaNickName                                     2.16.840.1.113730.3.1.204  cis
-attribute filterInfo										  2.16.840.1.113730.3.1.206  cis
-attribute replicaCFUpdated                                    2.16.840.1.113730.3.1.217  cis
-attribute replicaAbandonedChanges                             2.16.840.1.113730.3.1.218  cis
-attribute vlvBase                                             2.16.840.1.113730.3.1.207  dn
-attribute vlvScope                                            2.16.840.1.113730.3.1.208  int
-attribute vlvFilter                                           2.16.840.1.113730.3.1.209  ces
-attribute vlvSort                                             2.16.840.1.113730.3.1.210  cis
-attribute vlvName                                             2.16.840.1.113730.3.1.211  ces
-attribute netscapeMDSuffix                                    2.16.840.1.113730.3.1.212  dn
-attribute vlvEnabled                                          2.16.840.1.113730.3.1.213  int
-attribute passwordAllowChangeTime                             2.16.840.1.113730.3.1.214  cis operational         
-attribute oid                                                 2.16.840.1.113730.3.1.215  cis
-attribute userPKCS12                                          2.16.840.1.113730.3.1.216  bin
-attribute vlvUses                                             2.16.840.1.113730.3.1.219  int
-attribute passwordMustChange                                  2.16.840.1.113730.3.1.220  cis
-attribute passwordStorageScheme                               2.16.840.1.113730.3.1.121  cis
-attribute passwordMinAge                                      2.16.840.1.113730.3.1.122  cis
-attribute passwordResetFailureCount                           2.16.840.1.113730.3.1.123  cis
-attribute nsslapd-pluginPath							      2.16.840.1.113730.3.1.224  cis
-attribute nsslapd-pluginInitfunc                              2.16.840.1.113730.3.1.225  cis
-attribute nsslapd-pluginType 	                              2.16.840.1.113730.3.1.226  cis
-attribute nsslapd-pluginId                                    2.16.840.1.113730.3.1.227  cis
-attribute nsslapd-pluginVersion                               2.16.840.1.113730.3.1.228  cis
-attribute nsslapd-pluginVendor                                2.16.840.1.113730.3.1.229  cis
-attribute nsslapd-pluginDescription                           2.16.840.1.113730.3.1.230  cis
-attribute nsslapd-pluginEnabled               	              2.16.840.1.113730.3.1.231  cis
-attribute nsSNMPEnabled                      	              2.16.840.1.113730.3.1.232  cis
-attribute nsSNMPOrganization                 	              2.16.840.1.113730.3.1.233  cis
-attribute nsSNMPLocation                     	              2.16.840.1.113730.3.1.234  cis
-attribute nsSNMPContact               	                      2.16.840.1.113730.3.1.235  cis
-attribute nsSNMPDescription									  2.16.840.1.113730.3.1.236  cis 
-attribute nsSNMPMasterHost									  2.16.840.1.113730.3.1.237  cis 
-attribute nsSNMPMasterPort									  2.16.840.1.113730.3.1.238  cis 
-attribute nsslapd-backend									  2.16.840.1.113730.3.1.239  cis 
-attribute replicatedattributelist                             2.16.840.1.113730.3.1.240  cis 
-attribute displayName                                         2.16.840.1.113730.3.1.241  cis 
-attribute nsSystemIndex                                       2.16.840.1.113730.3.1.242  cis 
-attribute nsIndexType                                         2.16.840.1.113730.3.1.327  cis 
-attribute nsMatchingRule                                      2.16.840.1.113730.3.1.328  cis 
-attribute nsAddressBookSyncURL                                2.16.840.1.113730.3.1.330  ces
-attribute nsSynchUserIDFormat                                 2.16.840.1.113730.3.1.406  cis
-attribute nsSynchUniqueAttribute                              2.16.840.1.113730.3.1.407  cis
-attribute replicaLastRelevantChange                           2.16.840.1.113730.3.1.408  int
-
-#
-# Attribute types with OIDs
-#
-
-attribute associatedDomain                                    0.9.2342.19200300.100.1.37 cis     
-attribute ntUserHomeDir                                       1.2.840.113556.1.4.44      cis single     
-attribute ntUserComment                                       1.2.840.113556.1.4.156     cis single     
-attribute ntUserFlags                                         1.2.840.113556.1.4.38      bin single     
-attribute ntUserScriptPath                                    1.2.840.113556.1.4.62      cis single     
-attribute ntUserWorkstations                                  1.2.840.113556.1.4.86      cis single     
-attribute ntUserLastLogon                                     1.2.840.113556.1.4.52      cis single     
-attribute ntUserLastLogoff                                    1.2.840.113556.1.4.51      cis single     
-attribute ntUserAcctExpires                                   1.2.840.113556.1.4.159     cis single     
-attribute ntUserMaxStorage                                    1.2.840.113556.1.4.76      bin single     
-attribute ntUserLogonHours                                    1.2.840.113556.1.4.64      bin single     
-attribute ntUserBadPwCount                                    1.2.840.113556.1.4.12      bin single     
-attribute ntUserCountryCode                                   1.2.840.113556.1.4.25      cis single     
-attribute ntUserCodePage                                      1.2.840.113556.1.4.16      bin single     
-attribute ntUserPrimaryGroupId                                1.2.840.113556.1.4.98      bin single     
-attribute ntUserHomeDirDrive                                  1.2.840.113556.1.4.45      cis single     
-attribute ntGroupAttributes                                   1.2.840.113556.1.4.152     bin single
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis single
-
-
-# 
-# Attributes which are used by some objectClass, but with unknown OID
-# 
-
-attribute abstract                                            abstract-oid               cis     
-attribute authorCn                   documentauthorcommonname authorcn-oid               cis     
-attribute authorSn                   documentauthorsurname    authorsn-oid               cis     
-attribute changeLog                                           2.16.840.1.113730.3.1.35   dn
-attribute changeLogMaximumAge                                 2.16.840.1.113730.3.1.200  cis     
-attribute changeLogMaximumSize                                2.16.840.1.113730.3.1.201  cis     
-attribute documentStore                                       documentStore-oid          cis     
-attribute keyWords                                            keyWords-oid               cis     
-attribute lastModifiedTime                                    0.9.2342.19200300.100.1.23 cis     
-attribute multiLineDescription                                multiLineDescription-oid   cis     
-attribute subject                                             subject-oid                cis     
-attribute ttl                        timeToLive               1.3.6.1.4.1.250.1.60       cis     
-attribute photo                                               0.9.2342.19200300.100.1.7  bin     
-attribute generation                                          generation-oid             ces     
-attribute obsoletedByDocument                                 obsoletedByDocument-oid    dn      
-attribute obsoletesDocument                                   obsoletesDocument-oid      dn      
-attribute reciprocalNamingLink                                reciprocalNaminglink-oid   dn      
-attribute updatedByDocument                                   updatedByDocument-oid      dn      
-attribute updatesDocument                                     updatesDocument-oid        dn      
-
-#
-# Attribute types from RFC 2307
-#
-
-attribute	uidNumber		1.3.6.1.1.1.1.0		cis single
-attribute	gidNumber		1.3.6.1.1.1.1.1		cis single
-attribute	gecos			1.3.6.1.1.1.1.2		cis single
-attribute	homeDirectory		1.3.6.1.1.1.1.3		ces single
-attribute	loginShell		1.3.6.1.1.1.1.4		ces single
-attribute	shadowLastChange	1.3.6.1.1.1.1.5		cis single
-attribute	shadowMin		1.3.6.1.1.1.1.6		cis single
-attribute	shadowMax		1.3.6.1.1.1.1.7		cis single
-attribute	shadowWarning		1.3.6.1.1.1.1.8		cis single
-attribute	shadowInactive		1.3.6.1.1.1.1.9		cis single
-attribute	shadowExpire		1.3.6.1.1.1.1.10	cis single
-attribute	shadowFlag		1.3.6.1.1.1.1.11	cis single
-attribute	memberUid		1.3.6.1.1.1.1.12	cis
-attribute	memberNisNetgroup	1.3.6.1.1.1.1.13	cis
-attribute	nisNetgroupTriple	1.3.6.1.1.1.1.14	cis
-attribute	ipServicePort		1.3.6.1.1.1.1.15	cis single
-attribute	ipServiceProtocol	1.3.6.1.1.1.1.16	cis
-attribute	ipProtocolNumber	1.3.6.1.1.1.1.17	cis single
-attribute	oncRpcNumber		1.3.6.1.1.1.1.18	cis single
-attribute	ipHostNumber		1.3.6.1.1.1.1.19	cis
-attribute	ipNetworkNumber		1.3.6.1.1.1.1.20	cis single
-attribute	ipNetmaskNumber		1.3.6.1.1.1.1.21	cis single
-attribute	macAddress		1.3.6.1.1.1.1.22	cis
-attribute	bootParameter		1.3.6.1.1.1.1.23	ces
-attribute	bootFile		1.3.6.1.1.1.1.24	ces
-attribute	automountInformation	1.3.6.1.1.1.1.25	ces
-attribute	nisMapName		1.3.6.1.1.1.1.26	ces
-attribute	nisMapEntry		1.3.6.1.1.1.1.27	ces single
diff --git a/ldap/cm/v4confs/40/slapd.oc.conf b/ldap/cm/v4confs/40/slapd.oc.conf
deleted file mode 100644
index a1344708..00000000
--- a/ldap/cm/v4confs/40/slapd.oc.conf
+++ /dev/null
@@ -1,1100 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.oc.conf for Netscape Directory Server 4.0
-#
-#  DO NOT MODIFY! 
-#
-#  The ObjectClasses in this file are Standard ObjectClasses and are expected
-#  to be present in Directory Server 4.0 unchanged. Modifing this file may
-#  cause interoperability problems.
-#
-#  User Defined ObjectClasses should be added by selecting 
-#  Schema | Create ObjectClasses from the Admin Server. 
-#
-#  User Defined ObjectClasses are saved in slapd.user_oc.conf
-#  
-#  All ObjectClasses are viewable in the cn=schema entry under objectclasses.
-#
-# The format of this file is:
-#
-#  objectclass ObjectClassName
-#       [ oid ObjectIdentifier ]
-#       [ superior ParentObjectClass ]
-#       [ requires <comma separated list of required attributes> ]
-#       [ allows   <comma separated list of allowed attributes>  ]
-#  
-
-objectclass top
-	oid 2.5.6.0
-	requires
-		objectClass
-	allows
-		aci
-
-objectclass alias
-	oid 2.5.6.1
-	superior top
-	requires
-		aliasedObjectName
-
-objectclass country
-	oid 2.5.6.2
-	superior top
-	requires
-		c
-	allows
-		searchGuide,
-		description
-
-objectclass locality
-	oid 2.5.6.3
-	superior top
-	allows
-		description,
-		l,
-		searchGuide,
-		seeAlso,
-		st,
-		street
-
-objectclass organization
-	oid 2.5.6.4
-	superior top
-	requires
-		o
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass organizationalUnit
-	oid 2.5.6.5
-	superior top
-	requires
-		ou
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass person
-	oid 2.5.6.6
-	superior top
-	requires
-		sn,
-		cn
-	allows
-		description,
-		seeAlso,
-		telephoneNumber,
-		userPassword
-
-objectclass organizationalPerson
-	oid 2.5.6.7
-	superior person
-	allows
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		title,
-		x121Address
-
-# The certificate attributes include all subtypes, such as ';binary'.
-#
-objectclass inetOrgPerson
-    oid 2.16.840.1.113730.3.2.2
-    superior organizationalPerson
-	allows
-		audio,
-		businessCategory,
-		carLicense,
-		departmentNumber,
-		displayName,
-		employeeType,
-		employeeNumber,
-		givenName,
-		homePhone,
-		homePostalAddress,
-		initials,
-		jpegPhoto,
-		labeledURI,
-		manager,
-		mobile,
-		pager,
-		photo,
-		preferredLanguage,
-		mail,
-		roomNumber,
-		secretary,
-		uid,
-		x500uniqueIdentifier,
-		userCertificate,
-		userSMimeCertificate,
-		userPKCS12
- 
-objectclass ntUser
-	oid 2.16.840.1.113730.3.2.8
-	superior top
-	requires
-		ntUserDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntUserPriv,
-		ntUserHomeDir,
-		ntUserComment,
-		ntUserFlags,
-		ntUserScriptPath,
-		ntUserAuthFlags,
-		ntUserUsrComment,
-		ntUserParms,
-		ntUserWorkstations,
-		ntUserLastLogon,
-		ntUserLastLogoff,
-		ntUserAcctExpires,
-		ntUserMaxStorage,
-		ntUserUnitsPerWeek,
-		ntUserLogonHours,
-		ntUserBadPwCount,
-		ntUserNumLogons,
-		ntUserLogonServer,
-		ntUserCountryCode,
-		ntUserCodePage,
-		ntUserUniqueId,
-		ntUserPrimaryGroupId,
-		ntUserProfile,
-		ntUserHomeDirDrive,
-		ntUserPasswordExpired,
-		ntUserCreateNewAccount,
-		ntUserDeleteAccount
-
-objectclass ntGroup
-	oid 2.16.840.1.113730.3.2.9
-	superior top
-	requires
-		ntGroupDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntGroupId,
-		ntGroupAttributes,
-		ntGroupCreateNewGroup,
-		ntGroupDeleteGroup,
-		ntGroupType
-
-objectclass organizationalRole
-   oid 2.5.6.8
-   superior top  
-	requires
-		cn
-	allows
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		roleOccupant,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass groupOfNames
-   oid 2.5.6.9
-   superior top  
-	requires
-		cn
-	allows
-		member,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfUniqueNames
-    oid 2.5.6.17
-    superior top  
-	requires
-		cn
-	allows
-		uniqueMember,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfCertificates
-    oid 2.16.840.1.113730.3.2.31
-    superior top  
-	requires
-		cn
-	allows
-		memberCertificateDescription,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfURLs
-    oid  2.16.840.1.113730.3.2.33
-    superior top  
-	requires
-		cn
-	allows
-		memberURL,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass residentialPerson
-   oid 2.5.6.10
-   superior person  
-	requires
-		l
-	allows
-		businessCategory,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass applicationProcess
-    oid 2.5.6.11
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso
-
-objectclass LDAPServer
-	oid 2.16.840.1.113730.3.2.35
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		generation,
-		changeLogMaximumAge,
-		changeLogMaximumSize
-
-objectclass LDAPReplica
-	oid 2.16.840.1.113730.3.2.36
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		replicaRoot,
-		replicaHost,
-		replicaPort,
-		replicaBindDn,
-		replicaCredentials,
-		replicaBindMethod,
-		replicaUseSSL,
-		replicaUpdateSchedule,
-		replicaUpdateReplayed,
-		replicaUpdateFailedAt,
-		replicaBeginORC,
-		replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList,
-		replicaCFUpdated,
-		replicaAbandonedChanges,
-		replicaLastRelevantChange
-
-objectclass applicationEntity
-    oid 2.5.6.12
-    superior top  
-	requires
-		presentationAddress,
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		supportedApplicationContext
-
-objectclass dSA
-   oid 2.5.6.13
-   superior applicationEntity  
-	allows
-		knowledgeInformation
-
-objectclass device
-    oid 2.5.6.14
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-objectclass strongAuthenticationUser
-    oid 2.5.6.15
-    superior top 
-	requires
-# This certificate attribute includes all subtypes, such as ';binary'.
-		userCertificate
-
-objectclass certificationAuthority
-    oid 2.5.6.16
-    superior top 
-	requires
-# These certificate attributes include all subtypes, such as ';binary'.
-		cACertificate
-	allows
-		authorityRevocationList,
-		certificateRevocationList,
-		crossCertificatePair
-
-objectclass pilotObject
-    oid 0.9.2342.19200300.100.4.3
-    superior top  
-	allows
-		audio,
-		dITRedirect,
-		info,
-		jpegPhoto,
-		lastModifiedBy,
-		lastModifiedTime,
-		manager,
-		photo,
-		uniqueIdentifier
-
-objectclass newPilotPerson
-    oid 0.9.2342.19200300.100.4.4
-    superior person 
-	allows
-		businessCategory,
-		drink,
-		homePhone,
-		homePostalAddress,
-		janetMailbox,
-		mail,
-		mailPreferenceOption,
-		mobile,
-		organizationalStatus,
-		otherMailbox,
-		pager,
-		personalSignature,
-		personalTitle,
-		preferredDeliveryMethod,
-		roomNumber,
-		secretary,
-		textEncodedORAddress,
-		uid,
-		userClass
-
-objectclass account
-    oid 0.9.2342.19200300.100.4.5
-    superior top  
-    requires
-		uid
-	allows
-		description,
-		host,
-		l,
-		o,
-		ou,
-		seeAlso
-
-objectclass document
-    oid 0.9.2342.19200300.100.4.6
-    superior pilotObject 
-	requires
-		documentIdentifier
-	allows
-		abstract,
-		authorCN,
-		authorSN,
-		cn,
-		description,
-		documentAuthor,
-		documentLocation,
-		documentPublisher,
-		documentStore,
-		documentTitle,
-		documentVersion,
-		keywords,
-		l,
-		o,
-		obsoletedByDocument,
-		obsoletesDocument,
-		ou,
-		seeAlso,
-		subject,
-		updatedByDocument,
-		updatesDocument
-
-objectclass room
-    oid 0.9.2342.19200300.100.4.7
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		roomNumber,
-		seeAlso,
-		telephoneNumber
-
-objectclass documentSeries
-    oid 0.9.2342.19200300.100.4.9
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		telephoneNumber
-
-objectclass domain
-    oid 0.9.2342.19200300.100.4.13
-    superior top  
-	requires
-		dc
-	allows
-		associatedName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		manager,
-		o,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass RFC822localPart
-    oid 0.9.2342.19200300.100.4.14
-    superior domain 
-	allows
-		cn,
-		sn
-
-objectclass DNSDomain
-    oid 0.9.2342.19200300.100.4.15
-    superior domain  
-	allows
-		dNSRecord
-
-objectclass domainRelatedObject
-    oid 0.9.2342.19200300.100.4.17
-    superior top 
-	requires
-		associatedDomain
-
-objectclass friendlyCountry
-    oid 0.9.2342.19200300.100.4.18
-    superior country 
-	requires
-		co
-
-objectclass simpleSecurityObject
-	oid 0.9.2342.19200300.100.4.19
-	superior top 
-	requires
-		userPassword
-
-objectclass pilotOrganization
-	oid pilotOrganization-OID
-	superior top
-	requires
-		ou,
-		o
-	allows
-		buildingName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-
-objectclass labeledURIObject
-	oid 1.3.6.1.4.1.250.3.15 
-	superior top
-	allows
-		labeledURI
-
-objectclass cacheObject
-	oid 1.3.6.1.4.1.250.3.18 
-	superior top
-	allows
-		ttl
-
-# objectclasses below added since Netscape Directory Server 1.01
-
-objectclass netscapeServer 
-	oid 2.16.840.1.113730.3.2.10
-	superior top
-	requires 
-		cn 
-	allows 
-		description,
-		serverRoot,
-		serverProductName,
-		serverVersionNumber,
-		installationTimeStamp,
-		administratorContactInfo,
-		userpassword,
-		adminURL,
-		serverHostName
-
-objectclass nsLicenseUser
-	oid 2.16.840.1.113730.3.2.7
-	superior top
-	allows
-		nsLicensedFor,
-		nsLicenseStartTime,
-		nsLicenseEndTime
-
-objectclass changeLogEntry
-	oid 2.16.840.1.113730.3.2.1
-	superior top
-	requires
-		targetdn,
-		changeTime,
-		changenumber,
-		changeType
-	allows
-		changes,
-		newrdn,
-		deleteoldrdn,
-		newsuperior,
-		filterinfo
-
-objectclass cirReplicaSource
-	oid 2.16.840.1.113730.3.2.11
-	requires 
-		cn,
-		objectClass
-	allows
-		cirReplicaRoot,
-                cirHost,
-                cirPort,
-                cirBindDN,
-                cirUsePersistentSearch,
-                cirUseSSL,
-                cirBindCredentials,
-                cirLastUpdateApplied,
-                cirUpdateSchedule,
-                cirSyncInterval,
-                cirUpdateFailedAt,
-                cirBeginORC,
-                replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList
-
-objectclass referral
-	superior top
-	oid 2.16.840.1.113730.3.2.6
-	allows
-		ref
-
-objectclass passwordObject
-		oid  2.16.840.1.113730.3.2.12
-        requires
-                objectClass
-        allows
-                passwordExpirationTime,
-                passwordExpWarned,
-                passwordRetryCount,
-                retryCountResetTime,
-                accountUnlockTime,
-                passwordHistory,
-		passwordAllowChangeTime
-
-objectclass passwordPolicy
-		oid  2.16.840.1.113730.3.2.13
-        requires
-                objectClass
-        allows
-		passwordMaxAge,		
-		passwordExp,
-		passwordMinLength,
-		passwordKeepHistory,
-		passwordInHistory,
-		passwordChange,
-		passwordWarning,
-		passwordLockout,
-		passwordMaxFailure,
-		passwordResetDuration,
-		passwordUnlock,
-		passwordLockoutDuration,
-		passwordCheckSyntax,
-                passwordMustChange,
-                passwordStorageScheme,
-                passwordMinAge,
-                passwordResetFailureCount
-
-objectclass glue
-		oid  2.16.840.1.113730.3.2.30
-		superior top
-
-objectclass netscapeMachineData
-		oid  2.16.840.1.113730.3.2.32
-		superior top
-
-objectclass dcObject
-	oid 1.3.6.1.4.1.1466.344
-	superior top
-	requires 
-		dc
-
-objectclass subschema
-	oid 2.5.20.1
-	superior top
-	allows 
-		cn,
-		dITStructureRules,
-		nameForms,
-		dITContentRules,
-		objectClasses,
-		attributeTypes,
-		matchingRules,
-		matchingRuleUse
-
-objectclass vlvSearch
-    oid 2.16.840.1.113730.3.2.38
-    superior top
-    requires
-        cn,
-        vlvBase,
-        vlvScope,
-        vlvFilter
-    allows
-        multiLineDescription
-
-objectclass nsslapdConfig
-	oid 2.16.840.1.113730.3.2.39
-	superior top
-	allows cn
-
-objectclass directoryServerFeature
-    oid 2.16.840.1.113730.3.2.40
-    superior top
-    allows
-        oid,
-        cn,
-        multiLineDescription
-
-objectclass nsslapdPlugin
-	oid 2.16.840.1.113730.3.2.41 
-	superior top
-	requires
-		cn,
-		nsslapd-pluginPath,
-		nsslapd-pluginInitFunc,
-		nsslapd-pluginType,
-		nsslapd-pluginId,
-		nsslapd-pluginVersion,
-		nsslapd-pluginVendor,
-		nsslapd-pluginDescription,
-		nsslapd-pluginEnabled,
-		nsslapd-backend
-
-objectclass vlvIndex
-    oid 2.16.840.1.113730.3.2.42
-    superior top
-    requires
-        cn,
-        vlvSort
-    allows
-        vlvEnabled,
-        vlvUses
-	
-objectclass nsSNMP
-	OID 2.16.840.1.113730.3.2.43
-	superior top
-	requires 
-		cn,
-		nsSNMPEnabled
-	allows
-		nsSNMPOrganization,
-		nsSNMPLocation,
-		nsSNMPContact,
-		nsSNMPDescription,
-		nsSNMPMasterHost,
-		nsSNMPMasterPort
-
-objectclass nsIndex
-    oid 2.16.840.1.113730.3.2.44
-    superior top
-    requires
-		cn,
-		nsSystemIndex
-    allows
-		description,
-		nsIndexType,
-		nsMatchingRule
-
-#
-# ojectclass from rfc2307
-#	
-
-# posixAccount is an auxiliary class. You may use account as a structural
-# class.
-objectclass posixAccount
-	oid
-		1.3.6.1.1.1.2.0
-	superior
-		top
-	requires
-		objectClass,
-		cn,
-		uid,
-		uidNumber,
-		gidNumber,
-		homeDirectory
-	allows
-		userPassword,
-		loginShell,
-		gecos,
-		description
-
-# posixAccount is an auxiliary class. You may use account as a structural
-# class.
-objectclass shadowAccount
-	oid
-		1.3.6.1.1.1.2.1
-	superior
-		top
-	requires
-		objectClass,
-		uid
-	allows
-		userPassword,
-		shadowLastChange,
-		shadowMin,
-		shadowMax,
-		shadowWarning,
-		shadowInactive,
-		shadowExpire,
-		shadowFlag,
-		description
-
-objectclass posixGroup
-	oid
-		1.3.6.1.1.1.2.2
-	requires
-		objectClass,
-		cn,
-		gidNumber
-	allows
-		userPassword,
-		memberUid,
-		description
-
-objectclass ipService
-	oid
-		1.3.6.1.1.1.2.3
-	requires
-		objectClass,
-		cn,
-		ipServicePort,
-		ipServiceProtocol
-	allows
-		description
-
-objectclass ipProtocol
-	oid
-		1.3.6.1.1.1.2.4
-	requires
-		objectClass,
-		cn,
-		ipProtocolNumber
-	allows
-		description
-
-objectclass oncRpc
-	oid
-		1.3.6.1.1.1.2.5
-	requires
-		objectClass,
-		cn,
-		oncRpcNumber
-	allows
-		description
-
-# ipHost is a subclass of device
-objectclass ipHost
-	oid
-		1.3.6.1.1.1.2.6
-	requires
-		objectClass,
-		ipHostNumber,
-		cn
-	allows
-		manager,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-
-objectclass ipNetwork
-	oid
-		1.3.6.1.1.1.2.7
-	requires
-		objectClass,
-		ipNetworkNumber,
-		cn
-	allows
-		ipNetmaskNumber,
-		manager,
-		l,
-		description
-
-objectclass nisNetgroup
-	oid
-		1.3.6.1.1.1.2.8
-	requires
-		objectClass,
-		cn
-	allows
-		nisNetgroupTriple,
-		memberNisNetgroup,
-		description
-
-# the automount class is deprecated. Because cn is case insensitive
-# on matches, you may need to use another object class to unique
-# names.
-objectclass automount
-	oid
-		1.3.6.1.1.1.2.9
-	requires
-		objectClass,
-		cn,
-		automountInformation
-	allows
-		description
-
-# nisObject represents entries in NIS maps.
-objectclass nisObject
-	oid
-		1.3.6.1.1.1.2.10
-	requires
-		objectClass,
-		cn,
-		nisMapEntry,
-		nisMapName
-	allows
-		description
-
-# ieee802Device is a subclass of device
-objectclass ieee802Device
-	oid
-		1.3.6.1.1.1.2.11
-	requires
-		objectClass,
-		cn
-	allows
-		macAddress,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# bootableDevice is a subclass of device
-objectclass bootableDevice
-	oid
-		1.3.6.1.1.1.2.12
-	requires
-		objectClass,
-		cn
-	allows
-		bootFile,
-		bootParameter,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# nisMap is a structural class which may be used as a container
-# for instances of nisObject.
-objectclass nisMap
-	oid
-		1.3.6.1.1.1.2.13
-	requires
-		objectClass,
-		nisMapName
-	allows
-		description
-
diff --git a/ldap/cm/v4confs/41/java-object-schema.conf b/ldap/cm/v4confs/41/java-object-schema.conf
deleted file mode 100644
index da4ee750..00000000
--- a/ldap/cm/v4confs/41/java-object-schema.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Schema for storing java objects and java object references
-
-attribute javaClassName			1.3.6.1.4.1.42.2.27.4.1.1	ces	single
-
-attribute javaCodebase			1.3.6.1.4.1.42.2.27.4.1.6	ces
-
-attribute javaSerializedData	1.3.6.1.4.1.42.2.27.4.1.7	bin single
-
-attribute javaRemoteLocation	1.3.6.1.4.1.42.2.27.4.1.8	ces single
-
-attribute javaFactory			1.3.6.1.4.1.42.2.27.4.1.4	ces single
-
-attribute javaReferenceAddress	1.3.6.1.4.1.42.2.27.4.1.3	ces
-
-objectclass javaContainer
-	oid 1.3.6.1.4.1.42.2.27.4.2.1
-	superior top
-	requires
-		cn
-
-objectclass javaObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.4
-	superior top
-	requires
-		javaClassName
-	allows
-		javaCodebase
-
-objectclass javaSerializedObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.5
-	superior javaObject
-	requires
-		javaSerializedData
-
-objectclass javaRemoteObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.6
-	superior javaObject
-	requires
-		javaRemoteLocation
-
-objectclass javaNamingReference
-	oid 1.3.6.1.4.1.42.2.27.4.2.7
-	superior javaObject
-	requires
-		javaReferenceAddress,
-        javaFactory
diff --git a/ldap/cm/v4confs/41/ns-admin-schema.conf b/ldap/cm/v4confs/41/ns-admin-schema.conf
deleted file mode 100644
index 73a03cac..00000000
--- a/ldap/cm/v4confs/41/ns-admin-schema.conf
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Netscape Administration Server LDAP Schema configuration file
-#
-# Version: 4.1
-# Description:
-#  Administration Server and Mission Control Console attributes
-#  and objectclasses.
-#
-
-#############################################################
-# Attributes
-#############################################################
-
-#
-# nsAdminConfig
-#
-attribute	nsAdminCgiWaitPid	cis
-attribute	nsAdminUsers		cis
-attribute	nsAdminAccessHosts	cis
-attribute	nsAdminAccessAddresses	cis
-attribute	nsAdminOneACLDir	cis
-attribute	nsAdminEnableDSGW	cis
-attribute	nsAdminEnableEnduser	cis
-attribute	nsAdminCacheLifetime	cis
-
-
-#
-# nsAdminResourceEditorExtension
-#
-attribute	nsAdminAccountInfo	cis
-attribute	nsDeleteclassname	cis
-
-#
-# nsAdminGlobalParameters
-#
-attribute	nsAdminEndUserHTMLIndex	cis
-
-#
-# nsGlobalParameters
-#
-attribute	nsUniqueAttribute	cis
-attribute	nsUserIDFormat		cis
-attribute	nsUserRDNComponent	cis
-attribute	nsGroupRDNComponent	cis
-attribute	nsWellKnownJarfiles	cis
-attribute	nsNYR			cis
-
-#
-# nsDefaultObjectClasses
-#
-attribute	nsDefaultObjectClass	cis
-
-#
-# nsAdminConsoleUser
-#
-attribute	nsPreference		cis
-
-#
-# nsCustomView
-#
-attribute	nsDisplayName		cis
-
-#
-# nsTopologyCustomView
-#
-attribute	nsViewConfiguration	cis
-
-#############################################################
-# Objectclasses
-#############################################################
-
-objectclass nsAdminServer
-    superior top
-    requires
-        cn,
-        nsServerID
-    allows
-        description
-
-objectclass nsAdminConfig
-    superior nsConfig
-    allows
-        nsAdminCgiWaitPid,
-        nsAdminUsers,
-        nsAdminAccessHosts,
-        nsAdminAccessAddresses,
-        nsAdminOneACLDir,
-        nsAdminEnableDSGW,
-	nsAdminEnableEnduser,
-	nsAdminCacheLifetime
-
-objectclass nsAdminResourceEditorExtension
-    superior nsAdminObject
-    requires
-        cn
-    allows
-	nsAdminAccountInfo,
-	nsDeleteclassname
-
-objectclass nsAdminGlobalParameters
-    superior top
-    requires
-        cn
-    allows
-        nsAdminEndUserHTMLIndex,
-        nsNickname
-        
-objectclass nsGlobalParameters
-    superior top
-    requires
-        cn
-    allows
-        nsUniqueAttribute,
-	nsUserIDFormat,
-	nsUserRDNComponent,
-	nsGroupRDNComponent,
-	nsWellKnownJarFiles,
-	nsNYR
-        
-objectclass nsDefaultObjectClasses
-    superior top
-    requires 
-        cn
-    allows
-        nsDefaultObjectClass
-
-objectclass nsAdminConsoleUser
-	superior top
-	requires
-		cn
-	allows
-		nsPreference
-		
-objectclass nsCustomView
-	superior nsAdminObject
-	allows
-		nsDisplayName,
-	
-objectclass nsTopologyCustomView
-	superior nsCustomView
-	requires
-		cn
-	allows
-		nsViewConfiguration
-
-objectclass nsTopologyPlugin
-	superior nsAdminObject
-	allows	
diff --git a/ldap/cm/v4confs/41/ns-calendar-globopt.conf b/ldap/cm/v4confs/41/ns-calendar-globopt.conf
deleted file mode 100644
index 9b49a483..00000000
--- a/ldap/cm/v4confs/41/ns-calendar-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-index   nsCalXItemId    pres,eq,sub
diff --git a/ldap/cm/v4confs/41/ns-calendar-schema.conf b/ldap/cm/v4confs/41/ns-calendar-schema.conf
deleted file mode 100644
index 1df0b736..00000000
--- a/ldap/cm/v4confs/41/ns-calendar-schema.conf
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsCalAccess                 2.16.840.1.113730.3.1.112  cis     
-attribute nsCalAccessDomain           2.16.840.1.113730.3.1.113  cis     
-attribute nsCalAdmd                   2.16.840.1.113730.3.1.114  cis     
-attribute nsCalDefaultNoteReminder    2.16.840.1.113730.3.1.115  cis     
-attribute nsCalDefaultReminder        2.16.840.1.113730.3.1.116  cis     
-attribute nsCalDefaultTaskReminder    2.16.840.1.113730.3.1.117  cis     
-attribute nsCalDisplayPrefs           2.16.840.1.113730.3.1.118  cis     
-attribute nsCalFlags                  2.16.840.1.113730.3.1.119  cis     
-attribute nsCalHost                   2.16.840.1.113730.3.1.120  cis     
-attribute nsCalLanguageId             2.16.840.1.113730.3.1.121  cis     
-attribute nsCalNodeAlias              2.16.840.1.113730.3.1.122  cis     
-attribute nsCalNotifMechanism         2.16.840.1.113730.3.1.123  cis     
-attribute nsCalOperatingPrefs         2.16.840.1.113730.3.1.124  cis     
-attribute nsCalOrgUnit2               2.16.840.1.113730.3.1.125  cis     
-attribute nsCalOrgUnit3               2.16.840.1.113730.3.1.126  cis     
-attribute nsCalOrgUnit4               2.16.840.1.113730.3.1.127  cis     
-attribute nsCalPasswordRequired       2.16.840.1.113730.3.1.128  cis     
-attribute nsCalPrmd                   2.16.840.1.113730.3.1.129  cis     
-attribute nsCalRefreshPrefs           2.16.840.1.113730.3.1.130  cis     
-attribute nsCalResourceCapacity       2.16.840.1.113730.3.1.131  cis     
-attribute nsCalResourceNumber         2.16.840.1.113730.3.1.132  cis     
-attribute nsCalServerVersion          2.16.840.1.113730.3.1.133  cis     
-attribute nsCalSysopCanWritePassword  2.16.840.1.113730.3.1.134  cis     
-attribute nsCalTimezone               2.16.840.1.113730.3.1.135  cis     
-attribute nsCalXItemId                2.16.840.1.113730.3.1.136  cis     
-
-
-objectclass nsCalUser
-		oid 2.16.840.1.113730.3.2.14
-        requires
-                objectClass
-        allows
-		c,
-		employeeNumber,
-                generationQualifier,
-		givenName,
-		initials,
-		mail,
-		o,
-		ou,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalRefreshPrefs,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass nsCalAdmin
-		oid 2.16.840.1.113730.3.2.15
-        requires
-                objectClass
-        allows
-		c,
-                cn,
-                facsimileTelephoneNumber,
-                generationQualifier,
-                givenName,
-                initials,
-		mail,
-		o,
-                ou,
-                postalAddress,
-                sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalXItemId
-
-objectclass nsCalResource
-		oid 2.16.840.1.113730.3.2.16
-        requires
-                objectClass
-        allows
-                cn,
-                facsimileTelephoneNumber,
-		givenName,
-		mail,
-                postalAddress,
-		sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalPasswordRequired,
-                nsCalRefreshPrefs,
-                nsCalResourceCapacity,
-                nsCalResourceNumber,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass netscapeCalendarServer
-		oid 2.16.840.1.113730.3.2.17
-        requires
-                objectclass
-
-
-
diff --git a/ldap/cm/v4confs/41/ns-certificate-globopt.conf b/ldap/cm/v4confs/41/ns-certificate-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/41/ns-certificate-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/41/ns-certificate-schema.conf b/ldap/cm/v4confs/41/ns-certificate-schema.conf
deleted file mode 100644
index 02efd5a2..00000000
--- a/ldap/cm/v4confs/41/ns-certificate-schema.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-attribute 	nsCertConfig 	cis
-
-objectclass netscapeCertificateServer
-                oid 2.16.840.1.113730.3.2.18
-        requires
-                objectclass
-
-objectclass nsCertificateServer
-        requires
-                objectclass,
-                nsServerID
-        allows
-                serverHostName,
-                nsServerPort,
-		nsCertConfig
-
-
diff --git a/ldap/cm/v4confs/41/ns-common-schema.conf b/ldap/cm/v4confs/41/ns-common-schema.conf
deleted file mode 100644
index 2cb7e480..00000000
--- a/ldap/cm/v4confs/41/ns-common-schema.conf
+++ /dev/null
@@ -1,278 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Common LDAP schema configuration file
-#
-# Version: 4.1
-# Description:
-#   This configuration file contains objectclasses and attributes 
-#   common to the Mission Control Framework
-#
-
-#############################################################
-# Attributes
-#############################################################
-
-#
-# Common Attributes
-#
-attribute nsServerID  			cis
-attribute nsBaseDN    			cis
-attribute nsBindDN    			cis
-attribute nsBindPassword 		cis
-attribute nsServerPort			cis
-attribute nsServerAddress 		cis
-attribute nsDirectoryInfoRef		dn
-attribute nsDirectoryURL		ces
-attribute nsDirectoryFailoverList	ces
-#
-# nsAdminDomain
-#
-attribute	nsAdminDomainName	cis
-
-#
-# nsHost
-#
-attribute	nsHostLocation 		cis
-attribute	nsHardwarePlatform	cis
-attribute	nsOsVersion		cis
-
-#
-# nsAdminGroup
-#
-attribute	nsAdminGroupName	cis
-attribute	nsConfigRoot		cis
-attribute	nsAdminSIEDN		dn
-
-#
-# nsApplication
-#
-attribute	nsVendor		cis
-attribute	nsProductName		cis
-attribute	nsNickName		cis
-attribute	nsProductVersion	cis
-attribute	nsBuildNumber		cis
-attribute	nsRevisionNumber	cis
-attribute	nsSerialNumber		cis
-attribute	nsInstalledLocation	cis
-attribute	nsExpirationDate	cis
-attribute	nsBuildSecurity		cis
-attribute	nsServerMigrationClassname	cis
-attribute	nsServerCreationClassname	cis
-attribute       nsLdapSchemaVersion     cis
-
-#
-# nsConfig
-#
-attribute	nsSuiteSpotUser		cis
-attribute	nsErrorLog		cis
-attribute	nsPidLog		cis
-attribute	nsAccessLog		cis
-attribute	nsDefaultAcceptLanguage	cis
-attribute	nsServerSecurity	cis
-
-#
-# nsEncryptionConfig
-#
-attribute	nsCertfile		cis
-attribute	nsKeyfile		cis
-attribute	nsSSL2			cis
-attribute	nsSSL3			cis
-attribute	nsSSLClientAuth		cis
-attribute	nsSSLSessionTimeout	cis
-attribute	nsSSL3SessionTimeout	cis
-attribute	nsSSL2Ciphers		cis
-attribute	nsSSL3Ciphers		cis
-
-#
-# nsEncryptionModule
-#
-attribute	nsSSLToken		cis
-attribute	nsSSLPersonalitySSL	cis
-attribute	nsSSLActivation		cis
-
-#
-# nsTask
-#
-attribute	nsTaskLabel		cis
-attribute	nsHelpRef		cis
-attribute	nsExecRef		cis
-attribute	nsLogSuppress		cis
-
-#
-# nsAdminObject
-#
-attribute	nsJarfilename		cis
-attribute	nsClassname		cis
-
-
-#############################################################
-# Object Classes
-#############################################################
-objectclass nsAdminDomain
-    superior organizationalUnit
-    allows
-	nsAdminDomainName
-
-objectclass nsHost
-    superior top
-    requires
-        cn
-    allows
-        serverHostName,
-        description,
-        l,
-        nsHostLocation,
-        nsHardwarePlatform,
-        nsOsVersion
-
-objectclass nsAdminGroup
-    superior top
-    requires
-        cn
-    allows
-	nsAdminGroupName,
-        description,
-        nsConfigRoot,
-	nsAdminSIEDN
-
-objectclass nsApplication
-    superior top
-    requires 
-        cn
-    allows 
-        nsVendor,
-        description, 
-        nsProductName,                 
-        nsNickName,           
-        nsProductVersion,              
-        nsBuildNumber, 
-        nsRevisionNumber,       
-        nsSerialNumber, 
-        nsInstalledLocation,    
-        installationTimeStamp,
-        nsExpirationDate,       
-        nsBuildSecurity,
-	nsLdapSchemaVersion,
-        nsServerMigrationClassname,
-        nsServerCreationClassname
-
-objectclass nsEncryptionConfig
-    superior top
-    requires
-        cn
-    allows
-        nsCertfile,
-        nsKeyfile,
-        nsSSL2,
-        nsSSL3,
-        nsSSLSessionTimeout,
-        nsSSL3SessionTimeout,
-        nsSSLClientAuth,
-        nsSSL2Ciphers,
-        nsSSL3Ciphers
- 
-objectclass nsEncryptionModule
-    superior top
-    requires
-        cn
-    allows
-        nsSSLToken,
-        nsSSLPersonalityssl,
-        nsSSLActivation
-
-
-objectclass nsResourceRef
-    superior top
-    requires
-        cn
-    allows
-        seeAlso
-            
-objectclass nsTask
-    superior top
-    requires
-        cn
-    allows
-        nsTaskLabel,
-        nsHelpref,
-        nsExecref,
-        nsLogSuppress
-    
-objectclass nsTaskGroup
-    superior top
-    requires
-        cn
-    allows
-        nsTaskLabel
-
-objectclass nsAdminObject
-    superior top
-    requires
-        cn
-    allows
-        nsJarFilename,
-        nsClassName    
-        
-objectclass nsConfig
-    superior top
-    requires
-        cn
-    allows
-        description,
-        nsServerPort,
-	nsServerAddress,
-        nsSuiteSpotUser,
-        nsErrorLog,
-        nsPidLog,
-        nsAccessLog,
-        nsDefaultAcceptLanguage,
-	nsServerSecurity
-
-objectclass nsDirectoryInfo
-    superior top
-    requires 
-	cn
-    allows
-	nsBindDN,
-	nsBindPassword,
-	nsDirectoryURL,
-	nsDirectoryFailoverList,
-	nsDirectoryInfoRef
diff --git a/ldap/cm/v4confs/41/ns-compass-globopt.conf b/ldap/cm/v4confs/41/ns-compass-globopt.conf
deleted file mode 100644
index 6c56c350..00000000
--- a/ldap/cm/v4confs/41/ns-compass-globopt.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	pipuid			pres,eq,sub
-index	pipstatus		eq
-
diff --git a/ldap/cm/v4confs/41/ns-compass-schema.conf b/ldap/cm/v4confs/41/ns-compass-schema.conf
deleted file mode 100644
index 52997ea4..00000000
--- a/ldap/cm/v4confs/41/ns-compass-schema.conf
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-
-# Compass server specific (not currently used) 
-
-objectclass netscapeCompassServer
-		oid 2.16.840.1.113730.3.2.19
-        requires        
-                objectclass
-
-
-# Attributes for personal interest profile classes
-
-attribute pipuid                      2.16.840.1.113730.3.1.137  cis     
-attribute pipcompassservers           2.16.840.1.113730.3.1.138  cis     
-attribute pipuniqueid                 2.16.840.1.113730.3.1.139  cis     
-attribute pipstatus                   2.16.840.1.113730.3.1.140  cis     
-attribute pipusertype                 2.16.840.1.113730.3.1.141  cis     
-attribute pipfrequency                2.16.840.1.113730.3.1.142  cis     
-attribute pipmedium                   2.16.840.1.113730.3.1.143  cis     
-attribute pipformat                   2.16.840.1.113730.3.1.144  cis     
-attribute piphour                     2.16.840.1.113730.3.1.145  cis     
-attribute pipmaxhits                  2.16.840.1.113730.3.1.146  cis     
-attribute pipresultset                2.16.840.1.113730.3.1.147  cis     
-attribute pipsortorder                2.16.840.1.113730.3.1.148  cis     
-attribute piptimestamp                2.16.840.1.113730.3.1.149  cis     
-attribute pipirlist                   2.16.840.1.113730.3.1.150  cis     
-attribute pipiroption                 2.16.840.1.113730.3.1.151  cis     
-attribute pippwp                      2.16.840.1.113730.3.1.152  cis     
-attribute piplastcount                2.16.840.1.113730.3.1.153  cis     
-attribute piptotalcount               2.16.840.1.113730.3.1.154  cis     
-attribute piptotalrun                 2.16.840.1.113730.3.1.155  cis     
-attribute pipnotify                   2.16.840.1.113730.3.1.156  cis     
-attribute pipprivilege                2.16.840.1.113730.3.1.157  cis     
-attribute pipgroup                    2.16.840.1.113730.3.1.158  cis     
-attribute pipidstcount                2.16.840.1.113730.3.1.159  cis     
-attribute pipstid                     2.16.840.1.113730.3.1.160  cis     
-attribute pipstname                   2.16.840.1.113730.3.1.161  cis     
-attribute pipstquery                  2.16.840.1.113730.3.1.162  cis     
-attribute pipsttaxonomy               2.16.840.1.113730.3.1.163  cis     
-attribute pipstinterest               2.16.840.1.113730.3.1.164  cis     
-attribute pipsttype                   2.16.840.1.113730.3.1.165  cis     
-attribute pipstprivacy                2.16.840.1.113730.3.1.166  cis     
-attribute pipststatus                 2.16.840.1.113730.3.1.167  cis     
-attribute pipstlastcount              2.16.840.1.113730.3.1.168  cis     
-attribute pipsttotalcount             2.16.840.1.113730.3.1.169  cis     
-attribute pipsttotalrun               2.16.840.1.113730.3.1.170  cis     
-attribute pipstcategory               2.16.840.1.113730.3.1.171  cis     
-attribute pipstfrequency              2.16.840.1.113730.3.1.172  cis     
-attribute pipstmedium                 2.16.840.1.113730.3.1.173  cis     
-attribute pipstformat                 2.16.840.1.113730.3.1.174  cis     
-attribute pipsthour                   2.16.840.1.113730.3.1.175  cis     
-attribute pipstmaxhits                2.16.840.1.113730.3.1.176  cis     
-attribute pipstresultset              2.16.840.1.113730.3.1.177  cis     
-attribute pipstsortorder              2.16.840.1.113730.3.1.178  cis     
-attribute pipsttimestamp              2.16.840.1.113730.3.1.179  cis     
-attribute pipstirlist                 2.16.840.1.113730.3.1.180  cis     
-attribute pipstiroption               2.16.840.1.113730.3.1.181  cis     
-attribute pipreservedcis1             2.16.840.1.113730.3.1.182  cis     
-attribute pipreservedcis2             2.16.840.1.113730.3.1.183  cis     
-attribute pipreservedcis3             2.16.840.1.113730.3.1.184  cis     
-attribute pipreservedcis4             2.16.840.1.113730.3.1.185  cis     
-attribute pipreservedcis5             2.16.840.1.113730.3.1.186  cis     
-attribute pipreservedcis6             2.16.840.1.113730.3.1.187  cis     
-attribute pipreservedces1             2.16.840.1.113730.3.1.188  ces     
-attribute pipreservedces2             2.16.840.1.113730.3.1.189  ces     
-attribute pipreservedces3             2.16.840.1.113730.3.1.190  ces     
-
-
-# Each interest profile is one of these and sits under the compass SIE
-
-objectclass personalInterestProfile 
-		oid 2.16.840.1.113730.3.2.20
-        requires        
-                objectclass,
-		pipuid
-	allows
-		pipuniqueid,
-		pipstatus,
-		pipusertype,
-		pipfrequency,
-		pipmedium,
-		pipformat,
-		piphour,
-		pipmaxhits,
-		pipresultset,
-		pipsortorder,
-		piptimestamp,
-		pipirlist,
-		pipiroption,
-		pippwp,
-		piplastcount,
-		piptotalcount,
-		piptotalrun,
-		pipnotify,
-		pipprivilege,
-		pipgroup,
-		pipidstcount,
-		pipstid,
-		pipstname,
-		pipstquery,
-		pipsttaxonomy,
-		pipstinterest,
-		pipsttype,
-		pipstprivacy,
-		pipststatus,
-		pipstlastcount,
-		pipsttotalcount,
-		pipsttotalrun,
-		pipstcategory,
-		pipstfrequency,
-		pipstmedium,
-		pipstformat,
-		pipsthour,
-		pipstmaxhits,
-		pipstresultset,
-		pipstsortorder,
-		pipsttimestamp,
-		pipstirlist,
-		pipstiroption,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
-
-# Replication of user info for template users, completeness, etc.
-# (not currently used)
-
-objectclass PIPUserInfo
-		oid 2.16.840.1.113730.3.2.21
-        requires        
-                objectclass
-	allows
-		cn,
-		mail,
-		userPassword,
-		description,
-		pipcompassservers,
-		pipuniqueid
-
-
-# Enhancements to a normal user entry (not currently used)
-
-objectclass PIPUser
-	oid 2.16.840.1.113730.3.2.22		
-	requires        
-        objectclass
-	allows
-		pipuniqueid,
-		pipcompassservers,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
diff --git a/ldap/cm/v4confs/41/ns-cos-schema.conf b/ldap/cm/v4confs/41/ns-cos-schema.conf
deleted file mode 100644
index abea53fd..00000000
--- a/ldap/cm/v4confs/41/ns-cos-schema.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Attributes used by Class of Service
-
-attribute cosAttribute 2.16.840.1.113730.3.1.550 cis
-attribute cosSpecifier 2.16.840.1.113730.3.1.551 cis
-attribute cosTargetTree 2.16.840.1.113730.3.1.552 cis
-attribute cosTemplateDn 2.16.840.1.113730.3.1.553 cis
-
-# Object classes used by Class of Service
-
-objectclass cosDefinition
-	oid 2.16.840.1.113730.3.2.84
-	superior top
-	requires
-		objectclass
-	allows
-		aci,
-		cn,
-		uid,
-		costargettree,
-		costemplatedn,
-		cosspecifier,
-		cosattribute
diff --git a/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
deleted file mode 100644
index 57e510f5..00000000
--- a/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Netscape Delegated Administrator LDAP Schema
-#
-# Version: 1.0
-#
-# Attributes and objectclasses for:
-#
-# Netscape Delegated Administrator 1.0
-#
-# DT 9/24/98
-
-#############################################################
-# Delegated User Administration Attributes
-#############################################################
-
-attribute       nsNumUsers		cis
-attribute	nsMaxUsers		cis
-attribute	nsNumDepts		cis
-attribute	nsMaxDepts		cis
-attribute	nsNumDomains		cis
-attribute	nsDefaultMaxDeptSize	cis
-attribute	nsSearchFilter	        cis
-
-#############################################################
-# Delegated User Administration Objectclasses
-#############################################################
-
-objectclass nsManagedISP
-	superior top
-	allows
-		nsNumDomains
-
-objectclass nsManagedDomain
-	superior top
-	allows
-		owner,
-		nsNumUsers,
-		nsMaxUsers,
-		nsNumDepts,
-		nsMaxDepts,
-		nsDefaultMaxDeptSize
-
-objectclass nsManagedDept
-	superior groupofuniquenames
-	allows
-		owner,
-		nsNumUsers,
-		nsMaxUsers
-
-objectclass nsManagedPerson
-	superior top
-	allows
-		owner,
-		nsSearchFilter
-
diff --git a/ldap/cm/v4confs/41/ns-directory-globopt.conf b/ldap/cm/v4confs/41/ns-directory-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/41/ns-directory-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/41/ns-directory-schema.conf b/ldap/cm/v4confs/41/ns-directory-schema.conf
deleted file mode 100644
index ef4ed640..00000000
--- a/ldap/cm/v4confs/41/ns-directory-schema.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute	nsSecureServerPort 		cis
-
-objectclass netscapeDirectoryServer
-		oid 2.16.840.1.113730.3.2.23
-        requires        
-                objectclass
-
-objectclass nsDirectoryServer
-        requires
-                objectclass,
-                nsServerID
-        allows
-                serverHostName,
-                nsServerPort,
-                nsSecureServerPort,
-                nsBindPassword,
-                nsBindDN,
-                nsBaseDN
diff --git a/ldap/cm/v4confs/41/ns-legacy-schema.conf b/ldap/cm/v4confs/41/ns-legacy-schema.conf
deleted file mode 100644
index 43231314..00000000
--- a/ldap/cm/v4confs/41/ns-legacy-schema.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-attribute    url                    	cis
-
-#use by Netscape Admin Server 4.1 for LegacyServers
-
-objectclass nsLegacyAdminGroup
-	superior
-		nsAdminGroup
-	allows
-		adminUrl
-
-objectclass nsLegacyApplication
-	superior 
-	     nsApplication
-	allows 
-
-objectclass nsLegacyAdminServer
-        superior
-                nsAdminServer
-        allows
-
-objectclass nsLegacyServer 
-	superior 
-	     netscapeServer
-	allows 
-	     nsServerID,
-	     url
diff --git a/ldap/cm/v4confs/41/ns-mail-globopt.conf b/ldap/cm/v4confs/41/ns-mail-globopt.conf
deleted file mode 100644
index cf392ea4..00000000
--- a/ldap/cm/v4confs/41/ns-mail-globopt.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Messaging Server
-index	mailAlternateAddress	eq
-index	mailHost	eq
-#index	uid,mail	eq
-#index	uniquemember,member	eq
diff --git a/ldap/cm/v4confs/41/ns-mail-schema.conf b/ldap/cm/v4confs/41/ns-mail-schema.conf
deleted file mode 100644
index 8cfa0b76..00000000
--- a/ldap/cm/v4confs/41/ns-mail-schema.conf
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-attribute	mailAccessDomain	2.16.840.1.113730.3.1.12 cis
-attribute	mailAlternateAddress	2.16.840.1.113730.3.1.13 cis
-attribute	mailAutoReplyMode	2.16.840.1.113730.3.1.14 cis
-attribute	mailAutoReplyText	2.16.840.1.113730.3.1.15 cis
-attribute	mailDeliveryOption	2.16.840.1.113730.3.1.16 cis
-attribute	mailForwardingAddress	2.16.840.1.113730.3.1.17 cis
-attribute	mailHost		2.16.840.1.113730.3.1.18 cis
-attribute	mailQuota		2.16.840.1.113730.3.1.21 cis
-attribute	mailRoutingAddress      2.16.840.1.113730.3.1.47 cis
-
-attribute	mailMessageStore	2.16.840.1.113730.3.1.19 ces
-attribute	mailProgramDeliveryInfo	2.16.840.1.113730.3.1.20 ces
-
-attribute	nsmsgDisallowAccess	ces
-
-attribute	vacationstartdate	cis
-attribute	vacationenddate		cis
-
-# mailRecipient is used to designate an LDAP entry as representing some
-# entity that can receive mail, e.g. a mail user or mail group.
-# Note: attributes 'mailAccessDomain' through 'userPassword' do not
-# belong to mailRecipient, but are included here for backward compatibility.
-objectClass mailRecipient
-	oid 2.16.840.1.113730.3.2.3
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mailAccessDomain,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota,
-		multiLineDescription,
-		uid,
-		userPassword
-
-attribute	nswmExtendedUserPrefs	2.16.840.1.113730.3.1.520 cis
-
-# nsMessagingServerUser is used to designate an LDAP entry as representing a
-# Netscape Messaging Server user account.  It is used in combination with
-# mailRecipient.
-objectClass nsMessagingServerUser
-	oid 2.16.840.113730.3.2.37
-	requires
-		objectClass
-	allows
-		cn,
-		mailAccessDomain,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota,
-		nsmsgDisallowAccess,
-		nswmExtendedUserPrefs,
-		vacationstartdate,
-		vacationenddate
-
-attribute	mgrpAllowedDomain	2.16.840.1.113730.3.1.23 cis
-attribute	mgrpMsgRejectAction	2.16.840.1.113730.3.1.28 cis
-attribute	mgrpRFC822MailMember	2.16.840.1.113730.3.1.30 cis
-attribute	mgrpMsgMaxSize		2.16.840.1.113730.3.1.32 cis single
-attribute	mgrpBroadcasterPolicy	cis
-attribute	mgrpNoDuplicateChecks	cis single
-attribute	mgrpRemoveHeader	cis
-
-attribute	mgrpAllowedBroadcaster	2.16.840.1.113730.3.1.22 ces
-attribute	mgrpDeliverTo		2.16.840.1.113730.3.1.25 ces
-attribute	mgrpErrorsTo		2.16.840.1.113730.3.1.26 ces single
-attribute	mgrpModerator		2.16.840.1.113730.3.1.33 ces
-attribute	mgrpMsgRejectText	2.16.840.1.113730.3.1.29 ces
-attribute	mgrpAddHeader		ces
-
-attribute	mgrpApprovePassword	ces single
-
-# mailGroup is used to designate an LDAP entry as representing a mail group
-# (mailing list).  It is used in combination with mailRecipient.
-# Note: attributes 'mail' through 'mailRoutingAddress' belong to mailRecipient,
-# but are also included here for backward compatibility.
-objectClass mailGroup
-	oid 2.16.840.1.113730.3.2.4
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mgrpAddHeader,
-		mgrpAllowedBroadcaster,
-		mgrpAllowedDomain,
-		mgrpApprovePassword,
-		mgrpBroadcasterPolicy,
-		mgrpDeliverTo,
-		mgrpErrorsTo,
-		mgrpModerator,
-		mgrpMsgMaxSize,
-		mgrpMsgRejectAction,
-		mgrpMsgRejectText,
-		mgrpNoDuplicateChecks,
-		mgrpRemoveHeader,
-		mgrpRFC822MailMember,
-		owner
-
-attribute	mailEnhancedUniqueMember	2.16.840.1.113730.3.1.31 dn
-
-objectClass groupOfMailEnhancedUniqueNames
-	oid 2.16.840.1.113730.3.2.5
-	requires
-		objectClass,
-		cn
-	allows
-		businessCategory,
-		description,
-		mailEnhancedUniqueMember,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectClass	netscapeMailServer
-	oid 2.16.840.1.113730.3.2.24
-	requires
-		objectClass
-
diff --git a/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
deleted file mode 100644
index a7e0be55..00000000
--- a/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# ns-mcd-browser-schema.conf
-#
-# Netscape Mission Control Desktop browser client schema
-# This schema is used to hold browser client preferences.
-#
-
-attribute nsBCStartupBrowser              2.16.840.1.113730.3.1.409  cis
-attribute nsBCStartupMail                 2.16.840.1.113730.3.1.410  cis
-attribute nsBCStartupEditor               2.16.840.1.113730.3.1.411  cis
-attribute nsBCStartupCalendar             2.16.840.1.113730.3.1.412  cis
-attribute nsBCChromeButtonStyle           2.16.840.1.113730.3.1.413  cis
-attribute nsBCUseDocumentFonts            2.16.840.1.113730.3.1.414  cis
-attribute nsBCForegroundColor             2.16.840.1.113730.3.1.415  cis
-attribute nsBCBackgroundColor             2.16.840.1.113730.3.1.416  cis
-attribute nsBCAnchorColor                 2.16.840.1.113730.3.1.417  cis
-attribute nsBCVisitedColor                2.16.840.1.113730.3.1.418  cis
-attribute nsBCUnderlineAnchors            2.16.840.1.113730.3.1.419  cis
-attribute nsBCUseDocumentColors           2.16.840.1.113730.3.1.420  cis
-attribute nsBCStartupPage                 2.16.840.1.113730.3.1.421  cis
-attribute nsBCStartupHomePage             2.16.840.1.113730.3.1.422  cis
-attribute nsBCLinkExpiration              2.16.840.1.113730.3.1.423  cis
-attribute nsBCIntlAcceptLanguages         2.16.840.1.113730.3.1.424  cis
-attribute nsBCMimeType                    2.16.840.1.113730.3.1.425  cis
-attribute nsBCMimeAllowAdd                2.16.840.1.113730.3.1.426  cis
-attribute nsBCMimeAllowEdit               2.16.840.1.113730.3.1.427  cis
-attribute nsBCMimeAllowRemove             2.16.840.1.113730.3.1.428  cis
-attribute nsBCRelatedEnabled              2.16.840.1.113730.3.1.429  cis
-attribute nsBCRelatedAutoload             2.16.840.1.113730.3.1.430  cis
-attribute nsBCRelatedDisabledForDomains   2.16.840.1.113730.3.1.431  cis
-attribute nsBCGoBrowsingEnabled           2.16.840.1.113730.3.1.432  cis
-attribute nsBCOfflineStartupState         2.16.840.1.113730.3.1.433  cis
-attribute nsBCOfflineSendUnsentMessages   2.16.840.1.113730.3.1.434  cis
-attribute nsBCOfflinePromptSynchOnExit    2.16.840.1.113730.3.1.435  cis
-attribute nsBCAlwaysLoadImages            2.16.840.1.113730.3.1.436  cis
-attribute nsBCEnableJava                  2.16.840.1.113730.3.1.437  cis
-attribute nsBCEnableJavaScript            2.16.840.1.113730.3.1.438  cis
-attribute nsBCEnableStyleSheets           2.16.840.1.113730.3.1.439  cis
-attribute nsBCEmailAsFtpPassword          2.16.840.1.113730.3.1.440  cis
-attribute nsBCCookieBehavior              2.16.840.1.113730.3.1.441  cis
-attribute nsBCWarnAboutCookies            2.16.840.1.113730.3.1.442  cis
-attribute nsBCMemoryCacheSize             2.16.840.1.113730.3.1.443  cis
-attribute nsBCDiskCacheSize               2.16.840.1.113730.3.1.444  cis
-attribute nsBCCheckDocFrequency           2.16.840.1.113730.3.1.445  cis
-attribute nsBCProxyType                   2.16.840.1.113730.3.1.446  cis
-attribute nsBCProxyHttp                   2.16.840.1.113730.3.1.447  cis
-attribute nsBCProxySsl                    2.16.840.1.113730.3.1.448  cis
-attribute nsBCProxyFtp                    2.16.840.1.113730.3.1.449  cis
-attribute nsBCProxySocks                  2.16.840.1.113730.3.1.450  cis
-attribute nsBCProxyGopher                 2.16.840.1.113730.3.1.451  cis
-attribute nsBCProxyWais                   2.16.840.1.113730.3.1.452  cis
-attribute nsBCNoProxiesOn                 2.16.840.1.113730.3.1.453  cis
-attribute nsBCProxyAutoConfigUrl          2.16.840.1.113730.3.1.454  cis
-attribute nsBCAutoUpdateEnabled           2.16.840.1.113730.3.1.455  cis
-attribute nsBCAutoUpdateConfirmInstall    2.16.840.1.113730.3.1.456  cis
-
-
-objectclass nsBrowserClient 
-	oid 2.16.840.1.113730.3.2.78
-    superior top 
-    allows 
-	nsBCStartupBrowser,
-	nsBCStartupMail,
-	nsBCStartupEditor,
-	nsBCStartupCalendar,
-	nsBCChromeButtonStyle,
-	nsBCUseDocumentFonts,
-	nsBCForegroundColor,
-	nsBCBackgroundColor,
-	nsBCAnchorColor,
-	nsBCVisitedColor,
-	nsBCUnderlineAnchors,
-	nsBCUseDocumentColors,
-	nsBCStartupPage,
-	nsBCStartupHomePage,
-	nsBCLinkExpiration,
-	nsBCIntlAcceptLanguages,
-	nsBCMimeType,
-	nsBCMimeAllowAdd,
-	nsBCMimeAllowEdit,
-	nsBCMimeAllowRemove,
-	nsBCRelatedEnabled,
-	nsBCRelatedAutoload,
-	nsBCRelatedDisabledForDomains,
-	nsBCGoBrowsingEnabled,
-	nsBCOfflineStartupState,
-	nsBCOfflineSendUnsentMessages,
-	nsBCOfflinePromptSynchOnExit,
-	nsBCAlwaysLoadImages,
-	nsBCEnableJava,
-	nsBCEnableJavaScript,
-	nsBCEnableStyleSheets,
-	nsBCEmailAsFtpPassword,
-	nsBCCookieBehavior,
-	nsBCWarnAboutCookies,
-	nsBCMemoryCacheSize,
-	nsBCDiskCacheSize,
-	nsBCCheckDocFrequency,
-	nsBCProxyType,
-	nsBCProxyHttp,
-	nsBCProxySsl,
-	nsBCProxyFtp,
-	nsBCProxySocks,
-	nsBCProxyGopher,
-	nsBCProxyWais,
-	nsBCNoProxiesOn,
-	nsBCProxyAutoConfigUrl,
-	nsBCAutoUpdateEnabled,
-	nsBCAutoUpdateConfirmInstall
-
-# 
-# Netscape Mission Control Desktop browser security schema
-# This schema is used to hold browser security preferences.
-#
-
-attribute nsBSAskForPassword              2.16.840.1.113730.3.1.457  cis
-attribute nsBSPasswordLifetime            2.16.840.1.113730.3.1.458  cis
-attribute nsBSWarnEnteringSecure          2.16.840.1.113730.3.1.459  cis
-attribute nsBSWarnLeavingSecure           2.16.840.1.113730.3.1.460  cis
-attribute nsBSWarnViewingMixed            2.16.840.1.113730.3.1.461  cis
-attribute nsBSWarnSubmitInsecure          2.16.840.1.113730.3.1.462  cis
-attribute nsBSEnableSsl2                  2.16.840.1.113730.3.1.463  cis
-attribute nsBSEnableSsl3                  2.16.840.1.113730.3.1.464  cis
-attribute nsBSCertmgmtDisableFunctionMsg  2.16.840.1.113730.3.1.465  cis
-attribute nsBSSsl2Rc4128                  2.16.840.1.113730.3.1.466  cis
-attribute nsBSSsl2Rc2128                  2.16.840.1.113730.3.1.467  cis
-attribute nsBSSsl2DesEd3192               2.16.840.1.113730.3.1.468  cis
-attribute nsBSSsl2Des64                   2.16.840.1.113730.3.1.469  cis
-attribute nsBSSsl2Rc440                   2.16.840.1.113730.3.1.470  cis
-attribute nsBSSsl2Rc240                   2.16.840.1.113730.3.1.471  cis
-attribute nsBSSsl3RsaRc4128Md5            2.16.840.1.113730.3.1.472  cis
-attribute nsBSSsl3FipsDesEd3Sha           2.16.840.1.113730.3.1.473  cis
-attribute nsBSSsl3RsaRc4128Md5            2.16.840.1.113730.3.1.474  cis
-attribute nsBSSsl3RsaFipsDesSha           2.16.840.1.113730.3.1.475  cis
-attribute nsBSSsl3RsaDesSha               2.16.840.1.113730.3.1.476  cis
-attribute nsBSSsl3RsaRc440Md5             2.16.840.1.113730.3.1.477  cis
-attribute nsBSSsl3RsaRc240Md5             2.16.840.1.113730.3.1.478  cis
-attribute nsBSSsl3RsaNullMd5              2.16.840.1.113730.3.1.479  cis
-attribute nsBSSsl3FortezzaFortezzaSha     2.16.840.1.113730.3.1.480  cis
-attribute nsBSSsl3FortezzaRc4Sha          2.16.840.1.113730.3.1.481  cis
-
-
-objectclass nsBrowserSecurity
-	oid 2.16.840.1.113730.3.2.79
-    superior top 
-    allows 
-	nsBSAskForPassword,
-	nsBSPasswordLifetime,
-	nsBSWarnEnteringSecure,
-	nsBSWarnLeavingSecure,
-	nsBSWarnViewingMixed,
-	nsBSWarnSubmitInsecure,
-	nsBSEnableSsl2,
-	nsBSEnableSsl3,
-	nsBSCertmgmtDisableFunctionMsg,
-	nsBSSsl2Rc4128,
-	nsBSSsl2Rc2128,
-	nsBSSsl2DesEd3192,
-	nsBSSsl2Des64,
-	nsBSSsl2Rc440,
-	nsBSSsl2Rc240,
-	nsBSSsl3RsaRc4128Md5,
-	nsBSSsl3FipsDesEd3Sha,
-	nsBSSsl3RsaRc4128Md5,
-	nsBSSsl3RsaFipsDesSha,
-	nsBSSsl3RsaDesSha,
-	nsBSSsl3RsaRc440Md5,
-	nsBSSsl3RsaRc240Md5,
-	nsBSSsl3RsaNullMd5,
-	nsBSSsl3FortezzaFortezzaSha,
-	nsBSSsl3FortezzaRc4Sha
-
diff --git a/ldap/cm/v4confs/41/ns-mcd-config-schema.conf b/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
deleted file mode 100644
index 2eeb6856..00000000
--- a/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# 
-# ns-mcd-config-schema.conf
-# 
-# Netscape Mission Control Desktop schema
-# This schema is used to set MCD "config()" preferences.
-#
-
-attribute nsMcdUserAgent                 2.16.840.1.113730.3.1.482  cis
-attribute nsMcdUseXSender                2.16.840.1.113730.3.1.483  cis
-attribute nsMcdToolbarLogoUrl            2.16.840.1.113730.3.1.484  cis
-attribute nsMcdToolbarLogoWinSmallFile   2.16.840.1.113730.3.1.485  cis
-attribute nsMcdToolbarLogoWinLargeFile   2.16.840.1.113730.3.1.486  cis
-attribute nsMcdToolbarLogoFrames         2.16.840.1.113730.3.1.487  cis
-attribute nsMcdMacAnimationFile          2.16.840.1.113730.3.1.488  cis
-attribute nsMcdXAnimationFile            2.16.840.1.113730.3.1.489  cis
-attribute nsMcdNetSearchUrl              2.16.840.1.113730.3.1.490  cis
-attribute nsMcdMoreInfoPluginUrl         2.16.840.1.113730.3.1.491  cis
-attribute nsMcdAutoAdminConfigUrl        2.16.840.1.113730.3.1.492  cis
-attribute nsMcdAutoAdminAppendEmail      2.16.840.1.113730.3.1.493  cis
-attribute nsMcdAutoAdminRefreshInterval  2.16.840.1.113730.3.1.494  cis
-attribute nsMcdUseGuideButton            2.16.840.1.113730.3.1.495  cis
-attribute nsMcdGuideButtonProperties     2.16.840.1.113730.3.1.496  cis
-attribute nsMcdGuideMenuProperties       2.16.840.1.113730.3.1.497  cis
-attribute nsMcdHelpMenuProperties        2.16.840.1.113730.3.1.498  cis
-
-
-objectclass nsMcdConfig
-	oid 2.16.840.1.113730.3.2.80
-    superior top 
-    allows 
-	nsMcdUserAgent,
-	nsMcdUseXSender,
-	nsMcdToolbarLogoUrl,
-	nsMcdToolbarLogoWinSmallFile,
-	nsMcdToolbarLogoWinLargeFile,
-	nsMcdToolbarLogoFrames,
-	nsMcdMacAnimationFile,
-	nsMcdXAnimationFile,
-	nsMcdNetSearchUrl,
-	nsMcdMoreInfoPluginUrl,
-	nsMcdAutoAdminConfigUrl,
-	nsMcdAutoAdminAppendEmail,
-	nsMcdAutoAdminRefreshInterval,
-	nsMcdUseGuideButton,
-	nsMcdGuideButtonProperties,
-	nsMcdGuideMenuProperties,
-	nsMcdHelpMenuProperties
-	
diff --git a/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
deleted file mode 100644
index 290c9062..00000000
--- a/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Index required by Mission Control Desktop: Location Independence
-index nsLIProfileName eq
diff --git a/ldap/cm/v4confs/41/ns-mcd-li-schema.conf b/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
deleted file mode 100644
index 82034846..00000000
--- a/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# ns-mcd-li-schema.conf
-#
-# Netscape Mission Control Desktop Location Independence schema
-#
-
-attribute nsLIPtrURL           2.16.840.1.113730.3.1.399        ces           
-attribute nsLIPrefs            2.16.840.1.113730.3.1.400        ces 
-attribute nsLIProfileName      2.16.840.1.113730.3.1.401        cis         
-attribute nsLIData             2.16.840.1.113730.3.1.402        bin 
-attribute nsLIElementType      2.16.840.1.113730.3.1.403        cis        
-attribute nsLIServerType       2.16.840.1.113730.3.1.404        cis
-attribute nsLIVersion          2.16.840.1.113730.3.1.405        int
-
-objectclass nsLIPtr
-	oid 2.16.840.1.113730.3.2.74
-	requires
-		objectclass
-	allows
-		nsliptrurl,
-		owner
-
-objectclass nsLIProfile
-	oid  2.16.840.1.113730.3.2.75
-	requires
-		objectclass,
-		nsliprofilename
-	allows
-		nsliprefs,
-		uid,
-		owner
-
-objectclass nsLIProfileElement
-	oid  2.16.840.1.113730.3.2.76
-	requires
-		objectclass,
-		nslielementtype
-	allows
-		owner,
-		nslidata,
-		nsliversion
-
-objectclass nsLIServer
-	oid  2.16.840.1.113730.3.2.77
-	requires
-		objectclass,
-		serverhostname
-	allows
-		description,
-		cn,
-		nsserverport,
-		nsliservertype,
-		serverroot
diff --git a/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
deleted file mode 100644
index b232563f..00000000
--- a/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
+++ /dev/null
@@ -1,251 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# 
-# ns-mcd-mail-schema.conf
-# 
-# Netscape Mission Control Desktop mail client schema
-# This schema is used to hold mail client preferences.
-#
-
-attribute nsMCHTMLCompose								2.16.840.1.113730.3.1.331		 cis
-attribute nsMCDefaultHTMLAction							2.16.840.1.113730.3.1.332		 cis
-attribute nsMCRequestReturnReceipt						2.16.840.1.113730.3.1.333		 cis
-attribute nsMCIncorporateReturnReceipt					2.16.840.1.113730.3.1.334		 cis
-attribute nsMCMDNReportEnabled							2.16.840.1.113730.3.1.335		 cis
-attribute nsMCMDNReportNotInToCC						2.16.840.1.113730.3.1.336		 cis
-attribute nsMCMDNReportOutsideDomain					2.16.840.1.113730.3.1.337		 cis
-attribute nsMCMDNReportOther							2.16.840.1.113730.3.1.338		 cis
-attribute nsMCForwardMessageMode						2.16.840.1.113730.3.1.339		 cis
-attribute nsMCAutoQuote									2.16.840.1.113730.3.1.340		 cis
-attribute nsMCReplyOnTop								2.16.840.1.113730.3.1.341		 cis
-attribute nsMCSpellCheckBeforeSend						2.16.840.1.113730.3.1.342		 cis
-attribute nsMCWrapLongLines								2.16.840.1.113730.3.1.343		 cis
-attribute nsMCWrapLength								2.16.840.1.113730.3.1.344		 cis
-attribute nsMCStrictlyMime								2.16.840.1.113730.3.1.345		 cis
-attribute nsMCAutoCompleteUseAddressBooks				2.16.840.1.113730.3.1.346		 cis
-attribute nsMCAutoCompleteUseDirectory					2.16.840.1.113730.3.1.347		 cis
-attribute nsMCAutoCompleteEnabledServerName				2.16.840.1.113730.3.1.348		 cis
-attribute nsMCAutoCompleteShowDlgForMultipleMatches     2.16.840.1.113730.3.1.349		 cis
-attribute nsMCSkipDirectoryIfLocalMatchFound			2.16.840.1.113730.3.1.350		 cis
-attribute nsMCAddrBookLastnameFirst						2.16.840.1.113730.3.1.351		 cis
-attribute nsMCLimitMessageSize							2.16.840.1.113730.3.1.352		 cis
-attribute nsMCMaxMessageSize							2.16.840.1.113730.3.1.353		 cis
-attribute nsMCPromptPurgeThreshold     	      	      	2.16.840.1.113730.3.1.354		 cis
-attribute nsMCPurgeThreshold							2.16.840.1.113730.3.1.355		 cis
-attribute nsMCNewsKeepMethod							2.16.840.1.113730.3.1.356		 cis
-attribute nsMCNewsKeepDays								2.16.840.1.113730.3.1.357		 cis
-attribute nsMCNewsKeepCount								2.16.840.1.113730.3.1.358		 cis
-attribute nsMCNewsKeepOnlyUnread						2.16.840.1.113730.3.1.359		 cis
-attribute nsMCNewsRemoveBodiesByAge						2.16.840.1.113730.3.1.360		 cis
-attribute nsMCNewsRemoveBodiesDays						2.16.840.1.113730.3.1.361		 cis
-attribute nsMCSmtpServer								2.16.840.1.113730.3.1.362		 cis
-attribute nsMCSmtpUserName								2.16.840.1.113730.3.1.363		 cis
-attribute nsMCSmtpUseSSL								2.16.840.1.113730.3.1.364		 cis
-attribute nsMCImapServer								2.16.840.1.113730.3.1.365		 cis
-attribute nsMCImapServerProperties						2.16.840.1.113730.3.1.366		 cis
-attribute nsMCPopServer									2.16.840.1.113730.3.1.367		 cis
-attribute nsMCPopServerProperties						2.16.840.1.113730.3.1.368		 cis
-attribute nsMCLdapServer								2.16.840.1.113730.3.1.369		 cis
-attribute nsMCLdapServerProperties						2.16.840.1.113730.3.1.370		 cis
-attribute nsMCQuotedStyle								2.16.840.1.113730.3.1.371		 cis
-attribute nsMCQuotedSize								2.16.840.1.113730.3.1.372		 cis
-attribute nsMCCitationColor								2.16.840.1.113730.3.1.373		 cis
-attribute nsMCFixedWidthMessages						2.16.840.1.113730.3.1.374		 cis
-attribute nsMCPlaySound									2.16.840.1.113730.3.1.375		 cis
-attribute nsMCRememberSelectedMessage					2.16.840.1.113730.3.1.376		 cis
-attribute nsMCReuseMessageWindow						2.16.840.1.113730.3.1.377		 cis
-attribute nsMCConfirmMoveFoldersToTrash					2.16.840.1.113730.3.1.378		 cis
-attribute nsMCUseMapiServer								2.16.840.1.113730.3.1.379		 cis
-attribute nsMCNewsTimeout								2.16.840.1.113730.3.1.380		 cis
-attribute nsMCNavCrossesFolders							2.16.840.1.113730.3.1.381		 cis
-attribute nsMCSearchServer								2.16.840.1.113730.3.1.382		 cis
-attribute nsMCSearchSubFolders							2.16.840.1.113730.3.1.383		 cis
-attribute nsMCEncryptOutgoingMail						2.16.840.1.113730.3.1.384		 cis
-attribute nsMCCryptoSignOutgoingMail					2.16.840.1.113730.3.1.385		 cis
-attribute nsMCCryptoSignOutgoingNews					2.16.840.1.113730.3.1.386		 cis
-attribute nsMCWarnForwardEncrypted						2.16.840.1.113730.3.1.387		 cis
-attribute nsMCWarnReplyUnencrypted						2.16.840.1.113730.3.1.388		 cis
-attribute nsMCAllowAtSignInUserName						2.16.840.1.113730.3.1.389		 cis
-attribute nsMCReceiptRequestHeaderType					2.16.840.1.113730.3.1.390		 cis
-attribute nsMCPop3GetsNewMail							2.16.840.1.113730.3.1.391		 cis
-attribute nsMCImapAutoSubscribeOnOpen					2.16.840.1.113730.3.1.392		 cis
-attribute nsMCImapMimePartsOnDemand						2.16.840.1.113730.3.1.393		 cis
-attribute nsMCImapMimePartsOnDemandThreshold			2.16.840.1.113730.3.1.394		 cis
-attribute nsMCUseAltMail								2.16.840.1.113730.3.1.395		 cis
-attribute nsMCAltMailDll								2.16.840.1.113730.3.1.396		 cis
-attribute nsMCUseAltMailForNews							2.16.840.1.113730.3.1.397		 cis
-attribute nsPrefMap		     					     	2.16.840.1.113730.3.1.398		 cis	 
-attribute nsMCAuthLogin			                        2.16.840.1.113730.3.1.499        cis
-attribute nsMNCNavCrossesFolders	                    2.16.840.1.113730.3.1.500        cis
-attribute nsMNCMessageInThreadWindow	                2.16.840.1.113730.3.1.501        cis
-attribute nsMCAllowAtSignInUserName	                    2.16.840.1.113730.3.1.502        cis
-attribute nsMCImapOnlineDraftSent	                    2.16.840.1.113730.3.1.503        cis
-attribute nsMCCustomHeaders		                        2.16.840.1.113730.3.1.504        cis
-attribute nsMCHtmlDomains		                        2.16.840.1.113730.3.1.505        cis
-attribute nsMNCForceAsciiSearch		                    2.16.840.1.113730.3.1.506        cis
-attribute nsMCAddrBookLdapDisabled	                    2.16.840.1.113730.3.1.507        cis
-attribute nsMNCReuseThreadWindow	                    2.16.840.1.113730.3.1.508        cis
-attribute nsMCShowHeaders		                        2.16.840.1.113730.3.1.509        cis
-attribute nsMCIdentityDefaultdomain	                    2.16.840.1.113730.3.1.510       cis
-
-
-
-
-objectclass nsMailClient
-	oid 2.16.840.1.113730.3.2.72 
-    superior top 
-    allows 
-	 nsMCHTMLCompose, 
-	 nsMCDefaultHTMLAction, 
-	 nsMCRequestReturnReceipt, 
-	 nsMCIncorporateReturnReceipt, 
-	 nsMCMDNReportEnabled, 
-	 nsMCMDNReportNotInToCC, 
-	 nsMCMDNReportOutsideDomain, 
-	 nsMCMDNReportOther, 
-	 nsMCForwardMessageMode, 
-	 nsMCAutoQuote, 
-	 nsMCReplyOnTop,
-  	 nsMCSpellCheckBeforeSend,
-	 nsMCWrapLongLines, 
-	 nsMCWrapLength, 
-	 nsMCStrictlyMime,
-	 nsMCAutoCompleteUseAddressBooks,
-	 nsMCAutoCompleteUseDirectory,
-	 nsMCAutoCompleteEnabledServerName,
-	 nsMCAutoCompleteShowDlgForMultipleMatches,
-	 nsMCSkipDirectoryIfLocalMatchFound,
-	 nsMCAddrBookLastnameFirst,
-	 nsMCLimitMessageSize,
-	 nsMCMaxMessageSize,
-	 nsMCPromptPurgeThreshold,
-	 nsMCPurgeThreshold,
-	 nsMCNewsKeepMethod,
-	 nsMCNewsKeepDays,
-	 nsMCNewsKeepCount,
-	 nsMCNewsKeepOnlyUnread,
-	 nsMCNewsRemoveBodiesByAge,
-	 nsMCNewsRemoveBodiesDays,
-	 nsMCSmtpServer,
-	 nsMCSmtpUserName,
-	 nsMCSmtpUseSSL,
-	 nsMCImapServer,
-	 nsMCImapServerProperties,
-	 nsMCPopServer,
-	 nsMCPopServerProperties, 
-	 nsMCLdapServer,
-	 nsMCLdapServerProperties,
-	 nsMCQuotedStyle,
-	 nsMCQuotedSize,
-	 nsMCCitationColor,
-	 nsMCFixedWidthMessages,
-	 nsMCPlaySound,
-	 nsMCRememberSelectedMessage,
-	 nsMCReuseMessageWindow,
-	 nsMCConfirmMoveFoldersToTrash,
-	 nsMCUseMapiServer,
-	 nsMCNewsTimeout,
-	 nsMCNavCrossesFolders,
-	 nsMCSearchServer,
-	 nsMCSearchSubFolders,
- 	 nsMCEncryptOutgoingMail,
-	 nsMCCryptoSignOutgoingMail,
-	 nsMCCryptoSignOutgoingNews,
-	 nsMCWarnForwardEncrypted,
-	 nsMCWarnReplyUnencrypted,
-	 nsMCAllowAtSignInUserName,
-	 nsMCReceiptRequestHeaderType,
-	 nsMCPop3GetsNewMail,
-	 nsMCImapAutoSubscribeOnOpen,
-	 nsMCImapMimePartsOnDemand,
-	 nsMCImapMimePartsOnDemandThreshold,
-	 nsMCUseAltMail,
-	 nsMCAltMailDll,
-	 nsMCUseAltMailForNews,
-	 nsMCAuthLogin,
-	 nsMNCNavCrossesFolders,
-	 nsMNCMessageInThreadWindow,
-	 nsMCAllowAtSignInUserName,
-	 nsMCImapOnlineDraftSent,
-	 nsMCCustomHeaders,
-	 nsMCHtmlDomains,
-	 nsMNCForceAsciiSearch,
-	 nsMCAddrBookLdapDisabled,
-	 nsMNCReuseThreadWindow,
-	 nsMCShowHeaders,
-	 nsMCIdentityDefaultdomain
-	 
-
-# 
-# Netscape Mission Control Desktop Messenger security schema
-# This schema is used to hold Messenger security preferences.
-#
-
-attribute nsMSEncryptOutgoingMail		2.16.840.1.113730.3.1.511 cis
-attribute nsMSSignOutgoingMail			2.16.840.1.113730.3.1.512 cis
-attribute nsMSSignOutgoingNews			2.16.840.1.113730.3.1.513 cis
-attribute nsMSSmimeDesEde3			    2.16.840.1.113730.3.1.514 cis
-attribute nsMSSmimeRc2128			    2.16.840.1.113730.3.1.515 cis
-attribute nsMSSmimeDes				    2.16.840.1.113730.3.1.516 cis
-attribute nsMSSmimeRc264			    2.16.840.1.113730.3.1.517 cis
-attribute nsMSSmimeRc240			    2.16.840.1.113730.3.1.518 cis
-attribute nsMSSmimeFortezza			    2.16.840.1.113730.3.1.519 cis
-
-objectclass nsMailSecurity
-	oid  2.16.840.1.113730.3.2.81
-    superior top 
-    allows 
-	nsMSEncryptOutgoingMail,
-	nsMSSignOutgoingMail,
-	nsMSSignOutgoingNews,
-	nsMSSmimeDesEde3,
-	nsMSSmimeRc2128,
-	nsMSSmimeDes,
-	nsMSSmimeRc264,
-	nsMSSmimeRc240,
-	nsMSSmimeFortezza
-
-objectclass netscapePreferenceMap 
-    oid 2.16.840.1.113730.3.2.73
-    superior top 
-	allows
-	  	nsPrefMap,
-		uid
-
diff --git a/ldap/cm/v4confs/41/ns-media-globopt.conf b/ldap/cm/v4confs/41/ns-media-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/41/ns-media-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/41/ns-media-schema.conf b/ldap/cm/v4confs/41/ns-media-schema.conf
deleted file mode 100644
index 01b2cf95..00000000
--- a/ldap/cm/v4confs/41/ns-media-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeMediaServer
-		oid 2.16.840.1.113730.3.2.25
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v4confs/41/ns-mlm-schema.conf b/ldap/cm/v4confs/41/ns-mlm-schema.conf
deleted file mode 100644
index bb604b03..00000000
--- a/ldap/cm/v4confs/41/ns-mlm-schema.conf
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# LDAP object classes used by MLM
-#
-
-attribute	mgmemMemberOfGroup		cis
-attribute	mgmemRefDN			ces  single
-attribute	mgmemMailUserPassword		bin  single
-attribute	mgmemGroupMemberParam		ces
-attribute	mgmemGroupServerParam		ces
-
-attribute	mgmanJoinability		ces
-attribute	mgmanJoinLocalType		cis  single
-attribute	mgmanMemberVisibility		ces
-attribute	mgmanIntroText			ces  single
-attribute	mgmanGroupStat			ces
-attribute	mgmanHidden			cis  single
-attribute	mgmanGroupKey			cis  single
-attribute	mgmanAllowSubscribe		cis
-attribute	mgmanDenySubscribe		cis
-
-attribute	mgmanGConfNewGroupParent	dn   single
-attribute	mgmanGConfRemoteUserParent	dn   single
-attribute	mgmanGConfSearchBase		dn   single
-attribute	mgmanGConfGroupCreationUser	dn
-attribute	mgmanGConfSearchGroupUser	dn
-attribute	mgmanGConfAdmin			dn
-attribute	mgmanGConfGroupTemplate		dn   single
-attribute	mgmanGConfDefaultInheritance	cis
-attribute	mgmanGConfKey			cis
-attribute	mgmanGConfSearchAttribute	cis
-attribute	mgmanGConfSearchRelationship	cis
-attribute	mgmanGConfSearchTreeNode	cis
-attribute	mgmanGConfSortAttributeDirMembers	cis
-attribute	mgmanGConfSortAttributeGroupMembers	cis
-attribute	mgmanGConfGroupDomains		dn
-
-
-objectClass mailGroupMember
-	requires
-		objectClass,
-		mail
-	allows
-		mgmemMemberOfGroup,
-		mgmemRefDN,
-		preferredLanguage,
-		userCertificate,
-		mgmemMailUserPassword,
-		mgmemGroupMemberParam,
-		mgmemGroupServerParam,
-		c,
-		cn,
-		sn,
-		givenName
-
-
-objectClass mailGroupManagement
-	requires
-		objectClass
-	allows
-		description,
-		labeledURL,
-		mgmanAllowSubscribe,
-		mgmanDenySubscribe,
-		mgmanGroupKey,
-		mgmanGroupStat,
-		mgmanHidden,
-		mgmanIntroText,
-		mgmanJoinability,
-		mgmanJoinLocalType,
-		mgmanMemberVisibility,
-		multilineDescription,
-		userCertificate,
-		userPassword
-
-objectClass mailGroupManagement_GlobalConfig
-	requires
-		objectClass
-	allows
-		cn,
-		mgmanGConfAdmin,
-		mgmanGConfDefaultInheritance,
-		mgmanGConfGroupCreationUser,
-		mgmanGConfGroupDomains,
-		mgmanGConfGroupTemplate,
-		mgmanGConfKey,
-		mgmanGConfNewGroupParent,
-		mgmanGConfRemoteUserParent,
-		mgmanGConfSearchAttribute,
-		mgmanGConfSearchBase,
-		mgmanGConfSearchGroupUser,
-		mgmanGConfSearchRelationship,
-		mgmanGConfSearchTreeNode,
-		mgmanGConfSortAttributeDirMembers,
-		mgmanGConfSortAttributeGroupMembers
-
diff --git a/ldap/cm/v4confs/41/ns-msg-schema.conf b/ldap/cm/v4confs/41/ns-msg-schema.conf
deleted file mode 100644
index 25712bf7..00000000
--- a/ldap/cm/v4confs/41/ns-msg-schema.conf
+++ /dev/null
@@ -1,743 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#used by Netscape Messaging Server 4.0
-#
-#
-attribute	nsmsgaccounturl	cis
-attribute	nsmsgadddeliveredto	cis
-attribute	nsmsgaddheaders	cis
-attribute	nsmsgadmins	cis
-attribute	nsmsgalias		cis
-attribute	nsmsgallowadminproxy	cis
-attribute	nsmsgallowanonymouslogin	cis
-attribute	nsmsgallowbarelf	cis
-attribute	nsmsgallowbdat	cis
-attribute	nsmsgallowehlo	cis
-attribute	nsmsgallowetrn	cis
-attribute	nsmsgallowexpn	cis
-attribute	nsmsgallowhelp	cis
-attribute	nsmsgallowonex	cis
-attribute	nsmsgallowsize	cis
-attribute	nsmsgallowverb	cis
-attribute	nsmsgallowvrfy	cis
-attribute	nsmsgaltqueues	cis
-attribute	nsmsgalwaysqueue	cis
-attribute	nsmsgauthcachesize	cis
-attribute	nsmsgauthcachettl	cis
-attribute	nsmsgauthmaildomain	cis
-attribute	nsmsgbanner	cis
-attribute	nsmsgbinarypath	cis
-attribute	nsmsgbuffersize	cis
-attribute	nsmsgcheckdeferredqueue	cis
-attribute	nsmsgcleanupage		cis
-attribute	nsmsgclearcontrolinterval	cis
-attribute	nsmsgclearcontrolsafetime	cis
-attribute	nsmsgcollectiondeltatime	cis
-attribute	nsmsgconfigversion		cis
-attribute	nsmsgcontact		cis
-attribute	nsmsgcounterdeltatime	cis
-attribute	nsmsgdbcachesize	cis
-attribute	nsmsgdbtmpdir	cis
-attribute	nsmsgdefaultacl	cis
-attribute	nsmsgdefaultdomain	cis
-attribute	nsmsgdefaultecho	cis
-attribute	nsmsgdefaultgid	cis
-attribute	nsmsgdefaultmailboxquota	cis
-attribute	nsmsgdefaultoverquota	cis
-attribute	nsmsgdefaultpartition	cis
-attribute	nsmsgdefaultreply	cis
-attribute	nsmsgdefaultuid	cis
-attribute	nsmsgdefaultvacation	cis
-attribute	nsmsgdeferredperiod	cis
-attribute	nsmsgdeleteheaders	cis
-attribute	nsmsgdescription		cis
-attribute	nsmsgdiskflushinterval		cis
-attribute	nsmsgdnsresolveclient	cis
-attribute	nsmsgdocanonicalize	cis
-attribute	nsmsgdoclientdnslookup	cis
-attribute	nsmsgdodsn	cis
-attribute	nsmsgdoetrn	cis
-attribute	nsmsgdomainallowed	cis
-attribute	nsmsgdomainlangtable	cis
-attribute	nsmsgdomainname	cis
-attribute	nsmsgdomainnotallowed	cis
-attribute	nsmsgdomainsecurity	cis
-attribute	nsmsgdorewritefromusingauth	cis
-attribute	nsmsgdorewritesenderusingauth	cis
-attribute	nsmsgenable		cis
-attribute	nsmsgenablesslport	cis
-attribute	nsmsgenveloperewritemethod	cis
-attribute	nsmsgexclusive	cis
-attribute	nsmsgexpirestart	cis
-attribute	nsmsgexpirytime	cis
-attribute	nsmsgexternalmxserverip	cis
-attribute	nsmsgfallbacksearchmethod	cis
-attribute	nsmsgfilemode	cis
-attribute	nsmsgfilterurl	cis
-attribute	nsmsgflushinterval	cis
-attribute	nsmsgfolderpattern	cis
-attribute	nsmsgfoldersizebytes	cis
-attribute	nsmsgfolderurl	cis
-attribute	nsmsgforeignpercentaddr	cis
-attribute	nsmsgformsigkey	cis
-attribute	nsmsghidehostname	cis
-attribute	nsmsghopcountexceedactions	cis
-attribute	nsmsghostoncommandline	cis
-attribute	nsmsghostrewrites	cis
-attribute	nsmsgidletimeout	cis
-attribute	nsmsgipsecurity	cis
-attribute	nsmsginstalledlanguages	cis
-attribute	nsmsginternalmxserverip	cis
-attribute	nsmsgldapmemcache	cis
-attribute	nsmsgldapmemcachesize	cis
-attribute	nsmsgldapmemcachettl	cis
-attribute	nsmsgldappoolsize	cis
-attribute	nsmsgldaputilconfig	cis
-attribute	nsmsglistenaddr	cis
-attribute	nsmsglistenq	cis
-attribute	nsmsglisturl	cis
-attribute	nsmsglocaldefaultmaxruncount	cis
-attribute	nsmsglocaldefaultminruncount	cis
-attribute	nsmsglocalmaildomains	cis
-attribute	nsmsglocation		cis
-attribute	nsmsglog	cis
-attribute	nsmsglogdir	cis
-attribute	nsmsgloglevel	cis
-attribute	nsmsglogtype		cis
-attribute	nsmsgmaildeliveryprogram	cis
-attribute	nsmsgmasterhost	cis
-attribute	nsmsgmasterport	cis
-attribute	nsmsgmaxbadcommands	cis
-attribute	nsmsgmaxbranches	cis
-attribute	nsmsgmaxcontrolrecipients cis
-attribute	nsmsgmaxcputime	cis
-attribute	nsmsgmaxerrorobjectsize	cis
-attribute	nsmsgmaxheaderlines	cis
-attribute	nsmsgmaxlogfiles	cis
-attribute	nsmsgmaxlogfilesize	cis
-attribute	nsmsgmaxlogsize	cis
-attribute	nsmsgmaxmessagesize	cis
-attribute	nsmsgmaxmtahops	cis
-attribute	nsmsgmaxpostsize	cis
-attribute	nsmsgmaxqueuetime	cis
-attribute	nsmsgmaxruncount	cis
-attribute	nsmsgmaxruncountdeferred	cis
-attribute	nsmsgmaxscriptsize	cis
-attribute	nsmsgmaxsessions	cis
-attribute	nsmsgmaxstateobjectsize	cis
-attribute	nsmsgmaxthreads	cis
-attribute	nsmsgmessagecount	cis
-attribute	nsmsgmessagedays	cis
-attribute	nsmsgmessagehostname	cis
-attribute	nsmsgmessagesize	cis
-attribute	nsmsgmessagesizedays	cis
-attribute	nsmsgminfreediskspace	cis
-attribute	nsmsgminruncount	cis
-attribute	nsmsgmsgalarmdescription	cis
-attribute	nsmsgmsgalarmnoticehost	cis
-attribute	nsmsgmsgalarmnoticeport	cis
-attribute	nsmsgmsgalarmnoticercpt	cis
-attribute	nsmsgmsgalarmnoticesender	cis
-attribute	nsmsgmsgalarmnoticetemplate	cis
-attribute	nsmsgmsgalarmstatinterval	cis
-attribute	nsmsgmsgalarmthreshold	cis
-attribute	nsmsgmsgalarmthresholddirection	cis
-attribute	nsmsgmsgalarmwarninginterval	cis
-attribute	nsmsgmtaid		cis
-attribute	nsmsgmtaname		cis
-attribute	nsmsgneedsender	cis
-attribute	nsmsgnegativehostattr	cis
-attribute	nsmsgnestedgroups	cis
-attribute	nsmsgnetworkdefaultmaxruncount	cis
-attribute	nsmsgnetworkdefaultminruncount	cis
-attribute	nsmsgnewsprefix	cis
-attribute	nsmsgnewsspool	cis
-attribute	nsmsgnewuserforms	cis
-attribute	nsmsgntaccount	cis
-attribute	nsmsgntpassword	cis
-attribute	nsmsgntrunoptn	cis
-attribute	nsmsgnumdays	cis
-attribute	nsmsgnumenvelopequeuefiles	cis
-attribute	nsmsgnummessages	cis
-attribute	nsmsgnumprocesses	cis
-attribute	nsmsgorganization		cis
-attribute	nsmsgpartition	cis
-attribute	nsmsgpath	cis
-attribute	nsmsgplaintextloginpause	cis
-attribute	nsmsgplaintextmincipher	cis
-attribute	nsmsgpopminpoll	cis
-attribute	nsmsgport	cis
-attribute	nsmsgpositivehostattr	cis
-attribute	nsmsgprotocolubeconfig	cis
-attribute	nsmsgproxydomainallowed	cis
-attribute	nsmsgquotaexceededactions	cis
-attribute	nsmsgquotaexceededmsg	cis
-attribute	nsmsgquotaexceededmsginterval	cis
-attribute	nsmsgquotagraceperiod	cis
-attribute	nsmsgquotawarn	cis
-attribute	nsmsgreadtimeout	cis
-attribute	nsmsgrenotifyinterval	cis
-attribute	nsmsgrequirecrlf	cis
-attribute	nsmsgreserved0	cis
-attribute	nsmsgreserved1	cis
-attribute	nsmsgreserved2	cis
-attribute	nsmsgreserved3	cis
-attribute	nsmsgreserved4	cis
-attribute	nsmsgreserved5	cis
-attribute	nsmsgreserved6	cis
-attribute	nsmsgreserved7	cis
-attribute	nsmsgreserved8	cis
-attribute	nsmsgreserved9	cis
-attribute	nsmsgresourcetimeout	cis
-attribute	nsmsgrewritetocc	cis
-attribute	nsmsgrolloverdelta	cis
-attribute	nsmsgrolloversize	cis
-attribute	nsmsgrollovertime	cis
-attribute	nsmsgroutingattribute	cis
-attribute	nsmsgroutstripimapfolders	cis
-attribute	nsmsgsessiontimeout	cis
-attribute	nsmsgshellpath	cis
-attribute	nsmsgsitelanguage	cis
-attribute	nsmsgsmtphost	cis
-attribute	nsmsgsmtpport	cis
-attribute	nsmsgsmtprewritestyle	cis
-attribute	nsmsgsourceurl	cis
-attribute	nsmsgspooldir	cis
-attribute	nsmsgsslcachesize	cis
-attribute	nsmsgsslpasswdfile	cis
-attribute	nsmsgsslport		cis
-attribute	nmmsgsslsourceurl	cis
-attribute	nsmsgsslusessl	cis
-attribute	nsmsgsslusesslrelay	cis
-attribute	nsmsgstripcr	cis
-attribute	nsmsgsystemmaildir	cis
-attribute	nsmsgtimeoutcommand	cis
-attribute	nsmsgtimeoutdata	cis
-attribute	nsmsgtimeoutdatadot	cis
-attribute	nsmsgtimeoutdatasend	cis
-attribute	nsmsgtimeoutgreet	cis
-attribute	nsmsgtimeouthelo	cis
-attribute	nsmsgtimeoutmail	cis
-attribute	nsmsgtimeoutquit	cis
-attribute	nsmsgtimeoutrcpt	cis
-attribute	nsmsgtimeoutrset	cis
-attribute	nsmsgumask	cis
-attribute	nsmsgunknownacctsactions	cis
-attribute	nsmsgusemx	cis
-attribute	nsmsgverifyrcpts	cis
-attribute	nsmsgversion		cis
-
-objectclass netscapeMessagingServer
-	superior top
-	requires
-		cn,
-		nsServerID
-	allows
-		description
-
-objectclass nsmsgcfgcontainer
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfggen
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgaccounturl,
-		nsmsgconfigversion,
-		nsmsgfilterurl,
-		nsmsgfolderurl,
-		nsmsginstalledlanguages,
-		nsmsglisturl,
-		nsmsgnewuserforms,
-		nsmsgsitelanguage
-		
-objectclass nsmsgcfgsnmp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgcontact,
-		nsmsgcollectiondeltatime,
-		nsmsgdescription,
-		nsmsgenable,
-		nsmsglocation,
-		nsmsgmtaid,
-		nsmsgmtaname,
-		nsmsgmasterhost,
-		nsmsgmasterport,
-		nsmsgorganization,
-		nsmsgversion
-		
-objectclass nsmsgcfgstore
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgadmins,
-		nsmsgcleanupage,
-		nsmsgdbcachesize,
-		nsmsgdbtmpdir,
-		nsmsgdefaultacl,
-		nsmsgdefaultmailboxquota,
-		nsmsgdefaultpartition,
-		nsmsgdiskflushinterval,
-		nsmsgexpirestart,
-		nsmsgquotaexceededmsg,
-		nsmsgquotaexceededmsginterval,
-		nsmsgquotagraceperiod,
-		nsmsgquotawarn,
-		nsmsgumask
-
-objectclass nsmsgcfgexpirerule
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgfolderpattern,
-		nsmsgexclusive,
-		nsmsgfoldersizebytes,
-		nsmsgmessagecount,
-		nsmsgmessagedays,
-		nsmsgmessagesize,
-		nsmsgmessagesizedays
-
-objectclass nsmsgcfgpartition
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgpath
-
-objectclass nsmsgcfguser
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgpublic
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgalias
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgalias
-
-objectclass nsmsgcfglog
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgbuffersize,
-		nsmsgexpirytime,
-		nsmsgflushinterval,
-		nsmsglogdir,
-		nsmsgloglevel,
-		nsmsglogtype,
-		nsmsgmaxlogfiles,
-		nsmsgmaxlogfilesize,
-		nsmsgmaxlogsize,
-		nsmsgminfreediskspace,
-		nsmsgrollovertime
-
-objectclass nsmsgcfgservice
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgauthcachesize,
-		nsmsgauthcachettl,
-		nsmsgdnsresolveclient,
-		nsmsgldapmemcache,
-		nsmsgldapmemcachesize,
-		nsmsgldapmemcachettl,
-		nsmsglistenaddr,
-		nsmsgplaintextloginpause,
-		nsmsgreadtimeout,
-		nsmsgsslpasswdfile
-
-objectclass nsmsgcfgpop
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowanonymouslogin,
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgidletimeout,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgpopminpoll,
-		nsmsgport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgimap
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowanonymouslogin,
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgidletimeout,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgsslcachesize,
-		nsmsgsslport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfghttp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowadminproxy,
-		nsmsgallowanonymouslogin,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgdomainsecurity,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgidletimeout,
-		nsmsgipsecurity,
-		nsmsgmaxmessagesize,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgmaxpostsize,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgproxydomainallowed,
-		nsmsgresourcetimeout,
-		nsmsgsessiontimeout,
-		nsmsgsmtphost,
-		nsmsgsmtpport,
-		nsmsgsourceurl,
-		nsmsgspooldir,
-		nsmsgsslcachesize,
-		nsmsgsslport,
-		nsmsgsourceurl,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgnntp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgnewsprefix,
-		nsmsgnewsspool,
-		nsmsgpartition,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgsslport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgmta
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgaltqueues,
-		nsmsgauthmaildomain,
-		nsmsgbanner,
-		nsmsgclearcontrolinterval,
-		nsmsgclearcontrolsafetime,
-		nsmsgcounterdeltatime,
-		nsmsgdefaultdomain,
-		nsmsgdeferredperiod,
-		nsmsgdocanonicalize,
-		nsmsgdoclientdnslookup,
-		nsmsgdodsn,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgdomainname,
-		nsmsgdomainlangtable,
-		nsmsgenable,
-		nsmsgforeignpercentaddr,
-		nsmsgldappoolsize,
-		nsmsgldaputilconfig,
-		nsmsglocaldefaultmaxruncount,
-		nsmsglocaldefaultminruncount,
-		nsmsgmaxheaderlines,
-		nsmsgmaxqueuetime,
-		nsmsgmessagehostname,
-		nsmsgnetworkdefaultmaxruncount,
-		nsmsgnetworkdefaultminruncount,
-		nsmsgnumenvelopequeuefiles,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgprotocolubeconfig,
-		nsmsgreserved0,
-		nsmsgreserved1,
-		nsmsgreserved2,
-		nsmsgreserved3,
-		nsmsgreserved4,
-		nsmsgreserved5,
-		nsmsgreserved6,
-		nsmsgreserved7,
-		nsmsgreserved8,
-		nsmsgreserved9,
-		nsmsgrolloverdelta,
-		nsmsgrolloversize,
-		nsmsgroutstripimapfolders,
-		nsmsgsslusessl,
-		nsmsgsslusesslrelay
-
-objectclass nsmsgcfgmtalog
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsglog,
-		nsmsgminruncount,
-		nsmsgmaxruncount,
-		nsmsgmaxruncountdeferred
-
-objectclass nsmsgcfgmtaautoreplyhandler
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultecho,
-		nsmsgdefaultreply,
-		nsmsgdefaultvacation
-
-objectclass nsmsgcfgmtaerrorhandler
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgformsigkey,
-		nsmsghopcountexceedactions,
-		nsmsgquotaexceededactions,
-		nsmsgrenotifyinterval,
-		nsmsgunknownacctsactions
-
-objectclass nsmsgcfgmtamboxdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgmtaprogdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultgid,
-		nsmsgdefaultuid,
-		nsmsgshellpath,
-		nsmsgntrunoptn, 
-		nsmsgntaccount, 
-		nsmsgntpassword
-
-objectclass nsmsgcfgmtaaccept
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowbdat,
-		nsmsgallowehlo,
-		nsmsgallowetrn,
-		nsmsgallowexpn,
-		nsmsgallowhelp,
-		nsmsgallowonex,
-		nsmsgallowsize,
-		nsmsgallowverb,
-		nsmsgallowvrfy,
-		nsmsghidehostname,
-		nsmsgmaxbadcommands,
-		nsmsgmaxmessagesize,
-		nsmsgminfreediskspace,
-		nsmsgnegativehostattr,
-		nsmsgpositivehostattr,
-		nsmsgrequirecrlf,
-		nsmsgtimeoutcommand,
-		nsmsgtimeoutdata,
-		nsmsgverifyrcpts
-
-objectclass nsmsgcfgmtasmtpdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowbarelf,
-		nsmsgalwaysqueue,
-		nsmsgcheckdeferredqueue,
-		nsmsgdoetrn,
-		nsmsgexternalmxserverip,
-		nsmsginternalmxserverip,
-		nsmsgtimeoutdata,
-		nsmsgtimeoutdatadot,
-		nsmsgtimeoutdatasend,
-		nsmsgtimeoutgreet,
-		nsmsgtimeouthelo,
-		nsmsgtimeoutmail,
-		nsmsgtimeoutquit,
-		nsmsgtimeoutrcpt,
-		nsmsgtimeoutrset,
-		nsmsgusemx
-
-objectclass nsmsgcfgmtarouter
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgadddeliveredto,
-		nsmsgaddheaders,
-		nsmsgdeleteheaders,
-		nsmsgdorewritefromusingauth,
-		nsmsgdorewritesenderusingauth,
-		nsmsgenveloperewritemethod,
-		nsmsgfallbacksearchmethod,
-		nsmsghostrewrites,
-		nsmsglocalmaildomains,
-		nsmsgmaxcontrolrecipients,
-		nsmsgmaxmtahops,
-		nsmsgnestedgroups,
-		nsmsgrewritetocc,
-		nsmsgroutingattribute,
-		nsmsgsmtprewritestyle
-
-objectclass nsmsgcfgmtaunixdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultgid,
-		nsmsgdefaultuid,
-		nsmsgfilemode,
-		nsmsgmaildeliveryprogram,
-		nsmsgneedsender,
-		nsmsgstripcr,
-		nsmsgsystemmaildir
-
-objectclass nsmsgcfgreport
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgalarmcontainer
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgmsgalarmnoticehost,
-		nsmsgmsgalarmnoticeport,
-		nsmsgmsgalarmnoticercpt,
-		nsmsgmsgalarmnoticesender,
-		nsmsgmsgalarmnoticetemplate
-
-objectclass nsmsgcfgalarm
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgmsgalarmdescription,
-		nsmsgmsgalarmstatinterval,
-		nsmsgmsgalarmthreshold,
-		nsmsgmsgalarmthresholddirection,
-		nsmsgmsgalarmwarninginterval
-
-objectclass nsmsgcfgscript
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgenable,
-		nsmsgbinarypath,
-		nsmsgloglevel,
-		nsmsgmaxscriptsize,
-		nsmsgmaxbranches,
-		nsmsgmaxcputime,
-		nsmsgmaxerrorobjectsize,
-		nsmsgmaxstateobjectsize
diff --git a/ldap/cm/v4confs/41/ns-netshare-schema.conf b/ldap/cm/v4confs/41/ns-netshare-schema.conf
deleted file mode 100644
index 8a03e929..00000000
--- a/ldap/cm/v4confs/41/ns-netshare-schema.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Enterprise Server
-attribute       netshareHomeURL            ces  single
-attribute       netshareServerType         cis  single
-attribute       netshareHomeTheme          cis  single
-attribute       netsharePrivate            cis  single
-attribute       netshareMemberOf           dn
-attribute       netshareUIConfig           bin  single
- 
-# added to either users or groups/projects to enable
-# as netshare user accounts or netshare projects
-objectclass netshareAccount
-       requires
-                objectclass,
-                netshareHomeURL
-       allows
-                netshareServerType,
-                netshareHomeTheme,
-                netsharePrivate,
-                netshareMemberOf,
-                netshareUIConfig
- 
-
-attribute       netsharePMNewProjParent            dn   single
-attribute       netsharePMSearchBase               dn   single
-attribute       netsharePMProjCreationUser         dn   single
-attribute       netsharePMAdmin                    dn
- 
-# this is for the netshare project management utility/CGI 
-# that is created under the SIE; this parallels the messaging
-# MLM schema somewhat to enable end-user maintenance/creation 
-# of netshare projects
-objectclass netshareProjectManagementGlobalConfig
-        requires
-                objectclass
-        allows
-                netsharePMNewProjParent,
-                netsharePMSearchBase,
-                netsharePMProjCreationUser,
-                netsharePMAdmin,
-                cn
diff --git a/ldap/cm/v4confs/41/ns-news-globopt.conf b/ldap/cm/v4confs/41/ns-news-globopt.conf
deleted file mode 100644
index 6f7b2f3b..00000000
--- a/ldap/cm/v4confs/41/ns-news-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape News Server
-#index	uniquemember,member	eq
-
diff --git a/ldap/cm/v4confs/41/ns-news-schema.conf b/ldap/cm/v4confs/41/ns-news-schema.conf
deleted file mode 100644
index 9d15c19e..00000000
--- a/ldap/cm/v4confs/41/ns-news-schema.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsnewsACL                   2.16.840.1.113730.3.1.191  cis     
-attribute nsaclrole                   2.16.840.1.113730.3.1.192  cis     
-attribute nsprettyname                2.16.840.1.113730.3.1.193  cis     
-attribute nsflags                     2.16.840.1.113730.3.1.194  cis     
-attribute nscreator                   2.16.840.1.113730.3.1.195  cis     
-attribute ngcomponent                 2.16.840.1.113730.3.1.196  dn      
-
-objectclass nginfo 
-	oid  2.16.840.1.113730.3.2.26
-	requires 
-		objectClass, 
-		ngcomponent 
-	allows 
-		nsnewsACL,  
-		subtreeACI, 
-		description,  
-		nsaclrole,  
-		nsprettyname, 
-		nsflags, 
-		nscreator 
-
-objectClass	netscapeNewsServer
-	oid 2.16.840.1.113730.3.2.27
-	requires
-		objectClass
-
diff --git a/ldap/cm/v4confs/41/ns-proxy-globopt.conf b/ldap/cm/v4confs/41/ns-proxy-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/41/ns-proxy-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/41/ns-proxy-schema.conf b/ldap/cm/v4confs/41/ns-proxy-schema.conf
deleted file mode 100644
index 3151c9c7..00000000
--- a/ldap/cm/v4confs/41/ns-proxy-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeProxyServer
-		oid 2.16.840.1.113730.3.2.28
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v4confs/41/ns-value-schema.conf b/ldap/cm/v4confs/41/ns-value-schema.conf
deleted file mode 100644
index a7ee4f3b..00000000
--- a/ldap/cm/v4confs/41/ns-value-schema.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Schema for defining schemaless config for LDAP 
-# 
-
-attribute nsValueCIS          2.16.840.1.113730.3.1.243 cis
-attribute nsValueCES          2.16.840.1.113730.3.1.244 ces
-attribute nsValueTel          2.16.840.1.113730.3.1.245 tel
-attribute nsValueInt          2.16.840.1.113730.3.1.246 int
-attribute nsValueBin          2.16.840.1.113730.3.1.247 bin
-attribute nsValueDN           2.16.840.1.113730.3.1.248 dn
-attribute nsValueType         2.16.840.1.113730.3.1.249 cis
-attribute nsValueDefault      2.16.840.1.113730.3.1.250 cis
-attribute nsValueFlags        2.16.840.1.113730.3.1.251 cis
-attribute nsValueDescription  2.16.840.1.113730.3.1.252 cis
-attribute nsValueSyntax       2.16.840.1.113730.3.1.253 cis
-attribute nsValueHelpURL      2.16.840.1.113730.3.1.254 ces
-
-objectClass nsValueItem
-    oid 2.16.840.1.113730.3.2.45
-    requires
-        objectClass,
-        cn
-    allows
-        nsValueCIS,
-        nsValueCES,
-        nsValueTel,
-        nsValueInt,
-        nsValueBin,
-        nsValueDN,
-        nsValueType,
-        nsValueSyntax,
-        nsValueDescription,
-        nsValueHelpURL,
-        nsValueFlags,
-        nsValueDefault 
-
diff --git a/ldap/cm/v4confs/41/ns-wcal-globopt.conf b/ldap/cm/v4confs/41/ns-wcal-globopt.conf
deleted file mode 100644
index 9d8ad189..00000000
--- a/ldap/cm/v4confs/41/ns-wcal-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#used by Netscape Calendar Hosting Server 1.0
-
-index nswcalCALID pres,eq
diff --git a/ldap/cm/v4confs/41/ns-wcal-schema.conf b/ldap/cm/v4confs/41/ns-wcal-schema.conf
deleted file mode 100644
index 3d4f85d5..00000000
--- a/ldap/cm/v4confs/41/ns-wcal-schema.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Calendar Hosting Server
-
-# Login calendar URI for this user
-attribute nswcalCALID			2.16.840.1.113730.3.1.537 cis single
-
-# Calendar client specific user preferences for this user
-attribute nswcalExtendedUserPrefs	2.16.840.1.113730.3.1.538 cis
-
-# Lists calendar protocols not allowed to be used by this user
-attribute nswcalDisallowAccess	2.16.840.1.113730.3.1.539 cis single
-
-# Calendar host for this user's login calendar
-attribute nswcalHost			2.16.840.1.113730.3.1.540 cis
-
-# Quota associated with this user's calendars
-attribute nswcalQuota			2.16.840.1.113730.3.1.541 cis single
-
-# Used to designate a LDAP entry as representing a Netscape Calendar
-# Hosting Server user account. These first 10 attributes are
-# referenced by Netscape Calendar Hosting Server and the last 3
-# attributes are reserved for future use.
-objectClass nswcalUser
-	oid 2.16.840.1.113730.3.2.83
-	requires
-		objectClass
-	allows
-		cn,
-		givenName,
-		mail,
-		preferredlanguage,
-		sn,
-		uid,
-		userPassword,
-		nswcalCALID,
-		nswcalDisallowAccess,
-		nswcalExtendedUserPrefs,
-		nslicensedfor,
-		nswcalHost,
-		nswcalQuota
-
-# From http://www.imc.org/draft-ietf-calsch-locating
-attribute calCalURI              1.2.840.113556.1.4.478 cis
-attribute calFBURL               1.2.840.113556.1.4.479 cis
-attribute calCAPURI              1.2.840.113556.1.4.480 cis
-attribute calCalAdrURI           1.2.840.113556.1.4.481 cis
-attribute calOtherCalURIs        1.2.840.113556.1.4.482 cis
-attribute calOtherFBURLs         1.2.840.113556.1.4.483 cis
-attribute calOtherCAPURIs        1.2.840.113556.1.4.484 cis
-attribute calOtherCalAdrURIs     1.2.840.113556.1.4.485 cis
-
-# Used to designate a LDAP entry as representing a calendar user.
-objectClass calEntry
-	oid 1.2.840.113556.1.5.87
-	requires
-		objectClass
-	allows
-		calCalURI,
-		calFBURL,
-		calCAPURI,
-		calCalAdrURI,
-		calOtherCalURIs,
-		calOtherFBURLs,
-		calOtherCAPURIs,
-		calOtherCalAdrURIs
diff --git a/ldap/cm/v4confs/41/ns-web-globopt.conf b/ldap/cm/v4confs/41/ns-web-globopt.conf
deleted file mode 100644
index 6d19f242..00000000
--- a/ldap/cm/v4confs/41/ns-web-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Enterprise Server
-#index	uniquemember,member	eq
-
diff --git a/ldap/cm/v4confs/41/ns-web-schema.conf b/ldap/cm/v4confs/41/ns-web-schema.conf
deleted file mode 100644
index 08868577..00000000
--- a/ldap/cm/v4confs/41/ns-web-schema.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeWebServer
-        oid 2.16.840.1.113730.3.2.29
-        superior top
-        requires
-                cn,
-                nsServerID
-        allows
-                description,
-                nsServerPort
-
diff --git a/ldap/cm/v4confs/41/slapd.at.conf b/ldap/cm/v4confs/41/slapd.at.conf
deleted file mode 100644
index 15fcb074..00000000
--- a/ldap/cm/v4confs/41/slapd.at.conf
+++ /dev/null
@@ -1,423 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.at.conf for Netscape Directory Server 4.1
-#
-#  DO NOT MODIFY! 
-#
-#  The attributes listed in this file are Standard Attributes and are
-#  expected to present in Directory Server 4.1. Editing this file could 
-#  cause interoperability problems.
-#
-#  User Defined Attributes should be added by selecting 
-#  Schema | Edit or View Attributes from the Admin Server. 
-#
-#  User Defined Attributes are placed in slapd.user_at.conf.  
-# 
-#  All attributes are viewable over LDAP in the cn=schema entry under
-#  attributetypes.
-# 
-#  The format of this file is:
-#
-#  attribute attribute-name [attribute-aliases] [attribute-oid] syntax
-#  
-#  If no OID is specified, <attribute-name>-oid will be used as the OID
-#
-
-########################################################################
-# X.500(93) User Schema for use with LDAP
-# Taken from <draft-ietf-asid-ldapv3schema-x500-00.txt>
-########################################################################
-
-attribute objectClass                                         2.5.4.0                    cis     
-attribute aliasedObjectName                                   2.5.4.1                    dn      
-attribute knowledgeInformation                                2.5.4.2                    cis     
-attribute cn                         commonName               2.5.4.3                    cis     
-attribute sn                         surName                  2.5.4.4                    cis     
-attribute serialNumber                                        2.5.4.5                    cis     
-attribute c                          countryName              2.5.4.6                    cis     
-attribute l   locality               localityname             2.5.4.7                    cis     
-attribute st                         stateOrProvinceName      2.5.4.8                    cis     
-attribute street                     streetaddress            2.5.4.9                    cis     
-attribute o                          organizationname         2.5.4.10                   cis     
-attribute ou                         organizationalUnitName   2.5.4.11                   cis     
-attribute title                                               2.5.4.12                   cis     
-attribute description                                         2.5.4.13                   cis     
-attribute searchGuide                                         2.5.4.14                   ces     
-attribute businessCategory                                    2.5.4.15                   cis     
-attribute postalAddress                                       2.5.4.16                   cis     
-attribute postalCode                                          2.5.4.17                   cis     
-attribute postOfficeBox                                       2.5.4.18                   cis     
-attribute physicalDeliveryOfficeName                          2.5.4.19                   cis     
-attribute telephoneNumber                                     2.5.4.20                   tel     
-attribute telexNumber                                         2.5.4.21                   cis     
-attribute teletexTerminalIdentifier                           2.5.4.22                   cis
-attribute facsimileTelephoneNumber   fax                      2.5.4.23                   tel     
-attribute x121Address                                         2.5.4.24                   ces     
-attribute internationalIsdnNumber                             2.5.4.25                   ces     
-attribute registeredAddress                                   2.5.4.26                   cis     
-attribute destinationIndicator                                2.5.4.27                   cis     
-attribute preferredDeliveryMethod                             2.5.4.28                   cis single
-attribute presentationAddress                                 2.5.4.29                   ces     
-attribute supportedApplicationContext                         2.5.4.30                   cis     
-attribute member                                              2.5.4.31                   dn      
-attribute owner                                               2.5.4.32                   dn      
-attribute roleOccupant                                        2.5.4.33                   dn      
-attribute seeAlso                                             2.5.4.34                   dn      
-attribute userPassword                                        2.5.4.35                   bin     
-attribute userCertificate                                     2.5.4.36                   bin     
-attribute cACertificate               cACertificate           2.5.4.37                   bin     
-attribute authorityRevocationList     authorityRevocationList 2.5.4.38                   bin     
-attribute certificateRevocationList certificateRevocationList 2.5.4.39                   bin
-attribute crossCertificatePair        crossCertificatePair    2.5.4.40                   bin     
-attribute givenName                                           2.5.4.42                   cis     
-attribute initials                                            2.5.4.43                   cis     
-attribute generationQualifier                                 2.5.4.44                   cis
-attribute x500UniqueIdentifier                                2.5.4.45                   bin     
-attribute dnQualifier                                         2.5.4.46                   cis     
-attribute enhancedSearchGuide                                 2.5.4.47                   cis
-attribute protocolInformation                                 2.5.4.48                   cis
-attribute dn distinguishedName                                2.5.4.49                   dn 
-attribute uniqueMember                                        2.5.4.50                   dn      
-attribute houseIdentifier                                     2.5.4.51                   cis
-attribute supportedAlgorithms                                 2.5.4.52                   bin       
-attribute deltaRevocationList                                 2.5.4.53                   bin
-
-#######################################################################
-# LDAP Attributes                                                     #
-# Taken from <draft-ietf-asid-ldapv3-attributes-07.txt>               #
-#######################################################################
-
-attribute createTimestamp                                     2.5.18.1                   cis
-attribute modifyTimestamp                                     2.5.18.2                   cis
-attribute creatorsName                                        2.5.18.3                   dn
-attribute modifiersName                                       2.5.18.4                   dn
-attribute subschemaSubentry                                   2.5.18.10                  dn
-attribute attributeTypes                                      2.5.21.5                   cis
-attribute objectClasses                                       2.5.21.6                   cis
-attribute matchingRules                                       2.5.21.4                   cis
-attribute matchingRuleUse                                     2.5.21.8                   cis
-attribute dITStructureRules                                   2.5.21.1                   cis
-attribute dITContentRules                                     2.5.21.2                   cis
-attribute nameForms                                           2.5.21.7                   cis
-
-attribute namingContexts                                      1.3.6.1.4.1.1466.101.120.5 dn
-attribute altServer                                           1.3.6.1.4.1.1466.101.120.6 ces
-attribute supportedExtension                                  1.3.6.1.4.1.1466.101.120.7 cis
-attribute supportedControl                                    1.3.6.1.4.1.1466.101.120.13 cis
-attribute supportedSASLMechanisms                             1.3.6.1.4.1.1466.101.120.14 cis
-attribute supportedLDAPVersion                                1.3.6.1.4.1.1466.101.120.15 int
-attribute ldapSyntaxes                                        1.3.6.1.4.1.1466.101.120.16 cis
-
-#######################################################################
-# Pilot X.500 schema for use in LDAPv3                                #
-# Taken from <draft-ietf-asid-schema-pilot-00.txt>                    #
-#######################################################################
-
-attribute uid                                                 0.9.2342.19200300.100.1.1  cis     
-attribute textEncodedORAddress                                0.9.2342.19200300.100.1.2  cis     
-attribute mail                       rfc822mailbox            0.9.2342.19200300.100.1.3  cis     
-attribute info                                                0.9.2342.19200300.100.1.4  cis     
-attribute drink                                               0.9.2342.19200300.100.1.5  cis     
-attribute roomNumber                                          0.9.2342.19200300.100.1.6  cis     
-attribute userClass                                           0.9.2342.19200300.100.1.8  cis     
-attribute host                                                0.9.2342.19200300.100.1.9  cis     
-attribute manager                                             0.9.2342.19200300.100.1.10 dn      
-attribute documentIdentifier                                  0.9.2342.19200300.100.1.11 cis     
-attribute documentTitle                                       0.9.2342.19200300.100.1.12 cis     
-attribute documentVersion                                     0.9.2342.19200300.100.1.13 cis     
-attribute documentAuthor                                      0.9.2342.19200300.100.1.14 dn      
-attribute documentLocation                                    0.9.2342.19200300.100.1.15 cis     
-attribute homePhone                                           0.9.2342.19200300.100.1.20 tel     
-attribute secretary                                           0.9.2342.19200300.100.1.21 dn      
-attribute otherMailbox                                        0.9.2342.19200300.100.1.22 cis     
-attribute dc                         domaincomponent          0.9.2342.19200300.100.1.25 cis     
-attribute dNSRecord                                           0.9.2342.19200300.100.1.26 cis     
-attribute associatedName                                      0.9.2342.19200300.100.1.38 dn      
-attribute homePostalAddress                                   0.9.2342.19200300.100.1.39 cis     
-attribute personalTitle                                       0.9.2342.19200300.100.1.40 cis     
-attribute mobile                     mobileTelephoneNumber    0.9.2342.19200300.100.1.41 tel     
-attribute pager                      pagerTelephoneNumber     0.9.2342.19200300.100.1.42 tel     
-attribute co                         friendlycountryname      0.9.2342.19200300.100.1.43 cis     
-attribute uniqueIdentifier                                    0.9.2342.19200300.100.1.44 cis     
-attribute organizationalStatus                                0.9.2342.19200300.100.1.45 cis     
-attribute janetMailbox                                        0.9.2342.19200300.100.1.46 cis
-attribute mailPreferenceOption                                0.9.2342.19200300.100.1.47 int single     
-attribute buildingName                                        0.9.2342.19200300.100.1.48 cis     
-attribute dSAQuality                                          0.9.2342.19200300.100.1.49 cis single
-attribute singleLevelQuality                                  0.9.2342.19200300.100.1.50 cis single
-attribute subtreeMinimumQuality                               0.9.2342.19200300.100.1.51 cis single
-attribute subtreeMaximumQuality                               0.9.2342.19200300.100.1.52 cis single
-attribute personalSignature                                   0.9.2342.19200300.100.1.53 bin     
-attribute ditRedirect                                         0.9.2342.19200300.100.1.54 dn      
-attribute audio                                               0.9.2342.19200300.100.1.55 bin     
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis     
-attribute jpegPhoto                                           0.9.2342.19200300.100.1.60 bin     
-
-#definitions subsequent to RFC 1274
-
-attribute labeledUri                 labeledurl               1.3.6.1.4.1.250.1.57       ces
-
-
-############################################################################
-# Netscape Defined Attributes
-#
-# The Netscape base OID is                          2.16.840.1.113730 
-# The base OID for the Netscape Directory Server is 2.16.840.1.113730.3 
-# Netscape defined attributes have base             2.16.840.1.113730.3.1
-#
-# More Netscape defined attributes can be found included in ns-schema.conf
-############################################################################
-
-attribute carLicense                                          2.16.840.1.113730.3.1.1    cis     
-attribute departmentNumber                                    2.16.840.1.113730.3.1.2    cis     
-attribute employeeNumber                                      2.16.840.1.113730.3.1.3    cis single
-attribute employeeType                                        2.16.840.1.113730.3.1.4    cis     
-attribute changeNumber                                        2.16.840.1.113730.3.1.5    int     
-attribute targetDn                                            2.16.840.1.113730.3.1.6    dn      
-attribute changeType                                          2.16.840.1.113730.3.1.7    cis     
-attribute changes                                             2.16.840.1.113730.3.1.8    bin     
-attribute newRdn                                              2.16.840.1.113730.3.1.9    dn      
-attribute deleteOldRdn                                        2.16.840.1.113730.3.1.10   cis     
-attribute newSuperior                                         2.16.840.1.113730.3.1.11   dn      
-attribute ref                                                 2.16.840.1.113730.3.1.34   ces     
-attribute nsLicensedFor                                       2.16.840.1.113730.3.1.36   cis     
-attribute nsLicenseStartTime                                  2.16.840.1.113730.3.1.37   cis     
-attribute nsLicenseEndTime                                    2.16.840.1.113730.3.1.38   cis     
-attribute preferredLanguage                                   2.16.840.1.113730.3.1.39   cis single
-attribute userSMIMECertificate                                 2.16.840.1.113730.3.1.40   bin
-attribute ntUserDomainId                                      2.16.840.1.113730.3.1.41   cis single    
-attribute ntUserCreateNewAccount                              2.16.840.1.113730.3.1.42   cis single     
-attribute ntUserDeleteAccount                                 2.16.840.1.113730.3.1.43   cis single     
-attribute ntGroupDomainId                                     2.16.840.1.113730.3.1.44   cis single
-attribute ntGroupCreateNewGroup                               2.16.840.1.113730.3.1.45   cis single
-attribute ntGroupDeleteGroup                                  2.16.840.1.113730.3.1.46   cis single
-attribute ntGroupType                                  2.16.840.1.113730.3.1.47   cis single
-attribute replicaPort                                         2.16.840.1.113730.3.1.48   cis              
-attribute replicaUpdateFailedAt                               2.16.840.1.113730.3.1.49   cis              
-attribute replicaBeginOrc                                     2.16.840.1.113730.3.1.50   cis              
-attribute replicaUpdateReplayed                               2.16.840.1.113730.3.1.51   cis              
-attribute replicaUpdateSchedule                               2.16.840.1.113730.3.1.52   cis              
-attribute replicaBindMethod                                   2.16.840.1.113730.3.1.53   cis              
-attribute replicaUseSSL                                       2.16.840.1.113730.3.1.54   cis              
-attribute aci                                                 2.16.840.1.113730.3.1.55   bin              
-attribute lastModifiedBy                                      0.9.2342.19200300.100.1.24 dn               
-attribute replicaRoot                                         2.16.840.1.113730.3.1.57   dn               
-attribute replicaBindDn                                       2.16.840.1.113730.3.1.58   dn               
-attribute ntUserPriv                                          2.16.840.1.113730.3.1.59   bin single  
-attribute ntUserAuthFlags                                     2.16.840.1.113730.3.1.60   bin single  
-attribute ntUserUsrComment                                    2.16.840.1.113730.3.1.61   cis single  
-attribute ntUserParms                                         2.16.840.1.113730.3.1.62   cis single  
-attribute ntUserUnitsPerWeek                                  2.16.840.1.113730.3.1.63   bin single  
-attribute ntUserNumLogons                                     2.16.840.1.113730.3.1.64   bin single  
-attribute ntUserLogonServer                                   2.16.840.1.113730.3.1.65   cis single  
-attribute ntUserUniqueId                                      2.16.840.1.113730.3.1.66   bin single  
-attribute ntUserProfile                                       2.16.840.1.113730.3.1.67   cis single  
-attribute ntUserPasswordExpired                               2.16.840.1.113730.3.1.68   bin single  
-attribute subtreeACI                                          2.16.840.1.113730.3.1.69   ces              
-attribute serverRoot                                          2.16.840.1.113730.3.1.70   cis              
-attribute serverProductName                                   2.16.840.1.113730.3.1.71   cis              
-attribute serverVersionNumber                                 2.16.840.1.113730.3.1.72   cis              
-attribute installationTimeStamp                               2.16.840.1.113730.3.1.73   cis              
-attribute administratorContactInfo                            2.16.840.1.113730.3.1.74   cis              
-attribute adminUrl                                            2.16.840.1.113730.3.1.75   ces              
-attribute serverHostName                                      2.16.840.1.113730.3.1.76   cis              
-attribute changeTime                                          2.16.840.1.113730.3.1.77   cis              
-attribute cirReplicaRoot                                      2.16.840.1.113730.3.1.79   dn               
-attribute cirHost                                             2.16.840.1.113730.3.1.80   cis              
-attribute cirPort                                             2.16.840.1.113730.3.1.81   cis              
-attribute cirBindDn                                           2.16.840.1.113730.3.1.82   dn               
-attribute cirUsePersistentSearch                              2.16.840.1.113730.3.1.83   cis              
-attribute cirUseSsl                                           2.16.840.1.113730.3.1.84   cis              
-attribute cirBindCredentials                                  2.16.840.1.113730.3.1.85   ces              
-attribute cirLastUpdateApplied                                2.16.840.1.113730.3.1.86   cis              
-attribute cirUpdateSchedule                                   2.16.840.1.113730.3.1.87   cis              
-attribute cirUpdateFailedat                                   2.16.840.1.113730.3.1.88   cis              
-attribute cirSyncInterval                                     2.16.840.1.113730.3.1.89   cis              
-attribute cirBeginORC                                         2.16.840.1.113730.3.1.90   cis              
-attribute passwordExpirationTime                              2.16.840.1.113730.3.1.91   cis operational         
-attribute passwordExpWarned                                   2.16.840.1.113730.3.1.92   cis operational         
-attribute passwordRetryCount                                  2.16.840.1.113730.3.1.93   cis operational         
-attribute retryCountResetTime                                 2.16.840.1.113730.3.1.94   cis operational         
-attribute accountUnlockTime                                   2.16.840.1.113730.3.1.95   cis operational         
-attribute passwordHistory                                     2.16.840.1.113730.3.1.96   bin operational         
-attribute passwordMaxAge                                      2.16.840.1.113730.3.1.97   cis             
-attribute passwordExp                                         2.16.840.1.113730.3.1.98   cis                 
-attribute passwordMinLength                                   2.16.840.1.113730.3.1.99   cis                 
-attribute passwordKeepHistory                                 2.16.840.1.113730.3.1.100  cis                 
-attribute passwordInHistory                                   2.16.840.1.113730.3.1.101  cis                 
-attribute passwordChange                                      2.16.840.1.113730.3.1.102  cis                 
-attribute passwordCheckSyntax                                 2.16.840.1.113730.3.1.103  cis                 
-attribute passwordWarning								      2.16.840.1.113730.3.1.104  cis                 
-attribute passwordLockout                                     2.16.840.1.113730.3.1.105  cis                 
-attribute passwordMaxFailure                                  2.16.840.1.113730.3.1.106  cis                 
-attribute passwordResetDuration                               2.16.840.1.113730.3.1.107  cis                 
-attribute passwordUnlock				    				  2.16.840.1.113730.3.1.108  cis                 
-attribute passwordLockoutDuration                             2.16.840.1.113730.3.1.109  cis                 
-attribute ntGroupId                                           2.16.840.1.113730.3.1.110  bin single  
-attribute replicaHost                                         2.16.840.1.113730.3.1.197  cis              
-attribute memberURL                                           2.16.840.1.113730.3.1.198  ces              
-attribute memberCertificateDescription                        2.16.840.1.113730.3.1.199  ces              
-attribute replicaCredentials                                  2.16.840.1.113730.3.1.202  bin     
-attribute replicaEntryFilter                                  2.16.840.1.113730.3.1.203  ces
-attribute replicaNickName                                     2.16.840.1.113730.3.1.204  cis
-attribute filterInfo										  2.16.840.1.113730.3.1.206  cis
-attribute replicaCFUpdated                                    2.16.840.1.113730.3.1.217  cis
-attribute replicaAbandonedChanges                             2.16.840.1.113730.3.1.218  cis
-attribute vlvBase                                             2.16.840.1.113730.3.1.207  dn
-attribute vlvScope                                            2.16.840.1.113730.3.1.208  int
-attribute vlvFilter                                           2.16.840.1.113730.3.1.209  ces
-attribute vlvSort                                             2.16.840.1.113730.3.1.210  cis
-attribute vlvName                                             2.16.840.1.113730.3.1.211  ces
-attribute netscapeMDSuffix                                    2.16.840.1.113730.3.1.212  dn
-attribute vlvEnabled                                          2.16.840.1.113730.3.1.213  int
-attribute passwordAllowChangeTime                             2.16.840.1.113730.3.1.214  cis operational         
-attribute oid                                                 2.16.840.1.113730.3.1.215  cis
-attribute userPKCS12                                          2.16.840.1.113730.3.1.216  bin
-attribute vlvUses                                             2.16.840.1.113730.3.1.219  int
-attribute passwordMustChange                                  2.16.840.1.113730.3.1.220  cis
-attribute passwordStorageScheme                               2.16.840.1.113730.3.1.121  cis
-attribute passwordMinAge                                      2.16.840.1.113730.3.1.122  cis
-attribute passwordResetFailureCount                           2.16.840.1.113730.3.1.123  cis
-attribute nsslapd-pluginPath							      2.16.840.1.113730.3.1.224  cis
-attribute nsslapd-pluginInitfunc                              2.16.840.1.113730.3.1.225  cis
-attribute nsslapd-pluginType 	                              2.16.840.1.113730.3.1.226  cis
-attribute nsslapd-pluginId                                    2.16.840.1.113730.3.1.227  cis
-attribute nsslapd-pluginVersion                               2.16.840.1.113730.3.1.228  cis
-attribute nsslapd-pluginVendor                                2.16.840.1.113730.3.1.229  cis
-attribute nsslapd-pluginDescription                           2.16.840.1.113730.3.1.230  cis
-attribute nsslapd-pluginEnabled               	              2.16.840.1.113730.3.1.231  cis
-attribute nsSNMPEnabled                      	              2.16.840.1.113730.3.1.232  cis
-attribute nsSNMPOrganization                 	              2.16.840.1.113730.3.1.233  cis
-attribute nsSNMPLocation                     	              2.16.840.1.113730.3.1.234  cis
-attribute nsSNMPContact               	                      2.16.840.1.113730.3.1.235  cis
-attribute nsSNMPDescription									  2.16.840.1.113730.3.1.236  cis 
-attribute nsSNMPMasterHost									  2.16.840.1.113730.3.1.237  cis 
-attribute nsSNMPMasterPort									  2.16.840.1.113730.3.1.238  cis 
-attribute nsslapd-backend									  2.16.840.1.113730.3.1.239  cis 
-attribute replicatedattributelist                             2.16.840.1.113730.3.1.240  cis 
-attribute displayName                                         2.16.840.1.113730.3.1.241  cis single
-attribute nsSystemIndex                                       2.16.840.1.113730.3.1.242  cis 
-attribute nsIndexType                                         2.16.840.1.113730.3.1.327  cis 
-attribute nsMatchingRule                                      2.16.840.1.113730.3.1.328  cis 
-attribute nsAddressBookSyncURL                                2.16.840.1.113730.3.1.330  ces
-attribute nsSynchUserIDFormat                                 2.16.840.1.113730.3.1.406  cis
-attribute nsSynchUniqueAttribute                              2.16.840.1.113730.3.1.407  cis
-attribute replicaLastRelevantChange                           2.16.840.1.113730.3.1.408  int
-attribute ntUserHomeDir                                       2.16.840.1.113730.3.1.521  cis single     
-attribute ntUserComment                                       2.16.840.1.113730.3.1.522  cis single     
-attribute ntUserFlags                                         2.16.840.1.113730.3.1.523  bin single     
-attribute ntUserScriptPath                                    2.16.840.1.113730.3.1.524  cis single     
-attribute ntUserWorkstations                                  2.16.840.1.113730.3.1.525  cis single     
-attribute ntUserLastLogon                                     2.16.840.1.113730.3.1.526  cis single     
-attribute ntUserLastLogoff                                    2.16.840.1.113730.3.1.527  cis single     
-attribute ntUserAcctExpires                                   2.16.840.1.113730.3.1.528  cis single     
-attribute ntUserMaxStorage                                    2.16.840.1.113730.3.1.529  bin single     
-attribute ntUserLogonHours                                    2.16.840.1.113730.3.1.530  bin single     
-attribute ntUserBadPwCount                                    2.16.840.1.113730.3.1.531  bin single     
-attribute ntUserCountryCode                                   2.16.840.1.113730.3.1.532  cis single     
-attribute ntUserCodePage                                      2.16.840.1.113730.3.1.533  bin single     
-attribute ntUserPrimaryGroupId                                2.16.840.1.113730.3.1.534  bin single     
-attribute ntUserHomeDirDrive                                  2.16.840.1.113730.3.1.535  cis single     
-attribute ntGroupAttributes                                   2.16.840.1.113730.3.1.536  bin single
-
-#
-# Attribute types with OIDs
-#
-
-attribute associatedDomain                                    0.9.2342.19200300.100.1.37 cis     
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis single
-
-
-# 
-# Attributes which are used by some objectClass, but with unknown OID
-# 
-
-attribute abstract                                            abstract-oid               cis     
-attribute authorCn                   documentauthorcommonname authorcn-oid               cis     
-attribute authorSn                   documentauthorsurname    authorsn-oid               cis     
-attribute changeLog                                           2.16.840.1.113730.3.1.35   dn
-attribute changeLogMaximumAge                                 2.16.840.1.113730.3.1.200  cis     
-attribute changeLogMaximumSize                                2.16.840.1.113730.3.1.201  cis     
-attribute documentStore                                       documentStore-oid          cis     
-attribute keyWords                                            keyWords-oid               cis     
-attribute lastModifiedTime                                    0.9.2342.19200300.100.1.23 cis     
-attribute multiLineDescription                                multiLineDescription-oid   cis     
-attribute subject                                             subject-oid                cis     
-attribute ttl                        timeToLive               1.3.6.1.4.1.250.1.60       cis     
-attribute photo                                               0.9.2342.19200300.100.1.7  bin     
-attribute generation                                          generation-oid             ces     
-attribute obsoletedByDocument                                 obsoletedByDocument-oid    dn      
-attribute obsoletesDocument                                   obsoletesDocument-oid      dn      
-attribute reciprocalNamingLink                                reciprocalNaminglink-oid   dn      
-attribute updatedByDocument                                   updatedByDocument-oid      dn      
-attribute updatesDocument                                     updatesDocument-oid        dn      
-
-#
-# Attribute types from RFC 2307
-#
-
-attribute	uidNumber		1.3.6.1.1.1.1.0		int single
-attribute	gidNumber		1.3.6.1.1.1.1.1		int single
-attribute	gecos			1.3.6.1.1.1.1.2		cis single
-attribute	homeDirectory		1.3.6.1.1.1.1.3		ces single
-attribute	loginShell		1.3.6.1.1.1.1.4		int single
-attribute	shadowLastChange	1.3.6.1.1.1.1.5		int single
-attribute	shadowMin		1.3.6.1.1.1.1.6		int single
-attribute	shadowMax		1.3.6.1.1.1.1.7		int single
-attribute	shadowWarning		1.3.6.1.1.1.1.8		int single
-attribute	shadowInactive		1.3.6.1.1.1.1.9		int single
-attribute	shadowExpire		1.3.6.1.1.1.1.10	int single
-attribute	shadowFlag		1.3.6.1.1.1.1.11	int single
-attribute	memberUid		1.3.6.1.1.1.1.12	ces
-attribute	memberNisNetgroup	1.3.6.1.1.1.1.13	ces
-attribute	nisNetgroupTriple	1.3.6.1.1.1.1.14	ces
-attribute	ipServicePort		1.3.6.1.1.1.1.15	int single
-attribute	ipServiceProtocol	1.3.6.1.1.1.1.16	cis
-attribute	ipProtocolNumber	1.3.6.1.1.1.1.17	int single
-attribute	oncRpcNumber		1.3.6.1.1.1.1.18	int single
-attribute	ipHostNumber		1.3.6.1.1.1.1.19	cis
-attribute	ipNetworkNumber		1.3.6.1.1.1.1.20	cis single
-attribute	ipNetmaskNumber		1.3.6.1.1.1.1.21	cis single
-attribute	macAddress		1.3.6.1.1.1.1.22	cis
-attribute	bootParameter		1.3.6.1.1.1.1.23	ces
-attribute	bootFile		1.3.6.1.1.1.1.24	ces
-attribute	automountInformation	1.3.6.1.1.1.1.25	ces
-attribute	nisMapName		1.3.6.1.1.1.1.26	cis
-attribute	nisMapEntry		1.3.6.1.1.1.1.27	ces single
diff --git a/ldap/cm/v4confs/41/slapd.oc.conf b/ldap/cm/v4confs/41/slapd.oc.conf
deleted file mode 100644
index 53ca2e65..00000000
--- a/ldap/cm/v4confs/41/slapd.oc.conf
+++ /dev/null
@@ -1,1101 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.oc.conf for Netscape Directory Server 4.1
-#
-#  DO NOT MODIFY! 
-#
-#  The ObjectClasses in this file are Standard ObjectClasses and are expected
-#  to be present in Directory Server 4.1 unchanged. Modifing this file may
-#  cause interoperability problems.
-#
-#  User Defined ObjectClasses should be added by selecting 
-#  Schema | Create ObjectClasses from the Admin Server. 
-#
-#  User Defined ObjectClasses are saved in slapd.user_oc.conf
-#  
-#  All ObjectClasses are viewable in the cn=schema entry under objectclasses.
-#
-# The format of this file is:
-#
-#  objectclass ObjectClassName
-#       [ oid ObjectIdentifier ]
-#       [ superior ParentObjectClass ]
-#       [ requires <comma separated list of required attributes> ]
-#       [ allows   <comma separated list of allowed attributes>  ]
-#  
-
-objectclass top
-	oid 2.5.6.0
-	requires
-		objectClass
-	allows
-		aci
-
-objectclass alias
-	oid 2.5.6.1
-	superior top
-	requires
-		aliasedObjectName
-
-objectclass country
-	oid 2.5.6.2
-	superior top
-	requires
-		c
-	allows
-		searchGuide,
-		description
-
-objectclass locality
-	oid 2.5.6.3
-	superior top
-	allows
-		description,
-		l,
-		searchGuide,
-		seeAlso,
-		st,
-		street
-
-objectclass organization
-	oid 2.5.6.4
-	superior top
-	requires
-		o
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass organizationalUnit
-	oid 2.5.6.5
-	superior top
-	requires
-		ou
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass person
-	oid 2.5.6.6
-	superior top
-	requires
-		sn,
-		cn
-	allows
-		description,
-		seeAlso,
-		telephoneNumber,
-		userPassword
-
-objectclass organizationalPerson
-	oid 2.5.6.7
-	superior person
-	allows
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		title,
-		x121Address
-
-# The certificate attributes include all subtypes, such as ';binary'.
-#
-objectclass inetOrgPerson
-    oid 2.16.840.1.113730.3.2.2
-    superior organizationalPerson
-	allows
-		audio,
-		businessCategory,
-		carLicense,
-		departmentNumber,
-		displayName,
-		employeeType,
-		employeeNumber,
-		givenName,
-		homePhone,
-		homePostalAddress,
-		initials,
-		jpegPhoto,
-		labeledURI,
-		manager,
-		mobile,
-		pager,
-		photo,
-		preferredLanguage,
-		mail,
-		o,
-		roomNumber,
-		secretary,
-		uid,
-		x500uniqueIdentifier,
-		userCertificate,
-		userSMimeCertificate,
-		userPKCS12
- 
-objectclass ntUser
-	oid 2.16.840.1.113730.3.2.8
-	superior top
-	requires
-		ntUserDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntUserPriv,
-		ntUserHomeDir,
-		ntUserComment,
-		ntUserFlags,
-		ntUserScriptPath,
-		ntUserAuthFlags,
-		ntUserUsrComment,
-		ntUserParms,
-		ntUserWorkstations,
-		ntUserLastLogon,
-		ntUserLastLogoff,
-		ntUserAcctExpires,
-		ntUserMaxStorage,
-		ntUserUnitsPerWeek,
-		ntUserLogonHours,
-		ntUserBadPwCount,
-		ntUserNumLogons,
-		ntUserLogonServer,
-		ntUserCountryCode,
-		ntUserCodePage,
-		ntUserUniqueId,
-		ntUserPrimaryGroupId,
-		ntUserProfile,
-		ntUserHomeDirDrive,
-		ntUserPasswordExpired,
-		ntUserCreateNewAccount,
-		ntUserDeleteAccount
-
-objectclass ntGroup
-	oid 2.16.840.1.113730.3.2.9
-	superior top
-	requires
-		ntGroupDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntGroupId,
-		ntGroupAttributes,
-		ntGroupCreateNewGroup,
-		ntGroupDeleteGroup,
-		ntGroupType
-
-objectclass organizationalRole
-   oid 2.5.6.8
-   superior top  
-	requires
-		cn
-	allows
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		roleOccupant,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass groupOfNames
-   oid 2.5.6.9
-   superior top  
-	requires
-		cn
-	allows
-		member,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfUniqueNames
-    oid 2.5.6.17
-    superior top  
-	requires
-		cn
-	allows
-		uniqueMember,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfCertificates
-    oid 2.16.840.1.113730.3.2.31
-    superior top  
-	requires
-		cn
-	allows
-		memberCertificateDescription,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfURLs
-    oid  2.16.840.1.113730.3.2.33
-    superior top  
-	requires
-		cn
-	allows
-		memberURL,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass residentialPerson
-   oid 2.5.6.10
-   superior person  
-	requires
-		l
-	allows
-		businessCategory,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass applicationProcess
-    oid 2.5.6.11
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso
-
-objectclass LDAPServer
-	oid 2.16.840.1.113730.3.2.35
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		generation,
-		changeLogMaximumAge,
-		changeLogMaximumSize
-
-objectclass LDAPReplica
-	oid 2.16.840.1.113730.3.2.36
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		replicaRoot,
-		replicaHost,
-		replicaPort,
-		replicaBindDn,
-		replicaCredentials,
-		replicaBindMethod,
-		replicaUseSSL,
-		replicaUpdateSchedule,
-		replicaUpdateReplayed,
-		replicaUpdateFailedAt,
-		replicaBeginORC,
-		replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList,
-		replicaCFUpdated,
-		replicaAbandonedChanges,
-		replicaLastRelevantChange
-
-objectclass applicationEntity
-    oid 2.5.6.12
-    superior top  
-	requires
-		presentationAddress,
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		supportedApplicationContext
-
-objectclass dSA
-   oid 2.5.6.13
-   superior applicationEntity  
-	allows
-		knowledgeInformation
-
-objectclass device
-    oid 2.5.6.14
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# This userCertificate attribute includes all subtypes, such as ';binary'.
-objectclass strongAuthenticationUser
-    oid 2.5.6.15
-    superior top 
-	requires
-		userCertificate
-
-# These attributes include all subtypes, such as ';binary'.
-objectclass certificationAuthority
-    oid 2.5.6.16
-    superior top 
-	requires
-		cACertificate
-	allows
-		authorityRevocationList,
-		certificateRevocationList,
-		crossCertificatePair
-
-objectclass pilotObject
-    oid 0.9.2342.19200300.100.4.3
-    superior top  
-	allows
-		audio,
-		dITRedirect,
-		info,
-		jpegPhoto,
-		lastModifiedBy,
-		lastModifiedTime,
-		manager,
-		photo,
-		uniqueIdentifier
-
-objectclass newPilotPerson
-    oid 0.9.2342.19200300.100.4.4
-    superior person 
-	allows
-		businessCategory,
-		drink,
-		homePhone,
-		homePostalAddress,
-		janetMailbox,
-		mail,
-		mailPreferenceOption,
-		mobile,
-		organizationalStatus,
-		otherMailbox,
-		pager,
-		personalSignature,
-		personalTitle,
-		preferredDeliveryMethod,
-		roomNumber,
-		secretary,
-		textEncodedORAddress,
-		uid,
-		userClass
-
-objectclass account
-    oid 0.9.2342.19200300.100.4.5
-    superior top  
-    requires
-		uid
-	allows
-		description,
-		host,
-		l,
-		o,
-		ou,
-		seeAlso
-
-objectclass document
-    oid 0.9.2342.19200300.100.4.6
-    superior pilotObject 
-	requires
-		documentIdentifier
-	allows
-		abstract,
-		authorCN,
-		authorSN,
-		cn,
-		description,
-		documentAuthor,
-		documentLocation,
-		documentPublisher,
-		documentStore,
-		documentTitle,
-		documentVersion,
-		keywords,
-		l,
-		o,
-		obsoletedByDocument,
-		obsoletesDocument,
-		ou,
-		seeAlso,
-		subject,
-		updatedByDocument,
-		updatesDocument
-
-objectclass room
-    oid 0.9.2342.19200300.100.4.7
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		roomNumber,
-		seeAlso,
-		telephoneNumber
-
-objectclass documentSeries
-    oid 0.9.2342.19200300.100.4.9
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		telephoneNumber
-
-objectclass domain
-    oid 0.9.2342.19200300.100.4.13
-    superior top  
-	requires
-		dc
-	allows
-		associatedName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		manager,
-		o,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass RFC822localPart
-    oid 0.9.2342.19200300.100.4.14
-    superior domain 
-	allows
-		cn,
-		sn
-
-objectclass DNSDomain
-    oid 0.9.2342.19200300.100.4.15
-    superior domain  
-	allows
-		dNSRecord
-
-objectclass domainRelatedObject
-    oid 0.9.2342.19200300.100.4.17
-    superior top 
-	requires
-		associatedDomain
-
-objectclass friendlyCountry
-    oid 0.9.2342.19200300.100.4.18
-    superior country 
-	requires
-		co
-
-objectclass simpleSecurityObject
-	oid 0.9.2342.19200300.100.4.19
-	superior top 
-	requires
-		userPassword
-
-objectclass pilotOrganization
-	oid pilotOrganization-OID
-	superior top
-	requires
-		ou,
-		o
-	allows
-		buildingName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-
-objectclass labeledURIObject
-	oid 1.3.6.1.4.1.250.3.15 
-	superior top
-	allows
-		labeledURI
-
-objectclass cacheObject
-	oid 1.3.6.1.4.1.250.3.18 
-	superior top
-	allows
-		ttl
-
-# objectclasses below added since Netscape Directory Server 1.01
-
-objectclass netscapeServer 
-	oid 2.16.840.1.113730.3.2.10
-	superior top
-	requires 
-		cn 
-	allows 
-		description,
-		serverRoot,
-		serverProductName,
-		serverVersionNumber,
-		installationTimeStamp,
-		administratorContactInfo,
-		userpassword,
-		adminURL,
-		serverHostName
-
-objectclass nsLicenseUser
-	oid 2.16.840.1.113730.3.2.7
-	superior top
-	allows
-		nsLicensedFor,
-		nsLicenseStartTime,
-		nsLicenseEndTime
-
-objectclass changeLogEntry
-	oid 2.16.840.1.113730.3.2.1
-	superior top
-	requires
-		targetdn,
-		changeTime,
-		changenumber,
-		changeType
-	allows
-		changes,
-		newrdn,
-		deleteoldrdn,
-		newsuperior,
-		filterinfo
-
-objectclass cirReplicaSource
-	oid 2.16.840.1.113730.3.2.11
-	requires 
-		cn,
-		objectClass
-	allows
-		cirReplicaRoot,
-                cirHost,
-                cirPort,
-                cirBindDN,
-                cirUsePersistentSearch,
-                cirUseSSL,
-                cirBindCredentials,
-                cirLastUpdateApplied,
-                cirUpdateSchedule,
-                cirSyncInterval,
-                cirUpdateFailedAt,
-                cirBeginORC,
-                replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList
-
-objectclass referral
-	superior top
-	oid 2.16.840.1.113730.3.2.6
-	allows
-		ref
-
-objectclass passwordObject
-		oid  2.16.840.1.113730.3.2.12
-        requires
-                objectClass
-        allows
-                passwordExpirationTime,
-                passwordExpWarned,
-                passwordRetryCount,
-                retryCountResetTime,
-                accountUnlockTime,
-                passwordHistory,
-		passwordAllowChangeTime
-
-objectclass passwordPolicy
-		oid  2.16.840.1.113730.3.2.13
-        requires
-                objectClass
-        allows
-		passwordMaxAge,		
-		passwordExp,
-		passwordMinLength,
-		passwordKeepHistory,
-		passwordInHistory,
-		passwordChange,
-		passwordWarning,
-		passwordLockout,
-		passwordMaxFailure,
-		passwordResetDuration,
-		passwordUnlock,
-		passwordLockoutDuration,
-		passwordCheckSyntax,
-                passwordMustChange,
-                passwordStorageScheme,
-                passwordMinAge,
-                passwordResetFailureCount
-
-objectclass glue
-		oid  2.16.840.1.113730.3.2.30
-		superior top
-
-objectclass netscapeMachineData
-		oid  2.16.840.1.113730.3.2.32
-		superior top
-
-objectclass dcObject
-	oid 1.3.6.1.4.1.1466.344
-	superior top
-	requires 
-		dc
-
-objectclass subschema
-	oid 2.5.20.1
-	superior top
-	allows 
-		cn,
-		dITStructureRules,
-		nameForms,
-		dITContentRules,
-		objectClasses,
-		attributeTypes,
-		matchingRules,
-		matchingRuleUse
-
-objectclass vlvSearch
-    oid 2.16.840.1.113730.3.2.38
-    superior top
-    requires
-        cn,
-        vlvBase,
-        vlvScope,
-        vlvFilter
-    allows
-        multiLineDescription
-
-objectclass nsslapdConfig
-	oid 2.16.840.1.113730.3.2.39
-	superior top
-	allows cn
-
-objectclass directoryServerFeature
-    oid 2.16.840.1.113730.3.2.40
-    superior top
-    allows
-        oid,
-        cn,
-        multiLineDescription
-
-objectclass nsslapdPlugin
-	oid 2.16.840.1.113730.3.2.41 
-	superior top
-	requires
-		cn,
-		nsslapd-pluginPath,
-		nsslapd-pluginInitFunc,
-		nsslapd-pluginType,
-		nsslapd-pluginId,
-		nsslapd-pluginVersion,
-		nsslapd-pluginVendor,
-		nsslapd-pluginDescription,
-		nsslapd-pluginEnabled,
-		nsslapd-backend
-
-objectclass vlvIndex
-    oid 2.16.840.1.113730.3.2.42
-    superior top
-    requires
-        cn,
-        vlvSort
-    allows
-        vlvEnabled,
-        vlvUses
-	
-objectclass nsSNMP
-	OID 2.16.840.1.113730.3.2.43
-	superior top
-	requires 
-		cn,
-		nsSNMPEnabled
-	allows
-		nsSNMPOrganization,
-		nsSNMPLocation,
-		nsSNMPContact,
-		nsSNMPDescription,
-		nsSNMPMasterHost,
-		nsSNMPMasterPort
-
-objectclass nsIndex
-    oid 2.16.840.1.113730.3.2.44
-    superior top
-    requires
-		cn,
-		nsSystemIndex
-    allows
-		description,
-		nsIndexType,
-		nsMatchingRule
-
-#
-# ojectclass from rfc2307
-#	
-
-# posixAccount is an auxiliary class. You may use account as a structural
-# class.
-objectclass posixAccount
-	oid
-		1.3.6.1.1.1.2.0
-	superior
-		top
-	requires
-		objectClass,
-		cn,
-		uid,
-		uidNumber,
-		gidNumber,
-		homeDirectory
-	allows
-		userPassword,
-		loginShell,
-		gecos,
-		description
-
-# posixAccount is an auxiliary class. You may use account as a structural
-# class.
-objectclass shadowAccount
-	oid
-		1.3.6.1.1.1.2.1
-	superior
-		top
-	requires
-		objectClass,
-		uid
-	allows
-		userPassword,
-		shadowLastChange,
-		shadowMin,
-		shadowMax,
-		shadowWarning,
-		shadowInactive,
-		shadowExpire,
-		shadowFlag,
-		description
-
-objectclass posixGroup
-	oid
-		1.3.6.1.1.1.2.2
-	requires
-		objectClass,
-		cn,
-		gidNumber
-	allows
-		userPassword,
-		memberUid,
-		description
-
-objectclass ipService
-	oid
-		1.3.6.1.1.1.2.3
-	requires
-		objectClass,
-		cn,
-		ipServicePort,
-		ipServiceProtocol
-	allows
-		description
-
-objectclass ipProtocol
-	oid
-		1.3.6.1.1.1.2.4
-	requires
-		objectClass,
-		cn,
-		ipProtocolNumber
-	allows
-		description
-
-objectclass oncRpc
-	oid
-		1.3.6.1.1.1.2.5
-	requires
-		objectClass,
-		cn,
-		oncRpcNumber
-	allows
-		description
-
-# ipHost is a subclass of device
-objectclass ipHost
-	oid
-		1.3.6.1.1.1.2.6
-	requires
-		objectClass,
-		ipHostNumber,
-		cn
-	allows
-		manager,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-
-objectclass ipNetwork
-	oid
-		1.3.6.1.1.1.2.7
-	requires
-		objectClass,
-		ipNetworkNumber,
-		cn
-	allows
-		ipNetmaskNumber,
-		manager,
-		l,
-		description
-
-objectclass nisNetgroup
-	oid
-		1.3.6.1.1.1.2.8
-	requires
-		objectClass,
-		cn
-	allows
-		nisNetgroupTriple,
-		memberNisNetgroup,
-		description
-
-# the automount class is deprecated. Because cn is case insensitive
-# on matches, you may need to use another object class to unique
-# names.
-objectclass automount
-	oid
-		1.3.6.1.1.1.2.9
-	requires
-		objectClass,
-		cn,
-		automountInformation
-	allows
-		description
-
-# nisObject represents entries in NIS maps.
-objectclass nisObject
-	oid
-		1.3.6.1.1.1.2.10
-	requires
-		objectClass,
-		cn,
-		nisMapEntry,
-		nisMapName
-	allows
-		description
-
-# ieee802Device is a subclass of device
-objectclass ieee802Device
-	oid
-		1.3.6.1.1.1.2.11
-	requires
-		objectClass,
-		cn
-	allows
-		macAddress,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# bootableDevice is a subclass of device
-objectclass bootableDevice
-	oid
-		1.3.6.1.1.1.2.12
-	requires
-		objectClass,
-		cn
-	allows
-		bootFile,
-		bootParameter,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# nisMap is a structural class which may be used as a container
-# for instances of nisObject.
-objectclass nisMap
-	oid
-		1.3.6.1.1.1.2.13
-	requires
-		objectClass,
-		nisMapName
-	allows
-		description
-
diff --git a/ldap/cm/v4confs/411/java-object-schema.conf b/ldap/cm/v4confs/411/java-object-schema.conf
deleted file mode 100644
index 7a6c0ef5..00000000
--- a/ldap/cm/v4confs/411/java-object-schema.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Schema for storing java objects and java object references
-
-attribute javaClassName			1.3.6.1.4.1.42.2.27.4.1.6	ces	single
-
-attribute javaCodebase			1.3.6.1.4.1.42.2.27.4.1.7	ces
-
-attribute javaSerializedData	1.3.6.1.4.1.42.2.27.4.1.8	bin single
-
-attribute javaFactory			1.3.6.1.4.1.42.2.27.4.1.10	ces single
-
-attribute javaReferenceAddress	1.3.6.1.4.1.42.2.27.4.1.11	ces
-
-attribute javaDoc	1.3.6.1.4.1.42.2.27.4.1.12	ces
-
-attribute javaClassNames	1.3.6.1.4.1.42.2.27.4.1.13	ces
-
-objectclass javaContainer
-	oid 1.3.6.1.4.1.42.2.27.4.2.1
-	superior top
-	requires
-		cn
-
-objectclass javaObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.4
-	superior top
-	requires
-		javaClassName
-	allows
-		javaClassNames,
-		javaCodebase,
-		javaDoc,
-		description
-
-objectclass javaSerializedObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.5
-	superior javaObject
-	requires
-		javaSerializedData
-
-objectclass javaNamingReference
-	oid 1.3.6.1.4.1.42.2.27.4.2.7
-	superior javaObject
-	allows
-		javaReferenceAddress,
-        javaFactory
-
-objectclass javaMarshalledObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.8
-	superior javaObject
-	requires
-		javaSerializedData
diff --git a/ldap/cm/v4confs/411/ns-admin-schema.conf b/ldap/cm/v4confs/411/ns-admin-schema.conf
deleted file mode 100644
index 73a03cac..00000000
--- a/ldap/cm/v4confs/411/ns-admin-schema.conf
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Netscape Administration Server LDAP Schema configuration file
-#
-# Version: 4.1
-# Description:
-#  Administration Server and Mission Control Console attributes
-#  and objectclasses.
-#
-
-#############################################################
-# Attributes
-#############################################################
-
-#
-# nsAdminConfig
-#
-attribute	nsAdminCgiWaitPid	cis
-attribute	nsAdminUsers		cis
-attribute	nsAdminAccessHosts	cis
-attribute	nsAdminAccessAddresses	cis
-attribute	nsAdminOneACLDir	cis
-attribute	nsAdminEnableDSGW	cis
-attribute	nsAdminEnableEnduser	cis
-attribute	nsAdminCacheLifetime	cis
-
-
-#
-# nsAdminResourceEditorExtension
-#
-attribute	nsAdminAccountInfo	cis
-attribute	nsDeleteclassname	cis
-
-#
-# nsAdminGlobalParameters
-#
-attribute	nsAdminEndUserHTMLIndex	cis
-
-#
-# nsGlobalParameters
-#
-attribute	nsUniqueAttribute	cis
-attribute	nsUserIDFormat		cis
-attribute	nsUserRDNComponent	cis
-attribute	nsGroupRDNComponent	cis
-attribute	nsWellKnownJarfiles	cis
-attribute	nsNYR			cis
-
-#
-# nsDefaultObjectClasses
-#
-attribute	nsDefaultObjectClass	cis
-
-#
-# nsAdminConsoleUser
-#
-attribute	nsPreference		cis
-
-#
-# nsCustomView
-#
-attribute	nsDisplayName		cis
-
-#
-# nsTopologyCustomView
-#
-attribute	nsViewConfiguration	cis
-
-#############################################################
-# Objectclasses
-#############################################################
-
-objectclass nsAdminServer
-    superior top
-    requires
-        cn,
-        nsServerID
-    allows
-        description
-
-objectclass nsAdminConfig
-    superior nsConfig
-    allows
-        nsAdminCgiWaitPid,
-        nsAdminUsers,
-        nsAdminAccessHosts,
-        nsAdminAccessAddresses,
-        nsAdminOneACLDir,
-        nsAdminEnableDSGW,
-	nsAdminEnableEnduser,
-	nsAdminCacheLifetime
-
-objectclass nsAdminResourceEditorExtension
-    superior nsAdminObject
-    requires
-        cn
-    allows
-	nsAdminAccountInfo,
-	nsDeleteclassname
-
-objectclass nsAdminGlobalParameters
-    superior top
-    requires
-        cn
-    allows
-        nsAdminEndUserHTMLIndex,
-        nsNickname
-        
-objectclass nsGlobalParameters
-    superior top
-    requires
-        cn
-    allows
-        nsUniqueAttribute,
-	nsUserIDFormat,
-	nsUserRDNComponent,
-	nsGroupRDNComponent,
-	nsWellKnownJarFiles,
-	nsNYR
-        
-objectclass nsDefaultObjectClasses
-    superior top
-    requires 
-        cn
-    allows
-        nsDefaultObjectClass
-
-objectclass nsAdminConsoleUser
-	superior top
-	requires
-		cn
-	allows
-		nsPreference
-		
-objectclass nsCustomView
-	superior nsAdminObject
-	allows
-		nsDisplayName,
-	
-objectclass nsTopologyCustomView
-	superior nsCustomView
-	requires
-		cn
-	allows
-		nsViewConfiguration
-
-objectclass nsTopologyPlugin
-	superior nsAdminObject
-	allows	
diff --git a/ldap/cm/v4confs/411/ns-calendar-globopt.conf b/ldap/cm/v4confs/411/ns-calendar-globopt.conf
deleted file mode 100644
index 9b49a483..00000000
--- a/ldap/cm/v4confs/411/ns-calendar-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-index   nsCalXItemId    pres,eq,sub
diff --git a/ldap/cm/v4confs/411/ns-calendar-schema.conf b/ldap/cm/v4confs/411/ns-calendar-schema.conf
deleted file mode 100644
index 1df0b736..00000000
--- a/ldap/cm/v4confs/411/ns-calendar-schema.conf
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsCalAccess                 2.16.840.1.113730.3.1.112  cis     
-attribute nsCalAccessDomain           2.16.840.1.113730.3.1.113  cis     
-attribute nsCalAdmd                   2.16.840.1.113730.3.1.114  cis     
-attribute nsCalDefaultNoteReminder    2.16.840.1.113730.3.1.115  cis     
-attribute nsCalDefaultReminder        2.16.840.1.113730.3.1.116  cis     
-attribute nsCalDefaultTaskReminder    2.16.840.1.113730.3.1.117  cis     
-attribute nsCalDisplayPrefs           2.16.840.1.113730.3.1.118  cis     
-attribute nsCalFlags                  2.16.840.1.113730.3.1.119  cis     
-attribute nsCalHost                   2.16.840.1.113730.3.1.120  cis     
-attribute nsCalLanguageId             2.16.840.1.113730.3.1.121  cis     
-attribute nsCalNodeAlias              2.16.840.1.113730.3.1.122  cis     
-attribute nsCalNotifMechanism         2.16.840.1.113730.3.1.123  cis     
-attribute nsCalOperatingPrefs         2.16.840.1.113730.3.1.124  cis     
-attribute nsCalOrgUnit2               2.16.840.1.113730.3.1.125  cis     
-attribute nsCalOrgUnit3               2.16.840.1.113730.3.1.126  cis     
-attribute nsCalOrgUnit4               2.16.840.1.113730.3.1.127  cis     
-attribute nsCalPasswordRequired       2.16.840.1.113730.3.1.128  cis     
-attribute nsCalPrmd                   2.16.840.1.113730.3.1.129  cis     
-attribute nsCalRefreshPrefs           2.16.840.1.113730.3.1.130  cis     
-attribute nsCalResourceCapacity       2.16.840.1.113730.3.1.131  cis     
-attribute nsCalResourceNumber         2.16.840.1.113730.3.1.132  cis     
-attribute nsCalServerVersion          2.16.840.1.113730.3.1.133  cis     
-attribute nsCalSysopCanWritePassword  2.16.840.1.113730.3.1.134  cis     
-attribute nsCalTimezone               2.16.840.1.113730.3.1.135  cis     
-attribute nsCalXItemId                2.16.840.1.113730.3.1.136  cis     
-
-
-objectclass nsCalUser
-		oid 2.16.840.1.113730.3.2.14
-        requires
-                objectClass
-        allows
-		c,
-		employeeNumber,
-                generationQualifier,
-		givenName,
-		initials,
-		mail,
-		o,
-		ou,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalRefreshPrefs,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass nsCalAdmin
-		oid 2.16.840.1.113730.3.2.15
-        requires
-                objectClass
-        allows
-		c,
-                cn,
-                facsimileTelephoneNumber,
-                generationQualifier,
-                givenName,
-                initials,
-		mail,
-		o,
-                ou,
-                postalAddress,
-                sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalXItemId
-
-objectclass nsCalResource
-		oid 2.16.840.1.113730.3.2.16
-        requires
-                objectClass
-        allows
-                cn,
-                facsimileTelephoneNumber,
-		givenName,
-		mail,
-                postalAddress,
-		sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalPasswordRequired,
-                nsCalRefreshPrefs,
-                nsCalResourceCapacity,
-                nsCalResourceNumber,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass netscapeCalendarServer
-		oid 2.16.840.1.113730.3.2.17
-        requires
-                objectclass
-
-
-
diff --git a/ldap/cm/v4confs/411/ns-certificate-globopt.conf b/ldap/cm/v4confs/411/ns-certificate-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/411/ns-certificate-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/411/ns-certificate-schema.conf b/ldap/cm/v4confs/411/ns-certificate-schema.conf
deleted file mode 100644
index 02efd5a2..00000000
--- a/ldap/cm/v4confs/411/ns-certificate-schema.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-attribute 	nsCertConfig 	cis
-
-objectclass netscapeCertificateServer
-                oid 2.16.840.1.113730.3.2.18
-        requires
-                objectclass
-
-objectclass nsCertificateServer
-        requires
-                objectclass,
-                nsServerID
-        allows
-                serverHostName,
-                nsServerPort,
-		nsCertConfig
-
-
diff --git a/ldap/cm/v4confs/411/ns-common-schema.conf b/ldap/cm/v4confs/411/ns-common-schema.conf
deleted file mode 100644
index 2cb7e480..00000000
--- a/ldap/cm/v4confs/411/ns-common-schema.conf
+++ /dev/null
@@ -1,278 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Common LDAP schema configuration file
-#
-# Version: 4.1
-# Description:
-#   This configuration file contains objectclasses and attributes 
-#   common to the Mission Control Framework
-#
-
-#############################################################
-# Attributes
-#############################################################
-
-#
-# Common Attributes
-#
-attribute nsServerID  			cis
-attribute nsBaseDN    			cis
-attribute nsBindDN    			cis
-attribute nsBindPassword 		cis
-attribute nsServerPort			cis
-attribute nsServerAddress 		cis
-attribute nsDirectoryInfoRef		dn
-attribute nsDirectoryURL		ces
-attribute nsDirectoryFailoverList	ces
-#
-# nsAdminDomain
-#
-attribute	nsAdminDomainName	cis
-
-#
-# nsHost
-#
-attribute	nsHostLocation 		cis
-attribute	nsHardwarePlatform	cis
-attribute	nsOsVersion		cis
-
-#
-# nsAdminGroup
-#
-attribute	nsAdminGroupName	cis
-attribute	nsConfigRoot		cis
-attribute	nsAdminSIEDN		dn
-
-#
-# nsApplication
-#
-attribute	nsVendor		cis
-attribute	nsProductName		cis
-attribute	nsNickName		cis
-attribute	nsProductVersion	cis
-attribute	nsBuildNumber		cis
-attribute	nsRevisionNumber	cis
-attribute	nsSerialNumber		cis
-attribute	nsInstalledLocation	cis
-attribute	nsExpirationDate	cis
-attribute	nsBuildSecurity		cis
-attribute	nsServerMigrationClassname	cis
-attribute	nsServerCreationClassname	cis
-attribute       nsLdapSchemaVersion     cis
-
-#
-# nsConfig
-#
-attribute	nsSuiteSpotUser		cis
-attribute	nsErrorLog		cis
-attribute	nsPidLog		cis
-attribute	nsAccessLog		cis
-attribute	nsDefaultAcceptLanguage	cis
-attribute	nsServerSecurity	cis
-
-#
-# nsEncryptionConfig
-#
-attribute	nsCertfile		cis
-attribute	nsKeyfile		cis
-attribute	nsSSL2			cis
-attribute	nsSSL3			cis
-attribute	nsSSLClientAuth		cis
-attribute	nsSSLSessionTimeout	cis
-attribute	nsSSL3SessionTimeout	cis
-attribute	nsSSL2Ciphers		cis
-attribute	nsSSL3Ciphers		cis
-
-#
-# nsEncryptionModule
-#
-attribute	nsSSLToken		cis
-attribute	nsSSLPersonalitySSL	cis
-attribute	nsSSLActivation		cis
-
-#
-# nsTask
-#
-attribute	nsTaskLabel		cis
-attribute	nsHelpRef		cis
-attribute	nsExecRef		cis
-attribute	nsLogSuppress		cis
-
-#
-# nsAdminObject
-#
-attribute	nsJarfilename		cis
-attribute	nsClassname		cis
-
-
-#############################################################
-# Object Classes
-#############################################################
-objectclass nsAdminDomain
-    superior organizationalUnit
-    allows
-	nsAdminDomainName
-
-objectclass nsHost
-    superior top
-    requires
-        cn
-    allows
-        serverHostName,
-        description,
-        l,
-        nsHostLocation,
-        nsHardwarePlatform,
-        nsOsVersion
-
-objectclass nsAdminGroup
-    superior top
-    requires
-        cn
-    allows
-	nsAdminGroupName,
-        description,
-        nsConfigRoot,
-	nsAdminSIEDN
-
-objectclass nsApplication
-    superior top
-    requires 
-        cn
-    allows 
-        nsVendor,
-        description, 
-        nsProductName,                 
-        nsNickName,           
-        nsProductVersion,              
-        nsBuildNumber, 
-        nsRevisionNumber,       
-        nsSerialNumber, 
-        nsInstalledLocation,    
-        installationTimeStamp,
-        nsExpirationDate,       
-        nsBuildSecurity,
-	nsLdapSchemaVersion,
-        nsServerMigrationClassname,
-        nsServerCreationClassname
-
-objectclass nsEncryptionConfig
-    superior top
-    requires
-        cn
-    allows
-        nsCertfile,
-        nsKeyfile,
-        nsSSL2,
-        nsSSL3,
-        nsSSLSessionTimeout,
-        nsSSL3SessionTimeout,
-        nsSSLClientAuth,
-        nsSSL2Ciphers,
-        nsSSL3Ciphers
- 
-objectclass nsEncryptionModule
-    superior top
-    requires
-        cn
-    allows
-        nsSSLToken,
-        nsSSLPersonalityssl,
-        nsSSLActivation
-
-
-objectclass nsResourceRef
-    superior top
-    requires
-        cn
-    allows
-        seeAlso
-            
-objectclass nsTask
-    superior top
-    requires
-        cn
-    allows
-        nsTaskLabel,
-        nsHelpref,
-        nsExecref,
-        nsLogSuppress
-    
-objectclass nsTaskGroup
-    superior top
-    requires
-        cn
-    allows
-        nsTaskLabel
-
-objectclass nsAdminObject
-    superior top
-    requires
-        cn
-    allows
-        nsJarFilename,
-        nsClassName    
-        
-objectclass nsConfig
-    superior top
-    requires
-        cn
-    allows
-        description,
-        nsServerPort,
-	nsServerAddress,
-        nsSuiteSpotUser,
-        nsErrorLog,
-        nsPidLog,
-        nsAccessLog,
-        nsDefaultAcceptLanguage,
-	nsServerSecurity
-
-objectclass nsDirectoryInfo
-    superior top
-    requires 
-	cn
-    allows
-	nsBindDN,
-	nsBindPassword,
-	nsDirectoryURL,
-	nsDirectoryFailoverList,
-	nsDirectoryInfoRef
diff --git a/ldap/cm/v4confs/411/ns-compass-globopt.conf b/ldap/cm/v4confs/411/ns-compass-globopt.conf
deleted file mode 100644
index 6c56c350..00000000
--- a/ldap/cm/v4confs/411/ns-compass-globopt.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	pipuid			pres,eq,sub
-index	pipstatus		eq
-
diff --git a/ldap/cm/v4confs/411/ns-compass-schema.conf b/ldap/cm/v4confs/411/ns-compass-schema.conf
deleted file mode 100644
index 52997ea4..00000000
--- a/ldap/cm/v4confs/411/ns-compass-schema.conf
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-
-# Compass server specific (not currently used) 
-
-objectclass netscapeCompassServer
-		oid 2.16.840.1.113730.3.2.19
-        requires        
-                objectclass
-
-
-# Attributes for personal interest profile classes
-
-attribute pipuid                      2.16.840.1.113730.3.1.137  cis     
-attribute pipcompassservers           2.16.840.1.113730.3.1.138  cis     
-attribute pipuniqueid                 2.16.840.1.113730.3.1.139  cis     
-attribute pipstatus                   2.16.840.1.113730.3.1.140  cis     
-attribute pipusertype                 2.16.840.1.113730.3.1.141  cis     
-attribute pipfrequency                2.16.840.1.113730.3.1.142  cis     
-attribute pipmedium                   2.16.840.1.113730.3.1.143  cis     
-attribute pipformat                   2.16.840.1.113730.3.1.144  cis     
-attribute piphour                     2.16.840.1.113730.3.1.145  cis     
-attribute pipmaxhits                  2.16.840.1.113730.3.1.146  cis     
-attribute pipresultset                2.16.840.1.113730.3.1.147  cis     
-attribute pipsortorder                2.16.840.1.113730.3.1.148  cis     
-attribute piptimestamp                2.16.840.1.113730.3.1.149  cis     
-attribute pipirlist                   2.16.840.1.113730.3.1.150  cis     
-attribute pipiroption                 2.16.840.1.113730.3.1.151  cis     
-attribute pippwp                      2.16.840.1.113730.3.1.152  cis     
-attribute piplastcount                2.16.840.1.113730.3.1.153  cis     
-attribute piptotalcount               2.16.840.1.113730.3.1.154  cis     
-attribute piptotalrun                 2.16.840.1.113730.3.1.155  cis     
-attribute pipnotify                   2.16.840.1.113730.3.1.156  cis     
-attribute pipprivilege                2.16.840.1.113730.3.1.157  cis     
-attribute pipgroup                    2.16.840.1.113730.3.1.158  cis     
-attribute pipidstcount                2.16.840.1.113730.3.1.159  cis     
-attribute pipstid                     2.16.840.1.113730.3.1.160  cis     
-attribute pipstname                   2.16.840.1.113730.3.1.161  cis     
-attribute pipstquery                  2.16.840.1.113730.3.1.162  cis     
-attribute pipsttaxonomy               2.16.840.1.113730.3.1.163  cis     
-attribute pipstinterest               2.16.840.1.113730.3.1.164  cis     
-attribute pipsttype                   2.16.840.1.113730.3.1.165  cis     
-attribute pipstprivacy                2.16.840.1.113730.3.1.166  cis     
-attribute pipststatus                 2.16.840.1.113730.3.1.167  cis     
-attribute pipstlastcount              2.16.840.1.113730.3.1.168  cis     
-attribute pipsttotalcount             2.16.840.1.113730.3.1.169  cis     
-attribute pipsttotalrun               2.16.840.1.113730.3.1.170  cis     
-attribute pipstcategory               2.16.840.1.113730.3.1.171  cis     
-attribute pipstfrequency              2.16.840.1.113730.3.1.172  cis     
-attribute pipstmedium                 2.16.840.1.113730.3.1.173  cis     
-attribute pipstformat                 2.16.840.1.113730.3.1.174  cis     
-attribute pipsthour                   2.16.840.1.113730.3.1.175  cis     
-attribute pipstmaxhits                2.16.840.1.113730.3.1.176  cis     
-attribute pipstresultset              2.16.840.1.113730.3.1.177  cis     
-attribute pipstsortorder              2.16.840.1.113730.3.1.178  cis     
-attribute pipsttimestamp              2.16.840.1.113730.3.1.179  cis     
-attribute pipstirlist                 2.16.840.1.113730.3.1.180  cis     
-attribute pipstiroption               2.16.840.1.113730.3.1.181  cis     
-attribute pipreservedcis1             2.16.840.1.113730.3.1.182  cis     
-attribute pipreservedcis2             2.16.840.1.113730.3.1.183  cis     
-attribute pipreservedcis3             2.16.840.1.113730.3.1.184  cis     
-attribute pipreservedcis4             2.16.840.1.113730.3.1.185  cis     
-attribute pipreservedcis5             2.16.840.1.113730.3.1.186  cis     
-attribute pipreservedcis6             2.16.840.1.113730.3.1.187  cis     
-attribute pipreservedces1             2.16.840.1.113730.3.1.188  ces     
-attribute pipreservedces2             2.16.840.1.113730.3.1.189  ces     
-attribute pipreservedces3             2.16.840.1.113730.3.1.190  ces     
-
-
-# Each interest profile is one of these and sits under the compass SIE
-
-objectclass personalInterestProfile 
-		oid 2.16.840.1.113730.3.2.20
-        requires        
-                objectclass,
-		pipuid
-	allows
-		pipuniqueid,
-		pipstatus,
-		pipusertype,
-		pipfrequency,
-		pipmedium,
-		pipformat,
-		piphour,
-		pipmaxhits,
-		pipresultset,
-		pipsortorder,
-		piptimestamp,
-		pipirlist,
-		pipiroption,
-		pippwp,
-		piplastcount,
-		piptotalcount,
-		piptotalrun,
-		pipnotify,
-		pipprivilege,
-		pipgroup,
-		pipidstcount,
-		pipstid,
-		pipstname,
-		pipstquery,
-		pipsttaxonomy,
-		pipstinterest,
-		pipsttype,
-		pipstprivacy,
-		pipststatus,
-		pipstlastcount,
-		pipsttotalcount,
-		pipsttotalrun,
-		pipstcategory,
-		pipstfrequency,
-		pipstmedium,
-		pipstformat,
-		pipsthour,
-		pipstmaxhits,
-		pipstresultset,
-		pipstsortorder,
-		pipsttimestamp,
-		pipstirlist,
-		pipstiroption,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
-
-# Replication of user info for template users, completeness, etc.
-# (not currently used)
-
-objectclass PIPUserInfo
-		oid 2.16.840.1.113730.3.2.21
-        requires        
-                objectclass
-	allows
-		cn,
-		mail,
-		userPassword,
-		description,
-		pipcompassservers,
-		pipuniqueid
-
-
-# Enhancements to a normal user entry (not currently used)
-
-objectclass PIPUser
-	oid 2.16.840.1.113730.3.2.22		
-	requires        
-        objectclass
-	allows
-		pipuniqueid,
-		pipcompassservers,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
diff --git a/ldap/cm/v4confs/411/ns-cos-schema.conf b/ldap/cm/v4confs/411/ns-cos-schema.conf
deleted file mode 100644
index abea53fd..00000000
--- a/ldap/cm/v4confs/411/ns-cos-schema.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Attributes used by Class of Service
-
-attribute cosAttribute 2.16.840.1.113730.3.1.550 cis
-attribute cosSpecifier 2.16.840.1.113730.3.1.551 cis
-attribute cosTargetTree 2.16.840.1.113730.3.1.552 cis
-attribute cosTemplateDn 2.16.840.1.113730.3.1.553 cis
-
-# Object classes used by Class of Service
-
-objectclass cosDefinition
-	oid 2.16.840.1.113730.3.2.84
-	superior top
-	requires
-		objectclass
-	allows
-		aci,
-		cn,
-		uid,
-		costargettree,
-		costemplatedn,
-		cosspecifier,
-		cosattribute
diff --git a/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
deleted file mode 100644
index 0e77ef27..00000000
--- a/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Netscape Delegated Administrator LDAP Schema
-#
-#############################################################
-# Delegated User Administration Attributes
-#############################################################
-
-attribute  nsNumUsers		2.16.840.1.113730.3.1.554	cis	single
-attribute  nsMaxUsers		2.16.840.1.113730.3.1.555	cis	single
-attribute  nsNumDepts		2.16.840.1.113730.3.1.556	cis	single
-attribute  nsMaxDepts		2.16.840.1.113730.3.1.557	cis	single
-attribute  nsNumMailLists	2.16.840.1.113730.3.1.558	cis	single
-attribute  nsMaxMailLists	2.16.840.1.113730.3.1.559	cis	single
-attribute  nsNumDomains		2.16.840.1.113730.3.1.560	cis	single
-attribute  nsMaxDomains		2.16.840.1.113730.3.1.561	cis	single
-attribute  nsDefaultMaxDeptSize	2.16.840.1.113730.3.1.562	cis	single
-attribute  nsdaCapability	2.16.840.1.113730.3.1.563	cis
-attribute  nsSearchFilter	2.16.840.1.113730.3.1.564	cis	single
-attribute  nsdaModifiableBy	2.16.840.1.113730.3.1.565	dn
-
-#############################################################
-# Delegated User Administration Objectclasses
-#############################################################
-
-objectclass nsManagedISP
-	oid 2.16.840.1.113730.3.2.85
-	superior top
-	allows
-		nsNumDomains
-
-objectclass nsManagedDomain
-	oid 2.16.840.1.113730.3.2.86
-	superior top
-	allows
-		nsNumUsers,
-		nsMaxUsers,
-		nsNumDepts,
-		nsMaxDepts,
-		nsNumMailLists,
-		nsMaxMailLists,
-		nsNumDomains,
-		nsMaxDomains,
-		nsDefaultMaxDeptSize,
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedOrgUnit
-	oid 2.16.840.1.113730.3.2.87
-	superior top
-	allows
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedDept
-	oid 2.16.840.1.113730.3.2.88
-	superior groupOfUniqueNames
-	allows
-		nsNumUsers,
-		nsMaxUsers,
-		nsNumDepts,
-		nsMaxDepts,
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedFamilyGroup
-	oid 2.16.840.1.113730.3.2.89
-	superior top
-	allows
-		nsNumUsers,
-		nsMaxUsers,
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedMailList
-	oid 2.16.840.1.113730.3.2.90
-	superior top
-	allows
-		nsNumUsers,
-		nsMaxUsers,
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedPerson
-	oid 2.16.840.1.113730.3.2.91
-	superior top
-	allows
-		nsdaCapability,
-		nsSearchFilter,
-		owner,
-		nsdaModifiableBy
diff --git a/ldap/cm/v4confs/411/ns-directory-globopt.conf b/ldap/cm/v4confs/411/ns-directory-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/411/ns-directory-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/411/ns-directory-schema.conf b/ldap/cm/v4confs/411/ns-directory-schema.conf
deleted file mode 100644
index ef4ed640..00000000
--- a/ldap/cm/v4confs/411/ns-directory-schema.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute	nsSecureServerPort 		cis
-
-objectclass netscapeDirectoryServer
-		oid 2.16.840.1.113730.3.2.23
-        requires        
-                objectclass
-
-objectclass nsDirectoryServer
-        requires
-                objectclass,
-                nsServerID
-        allows
-                serverHostName,
-                nsServerPort,
-                nsSecureServerPort,
-                nsBindPassword,
-                nsBindDN,
-                nsBaseDN
diff --git a/ldap/cm/v4confs/411/ns-legacy-schema.conf b/ldap/cm/v4confs/411/ns-legacy-schema.conf
deleted file mode 100644
index 43231314..00000000
--- a/ldap/cm/v4confs/411/ns-legacy-schema.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-attribute    url                    	cis
-
-#use by Netscape Admin Server 4.1 for LegacyServers
-
-objectclass nsLegacyAdminGroup
-	superior
-		nsAdminGroup
-	allows
-		adminUrl
-
-objectclass nsLegacyApplication
-	superior 
-	     nsApplication
-	allows 
-
-objectclass nsLegacyAdminServer
-        superior
-                nsAdminServer
-        allows
-
-objectclass nsLegacyServer 
-	superior 
-	     netscapeServer
-	allows 
-	     nsServerID,
-	     url
diff --git a/ldap/cm/v4confs/411/ns-mail-globopt.conf b/ldap/cm/v4confs/411/ns-mail-globopt.conf
deleted file mode 100644
index cf392ea4..00000000
--- a/ldap/cm/v4confs/411/ns-mail-globopt.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Messaging Server
-index	mailAlternateAddress	eq
-index	mailHost	eq
-#index	uid,mail	eq
-#index	uniquemember,member	eq
diff --git a/ldap/cm/v4confs/411/ns-mail-schema.conf b/ldap/cm/v4confs/411/ns-mail-schema.conf
deleted file mode 100644
index 8cfa0b76..00000000
--- a/ldap/cm/v4confs/411/ns-mail-schema.conf
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-attribute	mailAccessDomain	2.16.840.1.113730.3.1.12 cis
-attribute	mailAlternateAddress	2.16.840.1.113730.3.1.13 cis
-attribute	mailAutoReplyMode	2.16.840.1.113730.3.1.14 cis
-attribute	mailAutoReplyText	2.16.840.1.113730.3.1.15 cis
-attribute	mailDeliveryOption	2.16.840.1.113730.3.1.16 cis
-attribute	mailForwardingAddress	2.16.840.1.113730.3.1.17 cis
-attribute	mailHost		2.16.840.1.113730.3.1.18 cis
-attribute	mailQuota		2.16.840.1.113730.3.1.21 cis
-attribute	mailRoutingAddress      2.16.840.1.113730.3.1.47 cis
-
-attribute	mailMessageStore	2.16.840.1.113730.3.1.19 ces
-attribute	mailProgramDeliveryInfo	2.16.840.1.113730.3.1.20 ces
-
-attribute	nsmsgDisallowAccess	ces
-
-attribute	vacationstartdate	cis
-attribute	vacationenddate		cis
-
-# mailRecipient is used to designate an LDAP entry as representing some
-# entity that can receive mail, e.g. a mail user or mail group.
-# Note: attributes 'mailAccessDomain' through 'userPassword' do not
-# belong to mailRecipient, but are included here for backward compatibility.
-objectClass mailRecipient
-	oid 2.16.840.1.113730.3.2.3
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mailAccessDomain,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota,
-		multiLineDescription,
-		uid,
-		userPassword
-
-attribute	nswmExtendedUserPrefs	2.16.840.1.113730.3.1.520 cis
-
-# nsMessagingServerUser is used to designate an LDAP entry as representing a
-# Netscape Messaging Server user account.  It is used in combination with
-# mailRecipient.
-objectClass nsMessagingServerUser
-	oid 2.16.840.113730.3.2.37
-	requires
-		objectClass
-	allows
-		cn,
-		mailAccessDomain,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota,
-		nsmsgDisallowAccess,
-		nswmExtendedUserPrefs,
-		vacationstartdate,
-		vacationenddate
-
-attribute	mgrpAllowedDomain	2.16.840.1.113730.3.1.23 cis
-attribute	mgrpMsgRejectAction	2.16.840.1.113730.3.1.28 cis
-attribute	mgrpRFC822MailMember	2.16.840.1.113730.3.1.30 cis
-attribute	mgrpMsgMaxSize		2.16.840.1.113730.3.1.32 cis single
-attribute	mgrpBroadcasterPolicy	cis
-attribute	mgrpNoDuplicateChecks	cis single
-attribute	mgrpRemoveHeader	cis
-
-attribute	mgrpAllowedBroadcaster	2.16.840.1.113730.3.1.22 ces
-attribute	mgrpDeliverTo		2.16.840.1.113730.3.1.25 ces
-attribute	mgrpErrorsTo		2.16.840.1.113730.3.1.26 ces single
-attribute	mgrpModerator		2.16.840.1.113730.3.1.33 ces
-attribute	mgrpMsgRejectText	2.16.840.1.113730.3.1.29 ces
-attribute	mgrpAddHeader		ces
-
-attribute	mgrpApprovePassword	ces single
-
-# mailGroup is used to designate an LDAP entry as representing a mail group
-# (mailing list).  It is used in combination with mailRecipient.
-# Note: attributes 'mail' through 'mailRoutingAddress' belong to mailRecipient,
-# but are also included here for backward compatibility.
-objectClass mailGroup
-	oid 2.16.840.1.113730.3.2.4
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mgrpAddHeader,
-		mgrpAllowedBroadcaster,
-		mgrpAllowedDomain,
-		mgrpApprovePassword,
-		mgrpBroadcasterPolicy,
-		mgrpDeliverTo,
-		mgrpErrorsTo,
-		mgrpModerator,
-		mgrpMsgMaxSize,
-		mgrpMsgRejectAction,
-		mgrpMsgRejectText,
-		mgrpNoDuplicateChecks,
-		mgrpRemoveHeader,
-		mgrpRFC822MailMember,
-		owner
-
-attribute	mailEnhancedUniqueMember	2.16.840.1.113730.3.1.31 dn
-
-objectClass groupOfMailEnhancedUniqueNames
-	oid 2.16.840.1.113730.3.2.5
-	requires
-		objectClass,
-		cn
-	allows
-		businessCategory,
-		description,
-		mailEnhancedUniqueMember,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectClass	netscapeMailServer
-	oid 2.16.840.1.113730.3.2.24
-	requires
-		objectClass
-
diff --git a/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
deleted file mode 100644
index a7e0be55..00000000
--- a/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# ns-mcd-browser-schema.conf
-#
-# Netscape Mission Control Desktop browser client schema
-# This schema is used to hold browser client preferences.
-#
-
-attribute nsBCStartupBrowser              2.16.840.1.113730.3.1.409  cis
-attribute nsBCStartupMail                 2.16.840.1.113730.3.1.410  cis
-attribute nsBCStartupEditor               2.16.840.1.113730.3.1.411  cis
-attribute nsBCStartupCalendar             2.16.840.1.113730.3.1.412  cis
-attribute nsBCChromeButtonStyle           2.16.840.1.113730.3.1.413  cis
-attribute nsBCUseDocumentFonts            2.16.840.1.113730.3.1.414  cis
-attribute nsBCForegroundColor             2.16.840.1.113730.3.1.415  cis
-attribute nsBCBackgroundColor             2.16.840.1.113730.3.1.416  cis
-attribute nsBCAnchorColor                 2.16.840.1.113730.3.1.417  cis
-attribute nsBCVisitedColor                2.16.840.1.113730.3.1.418  cis
-attribute nsBCUnderlineAnchors            2.16.840.1.113730.3.1.419  cis
-attribute nsBCUseDocumentColors           2.16.840.1.113730.3.1.420  cis
-attribute nsBCStartupPage                 2.16.840.1.113730.3.1.421  cis
-attribute nsBCStartupHomePage             2.16.840.1.113730.3.1.422  cis
-attribute nsBCLinkExpiration              2.16.840.1.113730.3.1.423  cis
-attribute nsBCIntlAcceptLanguages         2.16.840.1.113730.3.1.424  cis
-attribute nsBCMimeType                    2.16.840.1.113730.3.1.425  cis
-attribute nsBCMimeAllowAdd                2.16.840.1.113730.3.1.426  cis
-attribute nsBCMimeAllowEdit               2.16.840.1.113730.3.1.427  cis
-attribute nsBCMimeAllowRemove             2.16.840.1.113730.3.1.428  cis
-attribute nsBCRelatedEnabled              2.16.840.1.113730.3.1.429  cis
-attribute nsBCRelatedAutoload             2.16.840.1.113730.3.1.430  cis
-attribute nsBCRelatedDisabledForDomains   2.16.840.1.113730.3.1.431  cis
-attribute nsBCGoBrowsingEnabled           2.16.840.1.113730.3.1.432  cis
-attribute nsBCOfflineStartupState         2.16.840.1.113730.3.1.433  cis
-attribute nsBCOfflineSendUnsentMessages   2.16.840.1.113730.3.1.434  cis
-attribute nsBCOfflinePromptSynchOnExit    2.16.840.1.113730.3.1.435  cis
-attribute nsBCAlwaysLoadImages            2.16.840.1.113730.3.1.436  cis
-attribute nsBCEnableJava                  2.16.840.1.113730.3.1.437  cis
-attribute nsBCEnableJavaScript            2.16.840.1.113730.3.1.438  cis
-attribute nsBCEnableStyleSheets           2.16.840.1.113730.3.1.439  cis
-attribute nsBCEmailAsFtpPassword          2.16.840.1.113730.3.1.440  cis
-attribute nsBCCookieBehavior              2.16.840.1.113730.3.1.441  cis
-attribute nsBCWarnAboutCookies            2.16.840.1.113730.3.1.442  cis
-attribute nsBCMemoryCacheSize             2.16.840.1.113730.3.1.443  cis
-attribute nsBCDiskCacheSize               2.16.840.1.113730.3.1.444  cis
-attribute nsBCCheckDocFrequency           2.16.840.1.113730.3.1.445  cis
-attribute nsBCProxyType                   2.16.840.1.113730.3.1.446  cis
-attribute nsBCProxyHttp                   2.16.840.1.113730.3.1.447  cis
-attribute nsBCProxySsl                    2.16.840.1.113730.3.1.448  cis
-attribute nsBCProxyFtp                    2.16.840.1.113730.3.1.449  cis
-attribute nsBCProxySocks                  2.16.840.1.113730.3.1.450  cis
-attribute nsBCProxyGopher                 2.16.840.1.113730.3.1.451  cis
-attribute nsBCProxyWais                   2.16.840.1.113730.3.1.452  cis
-attribute nsBCNoProxiesOn                 2.16.840.1.113730.3.1.453  cis
-attribute nsBCProxyAutoConfigUrl          2.16.840.1.113730.3.1.454  cis
-attribute nsBCAutoUpdateEnabled           2.16.840.1.113730.3.1.455  cis
-attribute nsBCAutoUpdateConfirmInstall    2.16.840.1.113730.3.1.456  cis
-
-
-objectclass nsBrowserClient 
-	oid 2.16.840.1.113730.3.2.78
-    superior top 
-    allows 
-	nsBCStartupBrowser,
-	nsBCStartupMail,
-	nsBCStartupEditor,
-	nsBCStartupCalendar,
-	nsBCChromeButtonStyle,
-	nsBCUseDocumentFonts,
-	nsBCForegroundColor,
-	nsBCBackgroundColor,
-	nsBCAnchorColor,
-	nsBCVisitedColor,
-	nsBCUnderlineAnchors,
-	nsBCUseDocumentColors,
-	nsBCStartupPage,
-	nsBCStartupHomePage,
-	nsBCLinkExpiration,
-	nsBCIntlAcceptLanguages,
-	nsBCMimeType,
-	nsBCMimeAllowAdd,
-	nsBCMimeAllowEdit,
-	nsBCMimeAllowRemove,
-	nsBCRelatedEnabled,
-	nsBCRelatedAutoload,
-	nsBCRelatedDisabledForDomains,
-	nsBCGoBrowsingEnabled,
-	nsBCOfflineStartupState,
-	nsBCOfflineSendUnsentMessages,
-	nsBCOfflinePromptSynchOnExit,
-	nsBCAlwaysLoadImages,
-	nsBCEnableJava,
-	nsBCEnableJavaScript,
-	nsBCEnableStyleSheets,
-	nsBCEmailAsFtpPassword,
-	nsBCCookieBehavior,
-	nsBCWarnAboutCookies,
-	nsBCMemoryCacheSize,
-	nsBCDiskCacheSize,
-	nsBCCheckDocFrequency,
-	nsBCProxyType,
-	nsBCProxyHttp,
-	nsBCProxySsl,
-	nsBCProxyFtp,
-	nsBCProxySocks,
-	nsBCProxyGopher,
-	nsBCProxyWais,
-	nsBCNoProxiesOn,
-	nsBCProxyAutoConfigUrl,
-	nsBCAutoUpdateEnabled,
-	nsBCAutoUpdateConfirmInstall
-
-# 
-# Netscape Mission Control Desktop browser security schema
-# This schema is used to hold browser security preferences.
-#
-
-attribute nsBSAskForPassword              2.16.840.1.113730.3.1.457  cis
-attribute nsBSPasswordLifetime            2.16.840.1.113730.3.1.458  cis
-attribute nsBSWarnEnteringSecure          2.16.840.1.113730.3.1.459  cis
-attribute nsBSWarnLeavingSecure           2.16.840.1.113730.3.1.460  cis
-attribute nsBSWarnViewingMixed            2.16.840.1.113730.3.1.461  cis
-attribute nsBSWarnSubmitInsecure          2.16.840.1.113730.3.1.462  cis
-attribute nsBSEnableSsl2                  2.16.840.1.113730.3.1.463  cis
-attribute nsBSEnableSsl3                  2.16.840.1.113730.3.1.464  cis
-attribute nsBSCertmgmtDisableFunctionMsg  2.16.840.1.113730.3.1.465  cis
-attribute nsBSSsl2Rc4128                  2.16.840.1.113730.3.1.466  cis
-attribute nsBSSsl2Rc2128                  2.16.840.1.113730.3.1.467  cis
-attribute nsBSSsl2DesEd3192               2.16.840.1.113730.3.1.468  cis
-attribute nsBSSsl2Des64                   2.16.840.1.113730.3.1.469  cis
-attribute nsBSSsl2Rc440                   2.16.840.1.113730.3.1.470  cis
-attribute nsBSSsl2Rc240                   2.16.840.1.113730.3.1.471  cis
-attribute nsBSSsl3RsaRc4128Md5            2.16.840.1.113730.3.1.472  cis
-attribute nsBSSsl3FipsDesEd3Sha           2.16.840.1.113730.3.1.473  cis
-attribute nsBSSsl3RsaRc4128Md5            2.16.840.1.113730.3.1.474  cis
-attribute nsBSSsl3RsaFipsDesSha           2.16.840.1.113730.3.1.475  cis
-attribute nsBSSsl3RsaDesSha               2.16.840.1.113730.3.1.476  cis
-attribute nsBSSsl3RsaRc440Md5             2.16.840.1.113730.3.1.477  cis
-attribute nsBSSsl3RsaRc240Md5             2.16.840.1.113730.3.1.478  cis
-attribute nsBSSsl3RsaNullMd5              2.16.840.1.113730.3.1.479  cis
-attribute nsBSSsl3FortezzaFortezzaSha     2.16.840.1.113730.3.1.480  cis
-attribute nsBSSsl3FortezzaRc4Sha          2.16.840.1.113730.3.1.481  cis
-
-
-objectclass nsBrowserSecurity
-	oid 2.16.840.1.113730.3.2.79
-    superior top 
-    allows 
-	nsBSAskForPassword,
-	nsBSPasswordLifetime,
-	nsBSWarnEnteringSecure,
-	nsBSWarnLeavingSecure,
-	nsBSWarnViewingMixed,
-	nsBSWarnSubmitInsecure,
-	nsBSEnableSsl2,
-	nsBSEnableSsl3,
-	nsBSCertmgmtDisableFunctionMsg,
-	nsBSSsl2Rc4128,
-	nsBSSsl2Rc2128,
-	nsBSSsl2DesEd3192,
-	nsBSSsl2Des64,
-	nsBSSsl2Rc440,
-	nsBSSsl2Rc240,
-	nsBSSsl3RsaRc4128Md5,
-	nsBSSsl3FipsDesEd3Sha,
-	nsBSSsl3RsaRc4128Md5,
-	nsBSSsl3RsaFipsDesSha,
-	nsBSSsl3RsaDesSha,
-	nsBSSsl3RsaRc440Md5,
-	nsBSSsl3RsaRc240Md5,
-	nsBSSsl3RsaNullMd5,
-	nsBSSsl3FortezzaFortezzaSha,
-	nsBSSsl3FortezzaRc4Sha
-
diff --git a/ldap/cm/v4confs/411/ns-mcd-config-schema.conf b/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
deleted file mode 100644
index 2eeb6856..00000000
--- a/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# 
-# ns-mcd-config-schema.conf
-# 
-# Netscape Mission Control Desktop schema
-# This schema is used to set MCD "config()" preferences.
-#
-
-attribute nsMcdUserAgent                 2.16.840.1.113730.3.1.482  cis
-attribute nsMcdUseXSender                2.16.840.1.113730.3.1.483  cis
-attribute nsMcdToolbarLogoUrl            2.16.840.1.113730.3.1.484  cis
-attribute nsMcdToolbarLogoWinSmallFile   2.16.840.1.113730.3.1.485  cis
-attribute nsMcdToolbarLogoWinLargeFile   2.16.840.1.113730.3.1.486  cis
-attribute nsMcdToolbarLogoFrames         2.16.840.1.113730.3.1.487  cis
-attribute nsMcdMacAnimationFile          2.16.840.1.113730.3.1.488  cis
-attribute nsMcdXAnimationFile            2.16.840.1.113730.3.1.489  cis
-attribute nsMcdNetSearchUrl              2.16.840.1.113730.3.1.490  cis
-attribute nsMcdMoreInfoPluginUrl         2.16.840.1.113730.3.1.491  cis
-attribute nsMcdAutoAdminConfigUrl        2.16.840.1.113730.3.1.492  cis
-attribute nsMcdAutoAdminAppendEmail      2.16.840.1.113730.3.1.493  cis
-attribute nsMcdAutoAdminRefreshInterval  2.16.840.1.113730.3.1.494  cis
-attribute nsMcdUseGuideButton            2.16.840.1.113730.3.1.495  cis
-attribute nsMcdGuideButtonProperties     2.16.840.1.113730.3.1.496  cis
-attribute nsMcdGuideMenuProperties       2.16.840.1.113730.3.1.497  cis
-attribute nsMcdHelpMenuProperties        2.16.840.1.113730.3.1.498  cis
-
-
-objectclass nsMcdConfig
-	oid 2.16.840.1.113730.3.2.80
-    superior top 
-    allows 
-	nsMcdUserAgent,
-	nsMcdUseXSender,
-	nsMcdToolbarLogoUrl,
-	nsMcdToolbarLogoWinSmallFile,
-	nsMcdToolbarLogoWinLargeFile,
-	nsMcdToolbarLogoFrames,
-	nsMcdMacAnimationFile,
-	nsMcdXAnimationFile,
-	nsMcdNetSearchUrl,
-	nsMcdMoreInfoPluginUrl,
-	nsMcdAutoAdminConfigUrl,
-	nsMcdAutoAdminAppendEmail,
-	nsMcdAutoAdminRefreshInterval,
-	nsMcdUseGuideButton,
-	nsMcdGuideButtonProperties,
-	nsMcdGuideMenuProperties,
-	nsMcdHelpMenuProperties
-	
diff --git a/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
deleted file mode 100644
index 290c9062..00000000
--- a/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Index required by Mission Control Desktop: Location Independence
-index nsLIProfileName eq
diff --git a/ldap/cm/v4confs/411/ns-mcd-li-schema.conf b/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
deleted file mode 100644
index 82034846..00000000
--- a/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# ns-mcd-li-schema.conf
-#
-# Netscape Mission Control Desktop Location Independence schema
-#
-
-attribute nsLIPtrURL           2.16.840.1.113730.3.1.399        ces           
-attribute nsLIPrefs            2.16.840.1.113730.3.1.400        ces 
-attribute nsLIProfileName      2.16.840.1.113730.3.1.401        cis         
-attribute nsLIData             2.16.840.1.113730.3.1.402        bin 
-attribute nsLIElementType      2.16.840.1.113730.3.1.403        cis        
-attribute nsLIServerType       2.16.840.1.113730.3.1.404        cis
-attribute nsLIVersion          2.16.840.1.113730.3.1.405        int
-
-objectclass nsLIPtr
-	oid 2.16.840.1.113730.3.2.74
-	requires
-		objectclass
-	allows
-		nsliptrurl,
-		owner
-
-objectclass nsLIProfile
-	oid  2.16.840.1.113730.3.2.75
-	requires
-		objectclass,
-		nsliprofilename
-	allows
-		nsliprefs,
-		uid,
-		owner
-
-objectclass nsLIProfileElement
-	oid  2.16.840.1.113730.3.2.76
-	requires
-		objectclass,
-		nslielementtype
-	allows
-		owner,
-		nslidata,
-		nsliversion
-
-objectclass nsLIServer
-	oid  2.16.840.1.113730.3.2.77
-	requires
-		objectclass,
-		serverhostname
-	allows
-		description,
-		cn,
-		nsserverport,
-		nsliservertype,
-		serverroot
diff --git a/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
deleted file mode 100644
index b232563f..00000000
--- a/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
+++ /dev/null
@@ -1,251 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# 
-# ns-mcd-mail-schema.conf
-# 
-# Netscape Mission Control Desktop mail client schema
-# This schema is used to hold mail client preferences.
-#
-
-attribute nsMCHTMLCompose								2.16.840.1.113730.3.1.331		 cis
-attribute nsMCDefaultHTMLAction							2.16.840.1.113730.3.1.332		 cis
-attribute nsMCRequestReturnReceipt						2.16.840.1.113730.3.1.333		 cis
-attribute nsMCIncorporateReturnReceipt					2.16.840.1.113730.3.1.334		 cis
-attribute nsMCMDNReportEnabled							2.16.840.1.113730.3.1.335		 cis
-attribute nsMCMDNReportNotInToCC						2.16.840.1.113730.3.1.336		 cis
-attribute nsMCMDNReportOutsideDomain					2.16.840.1.113730.3.1.337		 cis
-attribute nsMCMDNReportOther							2.16.840.1.113730.3.1.338		 cis
-attribute nsMCForwardMessageMode						2.16.840.1.113730.3.1.339		 cis
-attribute nsMCAutoQuote									2.16.840.1.113730.3.1.340		 cis
-attribute nsMCReplyOnTop								2.16.840.1.113730.3.1.341		 cis
-attribute nsMCSpellCheckBeforeSend						2.16.840.1.113730.3.1.342		 cis
-attribute nsMCWrapLongLines								2.16.840.1.113730.3.1.343		 cis
-attribute nsMCWrapLength								2.16.840.1.113730.3.1.344		 cis
-attribute nsMCStrictlyMime								2.16.840.1.113730.3.1.345		 cis
-attribute nsMCAutoCompleteUseAddressBooks				2.16.840.1.113730.3.1.346		 cis
-attribute nsMCAutoCompleteUseDirectory					2.16.840.1.113730.3.1.347		 cis
-attribute nsMCAutoCompleteEnabledServerName				2.16.840.1.113730.3.1.348		 cis
-attribute nsMCAutoCompleteShowDlgForMultipleMatches     2.16.840.1.113730.3.1.349		 cis
-attribute nsMCSkipDirectoryIfLocalMatchFound			2.16.840.1.113730.3.1.350		 cis
-attribute nsMCAddrBookLastnameFirst						2.16.840.1.113730.3.1.351		 cis
-attribute nsMCLimitMessageSize							2.16.840.1.113730.3.1.352		 cis
-attribute nsMCMaxMessageSize							2.16.840.1.113730.3.1.353		 cis
-attribute nsMCPromptPurgeThreshold     	      	      	2.16.840.1.113730.3.1.354		 cis
-attribute nsMCPurgeThreshold							2.16.840.1.113730.3.1.355		 cis
-attribute nsMCNewsKeepMethod							2.16.840.1.113730.3.1.356		 cis
-attribute nsMCNewsKeepDays								2.16.840.1.113730.3.1.357		 cis
-attribute nsMCNewsKeepCount								2.16.840.1.113730.3.1.358		 cis
-attribute nsMCNewsKeepOnlyUnread						2.16.840.1.113730.3.1.359		 cis
-attribute nsMCNewsRemoveBodiesByAge						2.16.840.1.113730.3.1.360		 cis
-attribute nsMCNewsRemoveBodiesDays						2.16.840.1.113730.3.1.361		 cis
-attribute nsMCSmtpServer								2.16.840.1.113730.3.1.362		 cis
-attribute nsMCSmtpUserName								2.16.840.1.113730.3.1.363		 cis
-attribute nsMCSmtpUseSSL								2.16.840.1.113730.3.1.364		 cis
-attribute nsMCImapServer								2.16.840.1.113730.3.1.365		 cis
-attribute nsMCImapServerProperties						2.16.840.1.113730.3.1.366		 cis
-attribute nsMCPopServer									2.16.840.1.113730.3.1.367		 cis
-attribute nsMCPopServerProperties						2.16.840.1.113730.3.1.368		 cis
-attribute nsMCLdapServer								2.16.840.1.113730.3.1.369		 cis
-attribute nsMCLdapServerProperties						2.16.840.1.113730.3.1.370		 cis
-attribute nsMCQuotedStyle								2.16.840.1.113730.3.1.371		 cis
-attribute nsMCQuotedSize								2.16.840.1.113730.3.1.372		 cis
-attribute nsMCCitationColor								2.16.840.1.113730.3.1.373		 cis
-attribute nsMCFixedWidthMessages						2.16.840.1.113730.3.1.374		 cis
-attribute nsMCPlaySound									2.16.840.1.113730.3.1.375		 cis
-attribute nsMCRememberSelectedMessage					2.16.840.1.113730.3.1.376		 cis
-attribute nsMCReuseMessageWindow						2.16.840.1.113730.3.1.377		 cis
-attribute nsMCConfirmMoveFoldersToTrash					2.16.840.1.113730.3.1.378		 cis
-attribute nsMCUseMapiServer								2.16.840.1.113730.3.1.379		 cis
-attribute nsMCNewsTimeout								2.16.840.1.113730.3.1.380		 cis
-attribute nsMCNavCrossesFolders							2.16.840.1.113730.3.1.381		 cis
-attribute nsMCSearchServer								2.16.840.1.113730.3.1.382		 cis
-attribute nsMCSearchSubFolders							2.16.840.1.113730.3.1.383		 cis
-attribute nsMCEncryptOutgoingMail						2.16.840.1.113730.3.1.384		 cis
-attribute nsMCCryptoSignOutgoingMail					2.16.840.1.113730.3.1.385		 cis
-attribute nsMCCryptoSignOutgoingNews					2.16.840.1.113730.3.1.386		 cis
-attribute nsMCWarnForwardEncrypted						2.16.840.1.113730.3.1.387		 cis
-attribute nsMCWarnReplyUnencrypted						2.16.840.1.113730.3.1.388		 cis
-attribute nsMCAllowAtSignInUserName						2.16.840.1.113730.3.1.389		 cis
-attribute nsMCReceiptRequestHeaderType					2.16.840.1.113730.3.1.390		 cis
-attribute nsMCPop3GetsNewMail							2.16.840.1.113730.3.1.391		 cis
-attribute nsMCImapAutoSubscribeOnOpen					2.16.840.1.113730.3.1.392		 cis
-attribute nsMCImapMimePartsOnDemand						2.16.840.1.113730.3.1.393		 cis
-attribute nsMCImapMimePartsOnDemandThreshold			2.16.840.1.113730.3.1.394		 cis
-attribute nsMCUseAltMail								2.16.840.1.113730.3.1.395		 cis
-attribute nsMCAltMailDll								2.16.840.1.113730.3.1.396		 cis
-attribute nsMCUseAltMailForNews							2.16.840.1.113730.3.1.397		 cis
-attribute nsPrefMap		     					     	2.16.840.1.113730.3.1.398		 cis	 
-attribute nsMCAuthLogin			                        2.16.840.1.113730.3.1.499        cis
-attribute nsMNCNavCrossesFolders	                    2.16.840.1.113730.3.1.500        cis
-attribute nsMNCMessageInThreadWindow	                2.16.840.1.113730.3.1.501        cis
-attribute nsMCAllowAtSignInUserName	                    2.16.840.1.113730.3.1.502        cis
-attribute nsMCImapOnlineDraftSent	                    2.16.840.1.113730.3.1.503        cis
-attribute nsMCCustomHeaders		                        2.16.840.1.113730.3.1.504        cis
-attribute nsMCHtmlDomains		                        2.16.840.1.113730.3.1.505        cis
-attribute nsMNCForceAsciiSearch		                    2.16.840.1.113730.3.1.506        cis
-attribute nsMCAddrBookLdapDisabled	                    2.16.840.1.113730.3.1.507        cis
-attribute nsMNCReuseThreadWindow	                    2.16.840.1.113730.3.1.508        cis
-attribute nsMCShowHeaders		                        2.16.840.1.113730.3.1.509        cis
-attribute nsMCIdentityDefaultdomain	                    2.16.840.1.113730.3.1.510       cis
-
-
-
-
-objectclass nsMailClient
-	oid 2.16.840.1.113730.3.2.72 
-    superior top 
-    allows 
-	 nsMCHTMLCompose, 
-	 nsMCDefaultHTMLAction, 
-	 nsMCRequestReturnReceipt, 
-	 nsMCIncorporateReturnReceipt, 
-	 nsMCMDNReportEnabled, 
-	 nsMCMDNReportNotInToCC, 
-	 nsMCMDNReportOutsideDomain, 
-	 nsMCMDNReportOther, 
-	 nsMCForwardMessageMode, 
-	 nsMCAutoQuote, 
-	 nsMCReplyOnTop,
-  	 nsMCSpellCheckBeforeSend,
-	 nsMCWrapLongLines, 
-	 nsMCWrapLength, 
-	 nsMCStrictlyMime,
-	 nsMCAutoCompleteUseAddressBooks,
-	 nsMCAutoCompleteUseDirectory,
-	 nsMCAutoCompleteEnabledServerName,
-	 nsMCAutoCompleteShowDlgForMultipleMatches,
-	 nsMCSkipDirectoryIfLocalMatchFound,
-	 nsMCAddrBookLastnameFirst,
-	 nsMCLimitMessageSize,
-	 nsMCMaxMessageSize,
-	 nsMCPromptPurgeThreshold,
-	 nsMCPurgeThreshold,
-	 nsMCNewsKeepMethod,
-	 nsMCNewsKeepDays,
-	 nsMCNewsKeepCount,
-	 nsMCNewsKeepOnlyUnread,
-	 nsMCNewsRemoveBodiesByAge,
-	 nsMCNewsRemoveBodiesDays,
-	 nsMCSmtpServer,
-	 nsMCSmtpUserName,
-	 nsMCSmtpUseSSL,
-	 nsMCImapServer,
-	 nsMCImapServerProperties,
-	 nsMCPopServer,
-	 nsMCPopServerProperties, 
-	 nsMCLdapServer,
-	 nsMCLdapServerProperties,
-	 nsMCQuotedStyle,
-	 nsMCQuotedSize,
-	 nsMCCitationColor,
-	 nsMCFixedWidthMessages,
-	 nsMCPlaySound,
-	 nsMCRememberSelectedMessage,
-	 nsMCReuseMessageWindow,
-	 nsMCConfirmMoveFoldersToTrash,
-	 nsMCUseMapiServer,
-	 nsMCNewsTimeout,
-	 nsMCNavCrossesFolders,
-	 nsMCSearchServer,
-	 nsMCSearchSubFolders,
- 	 nsMCEncryptOutgoingMail,
-	 nsMCCryptoSignOutgoingMail,
-	 nsMCCryptoSignOutgoingNews,
-	 nsMCWarnForwardEncrypted,
-	 nsMCWarnReplyUnencrypted,
-	 nsMCAllowAtSignInUserName,
-	 nsMCReceiptRequestHeaderType,
-	 nsMCPop3GetsNewMail,
-	 nsMCImapAutoSubscribeOnOpen,
-	 nsMCImapMimePartsOnDemand,
-	 nsMCImapMimePartsOnDemandThreshold,
-	 nsMCUseAltMail,
-	 nsMCAltMailDll,
-	 nsMCUseAltMailForNews,
-	 nsMCAuthLogin,
-	 nsMNCNavCrossesFolders,
-	 nsMNCMessageInThreadWindow,
-	 nsMCAllowAtSignInUserName,
-	 nsMCImapOnlineDraftSent,
-	 nsMCCustomHeaders,
-	 nsMCHtmlDomains,
-	 nsMNCForceAsciiSearch,
-	 nsMCAddrBookLdapDisabled,
-	 nsMNCReuseThreadWindow,
-	 nsMCShowHeaders,
-	 nsMCIdentityDefaultdomain
-	 
-
-# 
-# Netscape Mission Control Desktop Messenger security schema
-# This schema is used to hold Messenger security preferences.
-#
-
-attribute nsMSEncryptOutgoingMail		2.16.840.1.113730.3.1.511 cis
-attribute nsMSSignOutgoingMail			2.16.840.1.113730.3.1.512 cis
-attribute nsMSSignOutgoingNews			2.16.840.1.113730.3.1.513 cis
-attribute nsMSSmimeDesEde3			    2.16.840.1.113730.3.1.514 cis
-attribute nsMSSmimeRc2128			    2.16.840.1.113730.3.1.515 cis
-attribute nsMSSmimeDes				    2.16.840.1.113730.3.1.516 cis
-attribute nsMSSmimeRc264			    2.16.840.1.113730.3.1.517 cis
-attribute nsMSSmimeRc240			    2.16.840.1.113730.3.1.518 cis
-attribute nsMSSmimeFortezza			    2.16.840.1.113730.3.1.519 cis
-
-objectclass nsMailSecurity
-	oid  2.16.840.1.113730.3.2.81
-    superior top 
-    allows 
-	nsMSEncryptOutgoingMail,
-	nsMSSignOutgoingMail,
-	nsMSSignOutgoingNews,
-	nsMSSmimeDesEde3,
-	nsMSSmimeRc2128,
-	nsMSSmimeDes,
-	nsMSSmimeRc264,
-	nsMSSmimeRc240,
-	nsMSSmimeFortezza
-
-objectclass netscapePreferenceMap 
-    oid 2.16.840.1.113730.3.2.73
-    superior top 
-	allows
-	  	nsPrefMap,
-		uid
-
diff --git a/ldap/cm/v4confs/411/ns-media-globopt.conf b/ldap/cm/v4confs/411/ns-media-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/411/ns-media-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/411/ns-media-schema.conf b/ldap/cm/v4confs/411/ns-media-schema.conf
deleted file mode 100644
index 01b2cf95..00000000
--- a/ldap/cm/v4confs/411/ns-media-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeMediaServer
-		oid 2.16.840.1.113730.3.2.25
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v4confs/411/ns-mlm-schema.conf b/ldap/cm/v4confs/411/ns-mlm-schema.conf
deleted file mode 100644
index bb604b03..00000000
--- a/ldap/cm/v4confs/411/ns-mlm-schema.conf
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# LDAP object classes used by MLM
-#
-
-attribute	mgmemMemberOfGroup		cis
-attribute	mgmemRefDN			ces  single
-attribute	mgmemMailUserPassword		bin  single
-attribute	mgmemGroupMemberParam		ces
-attribute	mgmemGroupServerParam		ces
-
-attribute	mgmanJoinability		ces
-attribute	mgmanJoinLocalType		cis  single
-attribute	mgmanMemberVisibility		ces
-attribute	mgmanIntroText			ces  single
-attribute	mgmanGroupStat			ces
-attribute	mgmanHidden			cis  single
-attribute	mgmanGroupKey			cis  single
-attribute	mgmanAllowSubscribe		cis
-attribute	mgmanDenySubscribe		cis
-
-attribute	mgmanGConfNewGroupParent	dn   single
-attribute	mgmanGConfRemoteUserParent	dn   single
-attribute	mgmanGConfSearchBase		dn   single
-attribute	mgmanGConfGroupCreationUser	dn
-attribute	mgmanGConfSearchGroupUser	dn
-attribute	mgmanGConfAdmin			dn
-attribute	mgmanGConfGroupTemplate		dn   single
-attribute	mgmanGConfDefaultInheritance	cis
-attribute	mgmanGConfKey			cis
-attribute	mgmanGConfSearchAttribute	cis
-attribute	mgmanGConfSearchRelationship	cis
-attribute	mgmanGConfSearchTreeNode	cis
-attribute	mgmanGConfSortAttributeDirMembers	cis
-attribute	mgmanGConfSortAttributeGroupMembers	cis
-attribute	mgmanGConfGroupDomains		dn
-
-
-objectClass mailGroupMember
-	requires
-		objectClass,
-		mail
-	allows
-		mgmemMemberOfGroup,
-		mgmemRefDN,
-		preferredLanguage,
-		userCertificate,
-		mgmemMailUserPassword,
-		mgmemGroupMemberParam,
-		mgmemGroupServerParam,
-		c,
-		cn,
-		sn,
-		givenName
-
-
-objectClass mailGroupManagement
-	requires
-		objectClass
-	allows
-		description,
-		labeledURL,
-		mgmanAllowSubscribe,
-		mgmanDenySubscribe,
-		mgmanGroupKey,
-		mgmanGroupStat,
-		mgmanHidden,
-		mgmanIntroText,
-		mgmanJoinability,
-		mgmanJoinLocalType,
-		mgmanMemberVisibility,
-		multilineDescription,
-		userCertificate,
-		userPassword
-
-objectClass mailGroupManagement_GlobalConfig
-	requires
-		objectClass
-	allows
-		cn,
-		mgmanGConfAdmin,
-		mgmanGConfDefaultInheritance,
-		mgmanGConfGroupCreationUser,
-		mgmanGConfGroupDomains,
-		mgmanGConfGroupTemplate,
-		mgmanGConfKey,
-		mgmanGConfNewGroupParent,
-		mgmanGConfRemoteUserParent,
-		mgmanGConfSearchAttribute,
-		mgmanGConfSearchBase,
-		mgmanGConfSearchGroupUser,
-		mgmanGConfSearchRelationship,
-		mgmanGConfSearchTreeNode,
-		mgmanGConfSortAttributeDirMembers,
-		mgmanGConfSortAttributeGroupMembers
-
diff --git a/ldap/cm/v4confs/411/ns-msg-schema.conf b/ldap/cm/v4confs/411/ns-msg-schema.conf
deleted file mode 100644
index 25712bf7..00000000
--- a/ldap/cm/v4confs/411/ns-msg-schema.conf
+++ /dev/null
@@ -1,743 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#used by Netscape Messaging Server 4.0
-#
-#
-attribute	nsmsgaccounturl	cis
-attribute	nsmsgadddeliveredto	cis
-attribute	nsmsgaddheaders	cis
-attribute	nsmsgadmins	cis
-attribute	nsmsgalias		cis
-attribute	nsmsgallowadminproxy	cis
-attribute	nsmsgallowanonymouslogin	cis
-attribute	nsmsgallowbarelf	cis
-attribute	nsmsgallowbdat	cis
-attribute	nsmsgallowehlo	cis
-attribute	nsmsgallowetrn	cis
-attribute	nsmsgallowexpn	cis
-attribute	nsmsgallowhelp	cis
-attribute	nsmsgallowonex	cis
-attribute	nsmsgallowsize	cis
-attribute	nsmsgallowverb	cis
-attribute	nsmsgallowvrfy	cis
-attribute	nsmsgaltqueues	cis
-attribute	nsmsgalwaysqueue	cis
-attribute	nsmsgauthcachesize	cis
-attribute	nsmsgauthcachettl	cis
-attribute	nsmsgauthmaildomain	cis
-attribute	nsmsgbanner	cis
-attribute	nsmsgbinarypath	cis
-attribute	nsmsgbuffersize	cis
-attribute	nsmsgcheckdeferredqueue	cis
-attribute	nsmsgcleanupage		cis
-attribute	nsmsgclearcontrolinterval	cis
-attribute	nsmsgclearcontrolsafetime	cis
-attribute	nsmsgcollectiondeltatime	cis
-attribute	nsmsgconfigversion		cis
-attribute	nsmsgcontact		cis
-attribute	nsmsgcounterdeltatime	cis
-attribute	nsmsgdbcachesize	cis
-attribute	nsmsgdbtmpdir	cis
-attribute	nsmsgdefaultacl	cis
-attribute	nsmsgdefaultdomain	cis
-attribute	nsmsgdefaultecho	cis
-attribute	nsmsgdefaultgid	cis
-attribute	nsmsgdefaultmailboxquota	cis
-attribute	nsmsgdefaultoverquota	cis
-attribute	nsmsgdefaultpartition	cis
-attribute	nsmsgdefaultreply	cis
-attribute	nsmsgdefaultuid	cis
-attribute	nsmsgdefaultvacation	cis
-attribute	nsmsgdeferredperiod	cis
-attribute	nsmsgdeleteheaders	cis
-attribute	nsmsgdescription		cis
-attribute	nsmsgdiskflushinterval		cis
-attribute	nsmsgdnsresolveclient	cis
-attribute	nsmsgdocanonicalize	cis
-attribute	nsmsgdoclientdnslookup	cis
-attribute	nsmsgdodsn	cis
-attribute	nsmsgdoetrn	cis
-attribute	nsmsgdomainallowed	cis
-attribute	nsmsgdomainlangtable	cis
-attribute	nsmsgdomainname	cis
-attribute	nsmsgdomainnotallowed	cis
-attribute	nsmsgdomainsecurity	cis
-attribute	nsmsgdorewritefromusingauth	cis
-attribute	nsmsgdorewritesenderusingauth	cis
-attribute	nsmsgenable		cis
-attribute	nsmsgenablesslport	cis
-attribute	nsmsgenveloperewritemethod	cis
-attribute	nsmsgexclusive	cis
-attribute	nsmsgexpirestart	cis
-attribute	nsmsgexpirytime	cis
-attribute	nsmsgexternalmxserverip	cis
-attribute	nsmsgfallbacksearchmethod	cis
-attribute	nsmsgfilemode	cis
-attribute	nsmsgfilterurl	cis
-attribute	nsmsgflushinterval	cis
-attribute	nsmsgfolderpattern	cis
-attribute	nsmsgfoldersizebytes	cis
-attribute	nsmsgfolderurl	cis
-attribute	nsmsgforeignpercentaddr	cis
-attribute	nsmsgformsigkey	cis
-attribute	nsmsghidehostname	cis
-attribute	nsmsghopcountexceedactions	cis
-attribute	nsmsghostoncommandline	cis
-attribute	nsmsghostrewrites	cis
-attribute	nsmsgidletimeout	cis
-attribute	nsmsgipsecurity	cis
-attribute	nsmsginstalledlanguages	cis
-attribute	nsmsginternalmxserverip	cis
-attribute	nsmsgldapmemcache	cis
-attribute	nsmsgldapmemcachesize	cis
-attribute	nsmsgldapmemcachettl	cis
-attribute	nsmsgldappoolsize	cis
-attribute	nsmsgldaputilconfig	cis
-attribute	nsmsglistenaddr	cis
-attribute	nsmsglistenq	cis
-attribute	nsmsglisturl	cis
-attribute	nsmsglocaldefaultmaxruncount	cis
-attribute	nsmsglocaldefaultminruncount	cis
-attribute	nsmsglocalmaildomains	cis
-attribute	nsmsglocation		cis
-attribute	nsmsglog	cis
-attribute	nsmsglogdir	cis
-attribute	nsmsgloglevel	cis
-attribute	nsmsglogtype		cis
-attribute	nsmsgmaildeliveryprogram	cis
-attribute	nsmsgmasterhost	cis
-attribute	nsmsgmasterport	cis
-attribute	nsmsgmaxbadcommands	cis
-attribute	nsmsgmaxbranches	cis
-attribute	nsmsgmaxcontrolrecipients cis
-attribute	nsmsgmaxcputime	cis
-attribute	nsmsgmaxerrorobjectsize	cis
-attribute	nsmsgmaxheaderlines	cis
-attribute	nsmsgmaxlogfiles	cis
-attribute	nsmsgmaxlogfilesize	cis
-attribute	nsmsgmaxlogsize	cis
-attribute	nsmsgmaxmessagesize	cis
-attribute	nsmsgmaxmtahops	cis
-attribute	nsmsgmaxpostsize	cis
-attribute	nsmsgmaxqueuetime	cis
-attribute	nsmsgmaxruncount	cis
-attribute	nsmsgmaxruncountdeferred	cis
-attribute	nsmsgmaxscriptsize	cis
-attribute	nsmsgmaxsessions	cis
-attribute	nsmsgmaxstateobjectsize	cis
-attribute	nsmsgmaxthreads	cis
-attribute	nsmsgmessagecount	cis
-attribute	nsmsgmessagedays	cis
-attribute	nsmsgmessagehostname	cis
-attribute	nsmsgmessagesize	cis
-attribute	nsmsgmessagesizedays	cis
-attribute	nsmsgminfreediskspace	cis
-attribute	nsmsgminruncount	cis
-attribute	nsmsgmsgalarmdescription	cis
-attribute	nsmsgmsgalarmnoticehost	cis
-attribute	nsmsgmsgalarmnoticeport	cis
-attribute	nsmsgmsgalarmnoticercpt	cis
-attribute	nsmsgmsgalarmnoticesender	cis
-attribute	nsmsgmsgalarmnoticetemplate	cis
-attribute	nsmsgmsgalarmstatinterval	cis
-attribute	nsmsgmsgalarmthreshold	cis
-attribute	nsmsgmsgalarmthresholddirection	cis
-attribute	nsmsgmsgalarmwarninginterval	cis
-attribute	nsmsgmtaid		cis
-attribute	nsmsgmtaname		cis
-attribute	nsmsgneedsender	cis
-attribute	nsmsgnegativehostattr	cis
-attribute	nsmsgnestedgroups	cis
-attribute	nsmsgnetworkdefaultmaxruncount	cis
-attribute	nsmsgnetworkdefaultminruncount	cis
-attribute	nsmsgnewsprefix	cis
-attribute	nsmsgnewsspool	cis
-attribute	nsmsgnewuserforms	cis
-attribute	nsmsgntaccount	cis
-attribute	nsmsgntpassword	cis
-attribute	nsmsgntrunoptn	cis
-attribute	nsmsgnumdays	cis
-attribute	nsmsgnumenvelopequeuefiles	cis
-attribute	nsmsgnummessages	cis
-attribute	nsmsgnumprocesses	cis
-attribute	nsmsgorganization		cis
-attribute	nsmsgpartition	cis
-attribute	nsmsgpath	cis
-attribute	nsmsgplaintextloginpause	cis
-attribute	nsmsgplaintextmincipher	cis
-attribute	nsmsgpopminpoll	cis
-attribute	nsmsgport	cis
-attribute	nsmsgpositivehostattr	cis
-attribute	nsmsgprotocolubeconfig	cis
-attribute	nsmsgproxydomainallowed	cis
-attribute	nsmsgquotaexceededactions	cis
-attribute	nsmsgquotaexceededmsg	cis
-attribute	nsmsgquotaexceededmsginterval	cis
-attribute	nsmsgquotagraceperiod	cis
-attribute	nsmsgquotawarn	cis
-attribute	nsmsgreadtimeout	cis
-attribute	nsmsgrenotifyinterval	cis
-attribute	nsmsgrequirecrlf	cis
-attribute	nsmsgreserved0	cis
-attribute	nsmsgreserved1	cis
-attribute	nsmsgreserved2	cis
-attribute	nsmsgreserved3	cis
-attribute	nsmsgreserved4	cis
-attribute	nsmsgreserved5	cis
-attribute	nsmsgreserved6	cis
-attribute	nsmsgreserved7	cis
-attribute	nsmsgreserved8	cis
-attribute	nsmsgreserved9	cis
-attribute	nsmsgresourcetimeout	cis
-attribute	nsmsgrewritetocc	cis
-attribute	nsmsgrolloverdelta	cis
-attribute	nsmsgrolloversize	cis
-attribute	nsmsgrollovertime	cis
-attribute	nsmsgroutingattribute	cis
-attribute	nsmsgroutstripimapfolders	cis
-attribute	nsmsgsessiontimeout	cis
-attribute	nsmsgshellpath	cis
-attribute	nsmsgsitelanguage	cis
-attribute	nsmsgsmtphost	cis
-attribute	nsmsgsmtpport	cis
-attribute	nsmsgsmtprewritestyle	cis
-attribute	nsmsgsourceurl	cis
-attribute	nsmsgspooldir	cis
-attribute	nsmsgsslcachesize	cis
-attribute	nsmsgsslpasswdfile	cis
-attribute	nsmsgsslport		cis
-attribute	nmmsgsslsourceurl	cis
-attribute	nsmsgsslusessl	cis
-attribute	nsmsgsslusesslrelay	cis
-attribute	nsmsgstripcr	cis
-attribute	nsmsgsystemmaildir	cis
-attribute	nsmsgtimeoutcommand	cis
-attribute	nsmsgtimeoutdata	cis
-attribute	nsmsgtimeoutdatadot	cis
-attribute	nsmsgtimeoutdatasend	cis
-attribute	nsmsgtimeoutgreet	cis
-attribute	nsmsgtimeouthelo	cis
-attribute	nsmsgtimeoutmail	cis
-attribute	nsmsgtimeoutquit	cis
-attribute	nsmsgtimeoutrcpt	cis
-attribute	nsmsgtimeoutrset	cis
-attribute	nsmsgumask	cis
-attribute	nsmsgunknownacctsactions	cis
-attribute	nsmsgusemx	cis
-attribute	nsmsgverifyrcpts	cis
-attribute	nsmsgversion		cis
-
-objectclass netscapeMessagingServer
-	superior top
-	requires
-		cn,
-		nsServerID
-	allows
-		description
-
-objectclass nsmsgcfgcontainer
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfggen
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgaccounturl,
-		nsmsgconfigversion,
-		nsmsgfilterurl,
-		nsmsgfolderurl,
-		nsmsginstalledlanguages,
-		nsmsglisturl,
-		nsmsgnewuserforms,
-		nsmsgsitelanguage
-		
-objectclass nsmsgcfgsnmp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgcontact,
-		nsmsgcollectiondeltatime,
-		nsmsgdescription,
-		nsmsgenable,
-		nsmsglocation,
-		nsmsgmtaid,
-		nsmsgmtaname,
-		nsmsgmasterhost,
-		nsmsgmasterport,
-		nsmsgorganization,
-		nsmsgversion
-		
-objectclass nsmsgcfgstore
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgadmins,
-		nsmsgcleanupage,
-		nsmsgdbcachesize,
-		nsmsgdbtmpdir,
-		nsmsgdefaultacl,
-		nsmsgdefaultmailboxquota,
-		nsmsgdefaultpartition,
-		nsmsgdiskflushinterval,
-		nsmsgexpirestart,
-		nsmsgquotaexceededmsg,
-		nsmsgquotaexceededmsginterval,
-		nsmsgquotagraceperiod,
-		nsmsgquotawarn,
-		nsmsgumask
-
-objectclass nsmsgcfgexpirerule
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgfolderpattern,
-		nsmsgexclusive,
-		nsmsgfoldersizebytes,
-		nsmsgmessagecount,
-		nsmsgmessagedays,
-		nsmsgmessagesize,
-		nsmsgmessagesizedays
-
-objectclass nsmsgcfgpartition
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgpath
-
-objectclass nsmsgcfguser
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgpublic
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgalias
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgalias
-
-objectclass nsmsgcfglog
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgbuffersize,
-		nsmsgexpirytime,
-		nsmsgflushinterval,
-		nsmsglogdir,
-		nsmsgloglevel,
-		nsmsglogtype,
-		nsmsgmaxlogfiles,
-		nsmsgmaxlogfilesize,
-		nsmsgmaxlogsize,
-		nsmsgminfreediskspace,
-		nsmsgrollovertime
-
-objectclass nsmsgcfgservice
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgauthcachesize,
-		nsmsgauthcachettl,
-		nsmsgdnsresolveclient,
-		nsmsgldapmemcache,
-		nsmsgldapmemcachesize,
-		nsmsgldapmemcachettl,
-		nsmsglistenaddr,
-		nsmsgplaintextloginpause,
-		nsmsgreadtimeout,
-		nsmsgsslpasswdfile
-
-objectclass nsmsgcfgpop
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowanonymouslogin,
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgidletimeout,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgpopminpoll,
-		nsmsgport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgimap
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowanonymouslogin,
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgidletimeout,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgsslcachesize,
-		nsmsgsslport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfghttp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowadminproxy,
-		nsmsgallowanonymouslogin,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgdomainsecurity,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgidletimeout,
-		nsmsgipsecurity,
-		nsmsgmaxmessagesize,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgmaxpostsize,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgproxydomainallowed,
-		nsmsgresourcetimeout,
-		nsmsgsessiontimeout,
-		nsmsgsmtphost,
-		nsmsgsmtpport,
-		nsmsgsourceurl,
-		nsmsgspooldir,
-		nsmsgsslcachesize,
-		nsmsgsslport,
-		nsmsgsourceurl,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgnntp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgnewsprefix,
-		nsmsgnewsspool,
-		nsmsgpartition,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgsslport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgmta
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgaltqueues,
-		nsmsgauthmaildomain,
-		nsmsgbanner,
-		nsmsgclearcontrolinterval,
-		nsmsgclearcontrolsafetime,
-		nsmsgcounterdeltatime,
-		nsmsgdefaultdomain,
-		nsmsgdeferredperiod,
-		nsmsgdocanonicalize,
-		nsmsgdoclientdnslookup,
-		nsmsgdodsn,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgdomainname,
-		nsmsgdomainlangtable,
-		nsmsgenable,
-		nsmsgforeignpercentaddr,
-		nsmsgldappoolsize,
-		nsmsgldaputilconfig,
-		nsmsglocaldefaultmaxruncount,
-		nsmsglocaldefaultminruncount,
-		nsmsgmaxheaderlines,
-		nsmsgmaxqueuetime,
-		nsmsgmessagehostname,
-		nsmsgnetworkdefaultmaxruncount,
-		nsmsgnetworkdefaultminruncount,
-		nsmsgnumenvelopequeuefiles,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgprotocolubeconfig,
-		nsmsgreserved0,
-		nsmsgreserved1,
-		nsmsgreserved2,
-		nsmsgreserved3,
-		nsmsgreserved4,
-		nsmsgreserved5,
-		nsmsgreserved6,
-		nsmsgreserved7,
-		nsmsgreserved8,
-		nsmsgreserved9,
-		nsmsgrolloverdelta,
-		nsmsgrolloversize,
-		nsmsgroutstripimapfolders,
-		nsmsgsslusessl,
-		nsmsgsslusesslrelay
-
-objectclass nsmsgcfgmtalog
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsglog,
-		nsmsgminruncount,
-		nsmsgmaxruncount,
-		nsmsgmaxruncountdeferred
-
-objectclass nsmsgcfgmtaautoreplyhandler
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultecho,
-		nsmsgdefaultreply,
-		nsmsgdefaultvacation
-
-objectclass nsmsgcfgmtaerrorhandler
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgformsigkey,
-		nsmsghopcountexceedactions,
-		nsmsgquotaexceededactions,
-		nsmsgrenotifyinterval,
-		nsmsgunknownacctsactions
-
-objectclass nsmsgcfgmtamboxdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgmtaprogdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultgid,
-		nsmsgdefaultuid,
-		nsmsgshellpath,
-		nsmsgntrunoptn, 
-		nsmsgntaccount, 
-		nsmsgntpassword
-
-objectclass nsmsgcfgmtaaccept
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowbdat,
-		nsmsgallowehlo,
-		nsmsgallowetrn,
-		nsmsgallowexpn,
-		nsmsgallowhelp,
-		nsmsgallowonex,
-		nsmsgallowsize,
-		nsmsgallowverb,
-		nsmsgallowvrfy,
-		nsmsghidehostname,
-		nsmsgmaxbadcommands,
-		nsmsgmaxmessagesize,
-		nsmsgminfreediskspace,
-		nsmsgnegativehostattr,
-		nsmsgpositivehostattr,
-		nsmsgrequirecrlf,
-		nsmsgtimeoutcommand,
-		nsmsgtimeoutdata,
-		nsmsgverifyrcpts
-
-objectclass nsmsgcfgmtasmtpdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowbarelf,
-		nsmsgalwaysqueue,
-		nsmsgcheckdeferredqueue,
-		nsmsgdoetrn,
-		nsmsgexternalmxserverip,
-		nsmsginternalmxserverip,
-		nsmsgtimeoutdata,
-		nsmsgtimeoutdatadot,
-		nsmsgtimeoutdatasend,
-		nsmsgtimeoutgreet,
-		nsmsgtimeouthelo,
-		nsmsgtimeoutmail,
-		nsmsgtimeoutquit,
-		nsmsgtimeoutrcpt,
-		nsmsgtimeoutrset,
-		nsmsgusemx
-
-objectclass nsmsgcfgmtarouter
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgadddeliveredto,
-		nsmsgaddheaders,
-		nsmsgdeleteheaders,
-		nsmsgdorewritefromusingauth,
-		nsmsgdorewritesenderusingauth,
-		nsmsgenveloperewritemethod,
-		nsmsgfallbacksearchmethod,
-		nsmsghostrewrites,
-		nsmsglocalmaildomains,
-		nsmsgmaxcontrolrecipients,
-		nsmsgmaxmtahops,
-		nsmsgnestedgroups,
-		nsmsgrewritetocc,
-		nsmsgroutingattribute,
-		nsmsgsmtprewritestyle
-
-objectclass nsmsgcfgmtaunixdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultgid,
-		nsmsgdefaultuid,
-		nsmsgfilemode,
-		nsmsgmaildeliveryprogram,
-		nsmsgneedsender,
-		nsmsgstripcr,
-		nsmsgsystemmaildir
-
-objectclass nsmsgcfgreport
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgalarmcontainer
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgmsgalarmnoticehost,
-		nsmsgmsgalarmnoticeport,
-		nsmsgmsgalarmnoticercpt,
-		nsmsgmsgalarmnoticesender,
-		nsmsgmsgalarmnoticetemplate
-
-objectclass nsmsgcfgalarm
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgmsgalarmdescription,
-		nsmsgmsgalarmstatinterval,
-		nsmsgmsgalarmthreshold,
-		nsmsgmsgalarmthresholddirection,
-		nsmsgmsgalarmwarninginterval
-
-objectclass nsmsgcfgscript
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgenable,
-		nsmsgbinarypath,
-		nsmsgloglevel,
-		nsmsgmaxscriptsize,
-		nsmsgmaxbranches,
-		nsmsgmaxcputime,
-		nsmsgmaxerrorobjectsize,
-		nsmsgmaxstateobjectsize
diff --git a/ldap/cm/v4confs/411/ns-netshare-schema.conf b/ldap/cm/v4confs/411/ns-netshare-schema.conf
deleted file mode 100644
index 8a03e929..00000000
--- a/ldap/cm/v4confs/411/ns-netshare-schema.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Enterprise Server
-attribute       netshareHomeURL            ces  single
-attribute       netshareServerType         cis  single
-attribute       netshareHomeTheme          cis  single
-attribute       netsharePrivate            cis  single
-attribute       netshareMemberOf           dn
-attribute       netshareUIConfig           bin  single
- 
-# added to either users or groups/projects to enable
-# as netshare user accounts or netshare projects
-objectclass netshareAccount
-       requires
-                objectclass,
-                netshareHomeURL
-       allows
-                netshareServerType,
-                netshareHomeTheme,
-                netsharePrivate,
-                netshareMemberOf,
-                netshareUIConfig
- 
-
-attribute       netsharePMNewProjParent            dn   single
-attribute       netsharePMSearchBase               dn   single
-attribute       netsharePMProjCreationUser         dn   single
-attribute       netsharePMAdmin                    dn
- 
-# this is for the netshare project management utility/CGI 
-# that is created under the SIE; this parallels the messaging
-# MLM schema somewhat to enable end-user maintenance/creation 
-# of netshare projects
-objectclass netshareProjectManagementGlobalConfig
-        requires
-                objectclass
-        allows
-                netsharePMNewProjParent,
-                netsharePMSearchBase,
-                netsharePMProjCreationUser,
-                netsharePMAdmin,
-                cn
diff --git a/ldap/cm/v4confs/411/ns-news-globopt.conf b/ldap/cm/v4confs/411/ns-news-globopt.conf
deleted file mode 100644
index 6f7b2f3b..00000000
--- a/ldap/cm/v4confs/411/ns-news-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape News Server
-#index	uniquemember,member	eq
-
diff --git a/ldap/cm/v4confs/411/ns-news-schema.conf b/ldap/cm/v4confs/411/ns-news-schema.conf
deleted file mode 100644
index 9d15c19e..00000000
--- a/ldap/cm/v4confs/411/ns-news-schema.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsnewsACL                   2.16.840.1.113730.3.1.191  cis     
-attribute nsaclrole                   2.16.840.1.113730.3.1.192  cis     
-attribute nsprettyname                2.16.840.1.113730.3.1.193  cis     
-attribute nsflags                     2.16.840.1.113730.3.1.194  cis     
-attribute nscreator                   2.16.840.1.113730.3.1.195  cis     
-attribute ngcomponent                 2.16.840.1.113730.3.1.196  dn      
-
-objectclass nginfo 
-	oid  2.16.840.1.113730.3.2.26
-	requires 
-		objectClass, 
-		ngcomponent 
-	allows 
-		nsnewsACL,  
-		subtreeACI, 
-		description,  
-		nsaclrole,  
-		nsprettyname, 
-		nsflags, 
-		nscreator 
-
-objectClass	netscapeNewsServer
-	oid 2.16.840.1.113730.3.2.27
-	requires
-		objectClass
-
diff --git a/ldap/cm/v4confs/411/ns-proxy-globopt.conf b/ldap/cm/v4confs/411/ns-proxy-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/411/ns-proxy-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/411/ns-proxy-schema.conf b/ldap/cm/v4confs/411/ns-proxy-schema.conf
deleted file mode 100644
index 3151c9c7..00000000
--- a/ldap/cm/v4confs/411/ns-proxy-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeProxyServer
-		oid 2.16.840.1.113730.3.2.28
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v4confs/411/ns-value-schema.conf b/ldap/cm/v4confs/411/ns-value-schema.conf
deleted file mode 100644
index a7ee4f3b..00000000
--- a/ldap/cm/v4confs/411/ns-value-schema.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Schema for defining schemaless config for LDAP 
-# 
-
-attribute nsValueCIS          2.16.840.1.113730.3.1.243 cis
-attribute nsValueCES          2.16.840.1.113730.3.1.244 ces
-attribute nsValueTel          2.16.840.1.113730.3.1.245 tel
-attribute nsValueInt          2.16.840.1.113730.3.1.246 int
-attribute nsValueBin          2.16.840.1.113730.3.1.247 bin
-attribute nsValueDN           2.16.840.1.113730.3.1.248 dn
-attribute nsValueType         2.16.840.1.113730.3.1.249 cis
-attribute nsValueDefault      2.16.840.1.113730.3.1.250 cis
-attribute nsValueFlags        2.16.840.1.113730.3.1.251 cis
-attribute nsValueDescription  2.16.840.1.113730.3.1.252 cis
-attribute nsValueSyntax       2.16.840.1.113730.3.1.253 cis
-attribute nsValueHelpURL      2.16.840.1.113730.3.1.254 ces
-
-objectClass nsValueItem
-    oid 2.16.840.1.113730.3.2.45
-    requires
-        objectClass,
-        cn
-    allows
-        nsValueCIS,
-        nsValueCES,
-        nsValueTel,
-        nsValueInt,
-        nsValueBin,
-        nsValueDN,
-        nsValueType,
-        nsValueSyntax,
-        nsValueDescription,
-        nsValueHelpURL,
-        nsValueFlags,
-        nsValueDefault 
-
diff --git a/ldap/cm/v4confs/411/ns-wcal-globopt.conf b/ldap/cm/v4confs/411/ns-wcal-globopt.conf
deleted file mode 100644
index 9d8ad189..00000000
--- a/ldap/cm/v4confs/411/ns-wcal-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#used by Netscape Calendar Hosting Server 1.0
-
-index nswcalCALID pres,eq
diff --git a/ldap/cm/v4confs/411/ns-wcal-schema.conf b/ldap/cm/v4confs/411/ns-wcal-schema.conf
deleted file mode 100644
index 3d4f85d5..00000000
--- a/ldap/cm/v4confs/411/ns-wcal-schema.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Calendar Hosting Server
-
-# Login calendar URI for this user
-attribute nswcalCALID			2.16.840.1.113730.3.1.537 cis single
-
-# Calendar client specific user preferences for this user
-attribute nswcalExtendedUserPrefs	2.16.840.1.113730.3.1.538 cis
-
-# Lists calendar protocols not allowed to be used by this user
-attribute nswcalDisallowAccess	2.16.840.1.113730.3.1.539 cis single
-
-# Calendar host for this user's login calendar
-attribute nswcalHost			2.16.840.1.113730.3.1.540 cis
-
-# Quota associated with this user's calendars
-attribute nswcalQuota			2.16.840.1.113730.3.1.541 cis single
-
-# Used to designate a LDAP entry as representing a Netscape Calendar
-# Hosting Server user account. These first 10 attributes are
-# referenced by Netscape Calendar Hosting Server and the last 3
-# attributes are reserved for future use.
-objectClass nswcalUser
-	oid 2.16.840.1.113730.3.2.83
-	requires
-		objectClass
-	allows
-		cn,
-		givenName,
-		mail,
-		preferredlanguage,
-		sn,
-		uid,
-		userPassword,
-		nswcalCALID,
-		nswcalDisallowAccess,
-		nswcalExtendedUserPrefs,
-		nslicensedfor,
-		nswcalHost,
-		nswcalQuota
-
-# From http://www.imc.org/draft-ietf-calsch-locating
-attribute calCalURI              1.2.840.113556.1.4.478 cis
-attribute calFBURL               1.2.840.113556.1.4.479 cis
-attribute calCAPURI              1.2.840.113556.1.4.480 cis
-attribute calCalAdrURI           1.2.840.113556.1.4.481 cis
-attribute calOtherCalURIs        1.2.840.113556.1.4.482 cis
-attribute calOtherFBURLs         1.2.840.113556.1.4.483 cis
-attribute calOtherCAPURIs        1.2.840.113556.1.4.484 cis
-attribute calOtherCalAdrURIs     1.2.840.113556.1.4.485 cis
-
-# Used to designate a LDAP entry as representing a calendar user.
-objectClass calEntry
-	oid 1.2.840.113556.1.5.87
-	requires
-		objectClass
-	allows
-		calCalURI,
-		calFBURL,
-		calCAPURI,
-		calCalAdrURI,
-		calOtherCalURIs,
-		calOtherFBURLs,
-		calOtherCAPURIs,
-		calOtherCalAdrURIs
diff --git a/ldap/cm/v4confs/411/ns-web-globopt.conf b/ldap/cm/v4confs/411/ns-web-globopt.conf
deleted file mode 100644
index 6d19f242..00000000
--- a/ldap/cm/v4confs/411/ns-web-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Enterprise Server
-#index	uniquemember,member	eq
-
diff --git a/ldap/cm/v4confs/411/ns-web-schema.conf b/ldap/cm/v4confs/411/ns-web-schema.conf
deleted file mode 100644
index 08868577..00000000
--- a/ldap/cm/v4confs/411/ns-web-schema.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeWebServer
-        oid 2.16.840.1.113730.3.2.29
-        superior top
-        requires
-                cn,
-                nsServerID
-        allows
-                description,
-                nsServerPort
-
diff --git a/ldap/cm/v4confs/411/slapd.at.conf b/ldap/cm/v4confs/411/slapd.at.conf
deleted file mode 100644
index 15fcb074..00000000
--- a/ldap/cm/v4confs/411/slapd.at.conf
+++ /dev/null
@@ -1,423 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.at.conf for Netscape Directory Server 4.1
-#
-#  DO NOT MODIFY! 
-#
-#  The attributes listed in this file are Standard Attributes and are
-#  expected to present in Directory Server 4.1. Editing this file could 
-#  cause interoperability problems.
-#
-#  User Defined Attributes should be added by selecting 
-#  Schema | Edit or View Attributes from the Admin Server. 
-#
-#  User Defined Attributes are placed in slapd.user_at.conf.  
-# 
-#  All attributes are viewable over LDAP in the cn=schema entry under
-#  attributetypes.
-# 
-#  The format of this file is:
-#
-#  attribute attribute-name [attribute-aliases] [attribute-oid] syntax
-#  
-#  If no OID is specified, <attribute-name>-oid will be used as the OID
-#
-
-########################################################################
-# X.500(93) User Schema for use with LDAP
-# Taken from <draft-ietf-asid-ldapv3schema-x500-00.txt>
-########################################################################
-
-attribute objectClass                                         2.5.4.0                    cis     
-attribute aliasedObjectName                                   2.5.4.1                    dn      
-attribute knowledgeInformation                                2.5.4.2                    cis     
-attribute cn                         commonName               2.5.4.3                    cis     
-attribute sn                         surName                  2.5.4.4                    cis     
-attribute serialNumber                                        2.5.4.5                    cis     
-attribute c                          countryName              2.5.4.6                    cis     
-attribute l   locality               localityname             2.5.4.7                    cis     
-attribute st                         stateOrProvinceName      2.5.4.8                    cis     
-attribute street                     streetaddress            2.5.4.9                    cis     
-attribute o                          organizationname         2.5.4.10                   cis     
-attribute ou                         organizationalUnitName   2.5.4.11                   cis     
-attribute title                                               2.5.4.12                   cis     
-attribute description                                         2.5.4.13                   cis     
-attribute searchGuide                                         2.5.4.14                   ces     
-attribute businessCategory                                    2.5.4.15                   cis     
-attribute postalAddress                                       2.5.4.16                   cis     
-attribute postalCode                                          2.5.4.17                   cis     
-attribute postOfficeBox                                       2.5.4.18                   cis     
-attribute physicalDeliveryOfficeName                          2.5.4.19                   cis     
-attribute telephoneNumber                                     2.5.4.20                   tel     
-attribute telexNumber                                         2.5.4.21                   cis     
-attribute teletexTerminalIdentifier                           2.5.4.22                   cis
-attribute facsimileTelephoneNumber   fax                      2.5.4.23                   tel     
-attribute x121Address                                         2.5.4.24                   ces     
-attribute internationalIsdnNumber                             2.5.4.25                   ces     
-attribute registeredAddress                                   2.5.4.26                   cis     
-attribute destinationIndicator                                2.5.4.27                   cis     
-attribute preferredDeliveryMethod                             2.5.4.28                   cis single
-attribute presentationAddress                                 2.5.4.29                   ces     
-attribute supportedApplicationContext                         2.5.4.30                   cis     
-attribute member                                              2.5.4.31                   dn      
-attribute owner                                               2.5.4.32                   dn      
-attribute roleOccupant                                        2.5.4.33                   dn      
-attribute seeAlso                                             2.5.4.34                   dn      
-attribute userPassword                                        2.5.4.35                   bin     
-attribute userCertificate                                     2.5.4.36                   bin     
-attribute cACertificate               cACertificate           2.5.4.37                   bin     
-attribute authorityRevocationList     authorityRevocationList 2.5.4.38                   bin     
-attribute certificateRevocationList certificateRevocationList 2.5.4.39                   bin
-attribute crossCertificatePair        crossCertificatePair    2.5.4.40                   bin     
-attribute givenName                                           2.5.4.42                   cis     
-attribute initials                                            2.5.4.43                   cis     
-attribute generationQualifier                                 2.5.4.44                   cis
-attribute x500UniqueIdentifier                                2.5.4.45                   bin     
-attribute dnQualifier                                         2.5.4.46                   cis     
-attribute enhancedSearchGuide                                 2.5.4.47                   cis
-attribute protocolInformation                                 2.5.4.48                   cis
-attribute dn distinguishedName                                2.5.4.49                   dn 
-attribute uniqueMember                                        2.5.4.50                   dn      
-attribute houseIdentifier                                     2.5.4.51                   cis
-attribute supportedAlgorithms                                 2.5.4.52                   bin       
-attribute deltaRevocationList                                 2.5.4.53                   bin
-
-#######################################################################
-# LDAP Attributes                                                     #
-# Taken from <draft-ietf-asid-ldapv3-attributes-07.txt>               #
-#######################################################################
-
-attribute createTimestamp                                     2.5.18.1                   cis
-attribute modifyTimestamp                                     2.5.18.2                   cis
-attribute creatorsName                                        2.5.18.3                   dn
-attribute modifiersName                                       2.5.18.4                   dn
-attribute subschemaSubentry                                   2.5.18.10                  dn
-attribute attributeTypes                                      2.5.21.5                   cis
-attribute objectClasses                                       2.5.21.6                   cis
-attribute matchingRules                                       2.5.21.4                   cis
-attribute matchingRuleUse                                     2.5.21.8                   cis
-attribute dITStructureRules                                   2.5.21.1                   cis
-attribute dITContentRules                                     2.5.21.2                   cis
-attribute nameForms                                           2.5.21.7                   cis
-
-attribute namingContexts                                      1.3.6.1.4.1.1466.101.120.5 dn
-attribute altServer                                           1.3.6.1.4.1.1466.101.120.6 ces
-attribute supportedExtension                                  1.3.6.1.4.1.1466.101.120.7 cis
-attribute supportedControl                                    1.3.6.1.4.1.1466.101.120.13 cis
-attribute supportedSASLMechanisms                             1.3.6.1.4.1.1466.101.120.14 cis
-attribute supportedLDAPVersion                                1.3.6.1.4.1.1466.101.120.15 int
-attribute ldapSyntaxes                                        1.3.6.1.4.1.1466.101.120.16 cis
-
-#######################################################################
-# Pilot X.500 schema for use in LDAPv3                                #
-# Taken from <draft-ietf-asid-schema-pilot-00.txt>                    #
-#######################################################################
-
-attribute uid                                                 0.9.2342.19200300.100.1.1  cis     
-attribute textEncodedORAddress                                0.9.2342.19200300.100.1.2  cis     
-attribute mail                       rfc822mailbox            0.9.2342.19200300.100.1.3  cis     
-attribute info                                                0.9.2342.19200300.100.1.4  cis     
-attribute drink                                               0.9.2342.19200300.100.1.5  cis     
-attribute roomNumber                                          0.9.2342.19200300.100.1.6  cis     
-attribute userClass                                           0.9.2342.19200300.100.1.8  cis     
-attribute host                                                0.9.2342.19200300.100.1.9  cis     
-attribute manager                                             0.9.2342.19200300.100.1.10 dn      
-attribute documentIdentifier                                  0.9.2342.19200300.100.1.11 cis     
-attribute documentTitle                                       0.9.2342.19200300.100.1.12 cis     
-attribute documentVersion                                     0.9.2342.19200300.100.1.13 cis     
-attribute documentAuthor                                      0.9.2342.19200300.100.1.14 dn      
-attribute documentLocation                                    0.9.2342.19200300.100.1.15 cis     
-attribute homePhone                                           0.9.2342.19200300.100.1.20 tel     
-attribute secretary                                           0.9.2342.19200300.100.1.21 dn      
-attribute otherMailbox                                        0.9.2342.19200300.100.1.22 cis     
-attribute dc                         domaincomponent          0.9.2342.19200300.100.1.25 cis     
-attribute dNSRecord                                           0.9.2342.19200300.100.1.26 cis     
-attribute associatedName                                      0.9.2342.19200300.100.1.38 dn      
-attribute homePostalAddress                                   0.9.2342.19200300.100.1.39 cis     
-attribute personalTitle                                       0.9.2342.19200300.100.1.40 cis     
-attribute mobile                     mobileTelephoneNumber    0.9.2342.19200300.100.1.41 tel     
-attribute pager                      pagerTelephoneNumber     0.9.2342.19200300.100.1.42 tel     
-attribute co                         friendlycountryname      0.9.2342.19200300.100.1.43 cis     
-attribute uniqueIdentifier                                    0.9.2342.19200300.100.1.44 cis     
-attribute organizationalStatus                                0.9.2342.19200300.100.1.45 cis     
-attribute janetMailbox                                        0.9.2342.19200300.100.1.46 cis
-attribute mailPreferenceOption                                0.9.2342.19200300.100.1.47 int single     
-attribute buildingName                                        0.9.2342.19200300.100.1.48 cis     
-attribute dSAQuality                                          0.9.2342.19200300.100.1.49 cis single
-attribute singleLevelQuality                                  0.9.2342.19200300.100.1.50 cis single
-attribute subtreeMinimumQuality                               0.9.2342.19200300.100.1.51 cis single
-attribute subtreeMaximumQuality                               0.9.2342.19200300.100.1.52 cis single
-attribute personalSignature                                   0.9.2342.19200300.100.1.53 bin     
-attribute ditRedirect                                         0.9.2342.19200300.100.1.54 dn      
-attribute audio                                               0.9.2342.19200300.100.1.55 bin     
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis     
-attribute jpegPhoto                                           0.9.2342.19200300.100.1.60 bin     
-
-#definitions subsequent to RFC 1274
-
-attribute labeledUri                 labeledurl               1.3.6.1.4.1.250.1.57       ces
-
-
-############################################################################
-# Netscape Defined Attributes
-#
-# The Netscape base OID is                          2.16.840.1.113730 
-# The base OID for the Netscape Directory Server is 2.16.840.1.113730.3 
-# Netscape defined attributes have base             2.16.840.1.113730.3.1
-#
-# More Netscape defined attributes can be found included in ns-schema.conf
-############################################################################
-
-attribute carLicense                                          2.16.840.1.113730.3.1.1    cis     
-attribute departmentNumber                                    2.16.840.1.113730.3.1.2    cis     
-attribute employeeNumber                                      2.16.840.1.113730.3.1.3    cis single
-attribute employeeType                                        2.16.840.1.113730.3.1.4    cis     
-attribute changeNumber                                        2.16.840.1.113730.3.1.5    int     
-attribute targetDn                                            2.16.840.1.113730.3.1.6    dn      
-attribute changeType                                          2.16.840.1.113730.3.1.7    cis     
-attribute changes                                             2.16.840.1.113730.3.1.8    bin     
-attribute newRdn                                              2.16.840.1.113730.3.1.9    dn      
-attribute deleteOldRdn                                        2.16.840.1.113730.3.1.10   cis     
-attribute newSuperior                                         2.16.840.1.113730.3.1.11   dn      
-attribute ref                                                 2.16.840.1.113730.3.1.34   ces     
-attribute nsLicensedFor                                       2.16.840.1.113730.3.1.36   cis     
-attribute nsLicenseStartTime                                  2.16.840.1.113730.3.1.37   cis     
-attribute nsLicenseEndTime                                    2.16.840.1.113730.3.1.38   cis     
-attribute preferredLanguage                                   2.16.840.1.113730.3.1.39   cis single
-attribute userSMIMECertificate                                 2.16.840.1.113730.3.1.40   bin
-attribute ntUserDomainId                                      2.16.840.1.113730.3.1.41   cis single    
-attribute ntUserCreateNewAccount                              2.16.840.1.113730.3.1.42   cis single     
-attribute ntUserDeleteAccount                                 2.16.840.1.113730.3.1.43   cis single     
-attribute ntGroupDomainId                                     2.16.840.1.113730.3.1.44   cis single
-attribute ntGroupCreateNewGroup                               2.16.840.1.113730.3.1.45   cis single
-attribute ntGroupDeleteGroup                                  2.16.840.1.113730.3.1.46   cis single
-attribute ntGroupType                                  2.16.840.1.113730.3.1.47   cis single
-attribute replicaPort                                         2.16.840.1.113730.3.1.48   cis              
-attribute replicaUpdateFailedAt                               2.16.840.1.113730.3.1.49   cis              
-attribute replicaBeginOrc                                     2.16.840.1.113730.3.1.50   cis              
-attribute replicaUpdateReplayed                               2.16.840.1.113730.3.1.51   cis              
-attribute replicaUpdateSchedule                               2.16.840.1.113730.3.1.52   cis              
-attribute replicaBindMethod                                   2.16.840.1.113730.3.1.53   cis              
-attribute replicaUseSSL                                       2.16.840.1.113730.3.1.54   cis              
-attribute aci                                                 2.16.840.1.113730.3.1.55   bin              
-attribute lastModifiedBy                                      0.9.2342.19200300.100.1.24 dn               
-attribute replicaRoot                                         2.16.840.1.113730.3.1.57   dn               
-attribute replicaBindDn                                       2.16.840.1.113730.3.1.58   dn               
-attribute ntUserPriv                                          2.16.840.1.113730.3.1.59   bin single  
-attribute ntUserAuthFlags                                     2.16.840.1.113730.3.1.60   bin single  
-attribute ntUserUsrComment                                    2.16.840.1.113730.3.1.61   cis single  
-attribute ntUserParms                                         2.16.840.1.113730.3.1.62   cis single  
-attribute ntUserUnitsPerWeek                                  2.16.840.1.113730.3.1.63   bin single  
-attribute ntUserNumLogons                                     2.16.840.1.113730.3.1.64   bin single  
-attribute ntUserLogonServer                                   2.16.840.1.113730.3.1.65   cis single  
-attribute ntUserUniqueId                                      2.16.840.1.113730.3.1.66   bin single  
-attribute ntUserProfile                                       2.16.840.1.113730.3.1.67   cis single  
-attribute ntUserPasswordExpired                               2.16.840.1.113730.3.1.68   bin single  
-attribute subtreeACI                                          2.16.840.1.113730.3.1.69   ces              
-attribute serverRoot                                          2.16.840.1.113730.3.1.70   cis              
-attribute serverProductName                                   2.16.840.1.113730.3.1.71   cis              
-attribute serverVersionNumber                                 2.16.840.1.113730.3.1.72   cis              
-attribute installationTimeStamp                               2.16.840.1.113730.3.1.73   cis              
-attribute administratorContactInfo                            2.16.840.1.113730.3.1.74   cis              
-attribute adminUrl                                            2.16.840.1.113730.3.1.75   ces              
-attribute serverHostName                                      2.16.840.1.113730.3.1.76   cis              
-attribute changeTime                                          2.16.840.1.113730.3.1.77   cis              
-attribute cirReplicaRoot                                      2.16.840.1.113730.3.1.79   dn               
-attribute cirHost                                             2.16.840.1.113730.3.1.80   cis              
-attribute cirPort                                             2.16.840.1.113730.3.1.81   cis              
-attribute cirBindDn                                           2.16.840.1.113730.3.1.82   dn               
-attribute cirUsePersistentSearch                              2.16.840.1.113730.3.1.83   cis              
-attribute cirUseSsl                                           2.16.840.1.113730.3.1.84   cis              
-attribute cirBindCredentials                                  2.16.840.1.113730.3.1.85   ces              
-attribute cirLastUpdateApplied                                2.16.840.1.113730.3.1.86   cis              
-attribute cirUpdateSchedule                                   2.16.840.1.113730.3.1.87   cis              
-attribute cirUpdateFailedat                                   2.16.840.1.113730.3.1.88   cis              
-attribute cirSyncInterval                                     2.16.840.1.113730.3.1.89   cis              
-attribute cirBeginORC                                         2.16.840.1.113730.3.1.90   cis              
-attribute passwordExpirationTime                              2.16.840.1.113730.3.1.91   cis operational         
-attribute passwordExpWarned                                   2.16.840.1.113730.3.1.92   cis operational         
-attribute passwordRetryCount                                  2.16.840.1.113730.3.1.93   cis operational         
-attribute retryCountResetTime                                 2.16.840.1.113730.3.1.94   cis operational         
-attribute accountUnlockTime                                   2.16.840.1.113730.3.1.95   cis operational         
-attribute passwordHistory                                     2.16.840.1.113730.3.1.96   bin operational         
-attribute passwordMaxAge                                      2.16.840.1.113730.3.1.97   cis             
-attribute passwordExp                                         2.16.840.1.113730.3.1.98   cis                 
-attribute passwordMinLength                                   2.16.840.1.113730.3.1.99   cis                 
-attribute passwordKeepHistory                                 2.16.840.1.113730.3.1.100  cis                 
-attribute passwordInHistory                                   2.16.840.1.113730.3.1.101  cis                 
-attribute passwordChange                                      2.16.840.1.113730.3.1.102  cis                 
-attribute passwordCheckSyntax                                 2.16.840.1.113730.3.1.103  cis                 
-attribute passwordWarning								      2.16.840.1.113730.3.1.104  cis                 
-attribute passwordLockout                                     2.16.840.1.113730.3.1.105  cis                 
-attribute passwordMaxFailure                                  2.16.840.1.113730.3.1.106  cis                 
-attribute passwordResetDuration                               2.16.840.1.113730.3.1.107  cis                 
-attribute passwordUnlock				    				  2.16.840.1.113730.3.1.108  cis                 
-attribute passwordLockoutDuration                             2.16.840.1.113730.3.1.109  cis                 
-attribute ntGroupId                                           2.16.840.1.113730.3.1.110  bin single  
-attribute replicaHost                                         2.16.840.1.113730.3.1.197  cis              
-attribute memberURL                                           2.16.840.1.113730.3.1.198  ces              
-attribute memberCertificateDescription                        2.16.840.1.113730.3.1.199  ces              
-attribute replicaCredentials                                  2.16.840.1.113730.3.1.202  bin     
-attribute replicaEntryFilter                                  2.16.840.1.113730.3.1.203  ces
-attribute replicaNickName                                     2.16.840.1.113730.3.1.204  cis
-attribute filterInfo										  2.16.840.1.113730.3.1.206  cis
-attribute replicaCFUpdated                                    2.16.840.1.113730.3.1.217  cis
-attribute replicaAbandonedChanges                             2.16.840.1.113730.3.1.218  cis
-attribute vlvBase                                             2.16.840.1.113730.3.1.207  dn
-attribute vlvScope                                            2.16.840.1.113730.3.1.208  int
-attribute vlvFilter                                           2.16.840.1.113730.3.1.209  ces
-attribute vlvSort                                             2.16.840.1.113730.3.1.210  cis
-attribute vlvName                                             2.16.840.1.113730.3.1.211  ces
-attribute netscapeMDSuffix                                    2.16.840.1.113730.3.1.212  dn
-attribute vlvEnabled                                          2.16.840.1.113730.3.1.213  int
-attribute passwordAllowChangeTime                             2.16.840.1.113730.3.1.214  cis operational         
-attribute oid                                                 2.16.840.1.113730.3.1.215  cis
-attribute userPKCS12                                          2.16.840.1.113730.3.1.216  bin
-attribute vlvUses                                             2.16.840.1.113730.3.1.219  int
-attribute passwordMustChange                                  2.16.840.1.113730.3.1.220  cis
-attribute passwordStorageScheme                               2.16.840.1.113730.3.1.121  cis
-attribute passwordMinAge                                      2.16.840.1.113730.3.1.122  cis
-attribute passwordResetFailureCount                           2.16.840.1.113730.3.1.123  cis
-attribute nsslapd-pluginPath							      2.16.840.1.113730.3.1.224  cis
-attribute nsslapd-pluginInitfunc                              2.16.840.1.113730.3.1.225  cis
-attribute nsslapd-pluginType 	                              2.16.840.1.113730.3.1.226  cis
-attribute nsslapd-pluginId                                    2.16.840.1.113730.3.1.227  cis
-attribute nsslapd-pluginVersion                               2.16.840.1.113730.3.1.228  cis
-attribute nsslapd-pluginVendor                                2.16.840.1.113730.3.1.229  cis
-attribute nsslapd-pluginDescription                           2.16.840.1.113730.3.1.230  cis
-attribute nsslapd-pluginEnabled               	              2.16.840.1.113730.3.1.231  cis
-attribute nsSNMPEnabled                      	              2.16.840.1.113730.3.1.232  cis
-attribute nsSNMPOrganization                 	              2.16.840.1.113730.3.1.233  cis
-attribute nsSNMPLocation                     	              2.16.840.1.113730.3.1.234  cis
-attribute nsSNMPContact               	                      2.16.840.1.113730.3.1.235  cis
-attribute nsSNMPDescription									  2.16.840.1.113730.3.1.236  cis 
-attribute nsSNMPMasterHost									  2.16.840.1.113730.3.1.237  cis 
-attribute nsSNMPMasterPort									  2.16.840.1.113730.3.1.238  cis 
-attribute nsslapd-backend									  2.16.840.1.113730.3.1.239  cis 
-attribute replicatedattributelist                             2.16.840.1.113730.3.1.240  cis 
-attribute displayName                                         2.16.840.1.113730.3.1.241  cis single
-attribute nsSystemIndex                                       2.16.840.1.113730.3.1.242  cis 
-attribute nsIndexType                                         2.16.840.1.113730.3.1.327  cis 
-attribute nsMatchingRule                                      2.16.840.1.113730.3.1.328  cis 
-attribute nsAddressBookSyncURL                                2.16.840.1.113730.3.1.330  ces
-attribute nsSynchUserIDFormat                                 2.16.840.1.113730.3.1.406  cis
-attribute nsSynchUniqueAttribute                              2.16.840.1.113730.3.1.407  cis
-attribute replicaLastRelevantChange                           2.16.840.1.113730.3.1.408  int
-attribute ntUserHomeDir                                       2.16.840.1.113730.3.1.521  cis single     
-attribute ntUserComment                                       2.16.840.1.113730.3.1.522  cis single     
-attribute ntUserFlags                                         2.16.840.1.113730.3.1.523  bin single     
-attribute ntUserScriptPath                                    2.16.840.1.113730.3.1.524  cis single     
-attribute ntUserWorkstations                                  2.16.840.1.113730.3.1.525  cis single     
-attribute ntUserLastLogon                                     2.16.840.1.113730.3.1.526  cis single     
-attribute ntUserLastLogoff                                    2.16.840.1.113730.3.1.527  cis single     
-attribute ntUserAcctExpires                                   2.16.840.1.113730.3.1.528  cis single     
-attribute ntUserMaxStorage                                    2.16.840.1.113730.3.1.529  bin single     
-attribute ntUserLogonHours                                    2.16.840.1.113730.3.1.530  bin single     
-attribute ntUserBadPwCount                                    2.16.840.1.113730.3.1.531  bin single     
-attribute ntUserCountryCode                                   2.16.840.1.113730.3.1.532  cis single     
-attribute ntUserCodePage                                      2.16.840.1.113730.3.1.533  bin single     
-attribute ntUserPrimaryGroupId                                2.16.840.1.113730.3.1.534  bin single     
-attribute ntUserHomeDirDrive                                  2.16.840.1.113730.3.1.535  cis single     
-attribute ntGroupAttributes                                   2.16.840.1.113730.3.1.536  bin single
-
-#
-# Attribute types with OIDs
-#
-
-attribute associatedDomain                                    0.9.2342.19200300.100.1.37 cis     
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis single
-
-
-# 
-# Attributes which are used by some objectClass, but with unknown OID
-# 
-
-attribute abstract                                            abstract-oid               cis     
-attribute authorCn                   documentauthorcommonname authorcn-oid               cis     
-attribute authorSn                   documentauthorsurname    authorsn-oid               cis     
-attribute changeLog                                           2.16.840.1.113730.3.1.35   dn
-attribute changeLogMaximumAge                                 2.16.840.1.113730.3.1.200  cis     
-attribute changeLogMaximumSize                                2.16.840.1.113730.3.1.201  cis     
-attribute documentStore                                       documentStore-oid          cis     
-attribute keyWords                                            keyWords-oid               cis     
-attribute lastModifiedTime                                    0.9.2342.19200300.100.1.23 cis     
-attribute multiLineDescription                                multiLineDescription-oid   cis     
-attribute subject                                             subject-oid                cis     
-attribute ttl                        timeToLive               1.3.6.1.4.1.250.1.60       cis     
-attribute photo                                               0.9.2342.19200300.100.1.7  bin     
-attribute generation                                          generation-oid             ces     
-attribute obsoletedByDocument                                 obsoletedByDocument-oid    dn      
-attribute obsoletesDocument                                   obsoletesDocument-oid      dn      
-attribute reciprocalNamingLink                                reciprocalNaminglink-oid   dn      
-attribute updatedByDocument                                   updatedByDocument-oid      dn      
-attribute updatesDocument                                     updatesDocument-oid        dn      
-
-#
-# Attribute types from RFC 2307
-#
-
-attribute	uidNumber		1.3.6.1.1.1.1.0		int single
-attribute	gidNumber		1.3.6.1.1.1.1.1		int single
-attribute	gecos			1.3.6.1.1.1.1.2		cis single
-attribute	homeDirectory		1.3.6.1.1.1.1.3		ces single
-attribute	loginShell		1.3.6.1.1.1.1.4		int single
-attribute	shadowLastChange	1.3.6.1.1.1.1.5		int single
-attribute	shadowMin		1.3.6.1.1.1.1.6		int single
-attribute	shadowMax		1.3.6.1.1.1.1.7		int single
-attribute	shadowWarning		1.3.6.1.1.1.1.8		int single
-attribute	shadowInactive		1.3.6.1.1.1.1.9		int single
-attribute	shadowExpire		1.3.6.1.1.1.1.10	int single
-attribute	shadowFlag		1.3.6.1.1.1.1.11	int single
-attribute	memberUid		1.3.6.1.1.1.1.12	ces
-attribute	memberNisNetgroup	1.3.6.1.1.1.1.13	ces
-attribute	nisNetgroupTriple	1.3.6.1.1.1.1.14	ces
-attribute	ipServicePort		1.3.6.1.1.1.1.15	int single
-attribute	ipServiceProtocol	1.3.6.1.1.1.1.16	cis
-attribute	ipProtocolNumber	1.3.6.1.1.1.1.17	int single
-attribute	oncRpcNumber		1.3.6.1.1.1.1.18	int single
-attribute	ipHostNumber		1.3.6.1.1.1.1.19	cis
-attribute	ipNetworkNumber		1.3.6.1.1.1.1.20	cis single
-attribute	ipNetmaskNumber		1.3.6.1.1.1.1.21	cis single
-attribute	macAddress		1.3.6.1.1.1.1.22	cis
-attribute	bootParameter		1.3.6.1.1.1.1.23	ces
-attribute	bootFile		1.3.6.1.1.1.1.24	ces
-attribute	automountInformation	1.3.6.1.1.1.1.25	ces
-attribute	nisMapName		1.3.6.1.1.1.1.26	cis
-attribute	nisMapEntry		1.3.6.1.1.1.1.27	ces single
diff --git a/ldap/cm/v4confs/411/slapd.oc.conf b/ldap/cm/v4confs/411/slapd.oc.conf
deleted file mode 100644
index 53ca2e65..00000000
--- a/ldap/cm/v4confs/411/slapd.oc.conf
+++ /dev/null
@@ -1,1101 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.oc.conf for Netscape Directory Server 4.1
-#
-#  DO NOT MODIFY! 
-#
-#  The ObjectClasses in this file are Standard ObjectClasses and are expected
-#  to be present in Directory Server 4.1 unchanged. Modifing this file may
-#  cause interoperability problems.
-#
-#  User Defined ObjectClasses should be added by selecting 
-#  Schema | Create ObjectClasses from the Admin Server. 
-#
-#  User Defined ObjectClasses are saved in slapd.user_oc.conf
-#  
-#  All ObjectClasses are viewable in the cn=schema entry under objectclasses.
-#
-# The format of this file is:
-#
-#  objectclass ObjectClassName
-#       [ oid ObjectIdentifier ]
-#       [ superior ParentObjectClass ]
-#       [ requires <comma separated list of required attributes> ]
-#       [ allows   <comma separated list of allowed attributes>  ]
-#  
-
-objectclass top
-	oid 2.5.6.0
-	requires
-		objectClass
-	allows
-		aci
-
-objectclass alias
-	oid 2.5.6.1
-	superior top
-	requires
-		aliasedObjectName
-
-objectclass country
-	oid 2.5.6.2
-	superior top
-	requires
-		c
-	allows
-		searchGuide,
-		description
-
-objectclass locality
-	oid 2.5.6.3
-	superior top
-	allows
-		description,
-		l,
-		searchGuide,
-		seeAlso,
-		st,
-		street
-
-objectclass organization
-	oid 2.5.6.4
-	superior top
-	requires
-		o
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass organizationalUnit
-	oid 2.5.6.5
-	superior top
-	requires
-		ou
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass person
-	oid 2.5.6.6
-	superior top
-	requires
-		sn,
-		cn
-	allows
-		description,
-		seeAlso,
-		telephoneNumber,
-		userPassword
-
-objectclass organizationalPerson
-	oid 2.5.6.7
-	superior person
-	allows
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		title,
-		x121Address
-
-# The certificate attributes include all subtypes, such as ';binary'.
-#
-objectclass inetOrgPerson
-    oid 2.16.840.1.113730.3.2.2
-    superior organizationalPerson
-	allows
-		audio,
-		businessCategory,
-		carLicense,
-		departmentNumber,
-		displayName,
-		employeeType,
-		employeeNumber,
-		givenName,
-		homePhone,
-		homePostalAddress,
-		initials,
-		jpegPhoto,
-		labeledURI,
-		manager,
-		mobile,
-		pager,
-		photo,
-		preferredLanguage,
-		mail,
-		o,
-		roomNumber,
-		secretary,
-		uid,
-		x500uniqueIdentifier,
-		userCertificate,
-		userSMimeCertificate,
-		userPKCS12
- 
-objectclass ntUser
-	oid 2.16.840.1.113730.3.2.8
-	superior top
-	requires
-		ntUserDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntUserPriv,
-		ntUserHomeDir,
-		ntUserComment,
-		ntUserFlags,
-		ntUserScriptPath,
-		ntUserAuthFlags,
-		ntUserUsrComment,
-		ntUserParms,
-		ntUserWorkstations,
-		ntUserLastLogon,
-		ntUserLastLogoff,
-		ntUserAcctExpires,
-		ntUserMaxStorage,
-		ntUserUnitsPerWeek,
-		ntUserLogonHours,
-		ntUserBadPwCount,
-		ntUserNumLogons,
-		ntUserLogonServer,
-		ntUserCountryCode,
-		ntUserCodePage,
-		ntUserUniqueId,
-		ntUserPrimaryGroupId,
-		ntUserProfile,
-		ntUserHomeDirDrive,
-		ntUserPasswordExpired,
-		ntUserCreateNewAccount,
-		ntUserDeleteAccount
-
-objectclass ntGroup
-	oid 2.16.840.1.113730.3.2.9
-	superior top
-	requires
-		ntGroupDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntGroupId,
-		ntGroupAttributes,
-		ntGroupCreateNewGroup,
-		ntGroupDeleteGroup,
-		ntGroupType
-
-objectclass organizationalRole
-   oid 2.5.6.8
-   superior top  
-	requires
-		cn
-	allows
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		roleOccupant,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass groupOfNames
-   oid 2.5.6.9
-   superior top  
-	requires
-		cn
-	allows
-		member,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfUniqueNames
-    oid 2.5.6.17
-    superior top  
-	requires
-		cn
-	allows
-		uniqueMember,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfCertificates
-    oid 2.16.840.1.113730.3.2.31
-    superior top  
-	requires
-		cn
-	allows
-		memberCertificateDescription,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfURLs
-    oid  2.16.840.1.113730.3.2.33
-    superior top  
-	requires
-		cn
-	allows
-		memberURL,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass residentialPerson
-   oid 2.5.6.10
-   superior person  
-	requires
-		l
-	allows
-		businessCategory,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass applicationProcess
-    oid 2.5.6.11
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso
-
-objectclass LDAPServer
-	oid 2.16.840.1.113730.3.2.35
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		generation,
-		changeLogMaximumAge,
-		changeLogMaximumSize
-
-objectclass LDAPReplica
-	oid 2.16.840.1.113730.3.2.36
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		replicaRoot,
-		replicaHost,
-		replicaPort,
-		replicaBindDn,
-		replicaCredentials,
-		replicaBindMethod,
-		replicaUseSSL,
-		replicaUpdateSchedule,
-		replicaUpdateReplayed,
-		replicaUpdateFailedAt,
-		replicaBeginORC,
-		replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList,
-		replicaCFUpdated,
-		replicaAbandonedChanges,
-		replicaLastRelevantChange
-
-objectclass applicationEntity
-    oid 2.5.6.12
-    superior top  
-	requires
-		presentationAddress,
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		supportedApplicationContext
-
-objectclass dSA
-   oid 2.5.6.13
-   superior applicationEntity  
-	allows
-		knowledgeInformation
-
-objectclass device
-    oid 2.5.6.14
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# This userCertificate attribute includes all subtypes, such as ';binary'.
-objectclass strongAuthenticationUser
-    oid 2.5.6.15
-    superior top 
-	requires
-		userCertificate
-
-# These attributes include all subtypes, such as ';binary'.
-objectclass certificationAuthority
-    oid 2.5.6.16
-    superior top 
-	requires
-		cACertificate
-	allows
-		authorityRevocationList,
-		certificateRevocationList,
-		crossCertificatePair
-
-objectclass pilotObject
-    oid 0.9.2342.19200300.100.4.3
-    superior top  
-	allows
-		audio,
-		dITRedirect,
-		info,
-		jpegPhoto,
-		lastModifiedBy,
-		lastModifiedTime,
-		manager,
-		photo,
-		uniqueIdentifier
-
-objectclass newPilotPerson
-    oid 0.9.2342.19200300.100.4.4
-    superior person 
-	allows
-		businessCategory,
-		drink,
-		homePhone,
-		homePostalAddress,
-		janetMailbox,
-		mail,
-		mailPreferenceOption,
-		mobile,
-		organizationalStatus,
-		otherMailbox,
-		pager,
-		personalSignature,
-		personalTitle,
-		preferredDeliveryMethod,
-		roomNumber,
-		secretary,
-		textEncodedORAddress,
-		uid,
-		userClass
-
-objectclass account
-    oid 0.9.2342.19200300.100.4.5
-    superior top  
-    requires
-		uid
-	allows
-		description,
-		host,
-		l,
-		o,
-		ou,
-		seeAlso
-
-objectclass document
-    oid 0.9.2342.19200300.100.4.6
-    superior pilotObject 
-	requires
-		documentIdentifier
-	allows
-		abstract,
-		authorCN,
-		authorSN,
-		cn,
-		description,
-		documentAuthor,
-		documentLocation,
-		documentPublisher,
-		documentStore,
-		documentTitle,
-		documentVersion,
-		keywords,
-		l,
-		o,
-		obsoletedByDocument,
-		obsoletesDocument,
-		ou,
-		seeAlso,
-		subject,
-		updatedByDocument,
-		updatesDocument
-
-objectclass room
-    oid 0.9.2342.19200300.100.4.7
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		roomNumber,
-		seeAlso,
-		telephoneNumber
-
-objectclass documentSeries
-    oid 0.9.2342.19200300.100.4.9
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		telephoneNumber
-
-objectclass domain
-    oid 0.9.2342.19200300.100.4.13
-    superior top  
-	requires
-		dc
-	allows
-		associatedName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		manager,
-		o,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass RFC822localPart
-    oid 0.9.2342.19200300.100.4.14
-    superior domain 
-	allows
-		cn,
-		sn
-
-objectclass DNSDomain
-    oid 0.9.2342.19200300.100.4.15
-    superior domain  
-	allows
-		dNSRecord
-
-objectclass domainRelatedObject
-    oid 0.9.2342.19200300.100.4.17
-    superior top 
-	requires
-		associatedDomain
-
-objectclass friendlyCountry
-    oid 0.9.2342.19200300.100.4.18
-    superior country 
-	requires
-		co
-
-objectclass simpleSecurityObject
-	oid 0.9.2342.19200300.100.4.19
-	superior top 
-	requires
-		userPassword
-
-objectclass pilotOrganization
-	oid pilotOrganization-OID
-	superior top
-	requires
-		ou,
-		o
-	allows
-		buildingName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-
-objectclass labeledURIObject
-	oid 1.3.6.1.4.1.250.3.15 
-	superior top
-	allows
-		labeledURI
-
-objectclass cacheObject
-	oid 1.3.6.1.4.1.250.3.18 
-	superior top
-	allows
-		ttl
-
-# objectclasses below added since Netscape Directory Server 1.01
-
-objectclass netscapeServer 
-	oid 2.16.840.1.113730.3.2.10
-	superior top
-	requires 
-		cn 
-	allows 
-		description,
-		serverRoot,
-		serverProductName,
-		serverVersionNumber,
-		installationTimeStamp,
-		administratorContactInfo,
-		userpassword,
-		adminURL,
-		serverHostName
-
-objectclass nsLicenseUser
-	oid 2.16.840.1.113730.3.2.7
-	superior top
-	allows
-		nsLicensedFor,
-		nsLicenseStartTime,
-		nsLicenseEndTime
-
-objectclass changeLogEntry
-	oid 2.16.840.1.113730.3.2.1
-	superior top
-	requires
-		targetdn,
-		changeTime,
-		changenumber,
-		changeType
-	allows
-		changes,
-		newrdn,
-		deleteoldrdn,
-		newsuperior,
-		filterinfo
-
-objectclass cirReplicaSource
-	oid 2.16.840.1.113730.3.2.11
-	requires 
-		cn,
-		objectClass
-	allows
-		cirReplicaRoot,
-                cirHost,
-                cirPort,
-                cirBindDN,
-                cirUsePersistentSearch,
-                cirUseSSL,
-                cirBindCredentials,
-                cirLastUpdateApplied,
-                cirUpdateSchedule,
-                cirSyncInterval,
-                cirUpdateFailedAt,
-                cirBeginORC,
-                replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList
-
-objectclass referral
-	superior top
-	oid 2.16.840.1.113730.3.2.6
-	allows
-		ref
-
-objectclass passwordObject
-		oid  2.16.840.1.113730.3.2.12
-        requires
-                objectClass
-        allows
-                passwordExpirationTime,
-                passwordExpWarned,
-                passwordRetryCount,
-                retryCountResetTime,
-                accountUnlockTime,
-                passwordHistory,
-		passwordAllowChangeTime
-
-objectclass passwordPolicy
-		oid  2.16.840.1.113730.3.2.13
-        requires
-                objectClass
-        allows
-		passwordMaxAge,		
-		passwordExp,
-		passwordMinLength,
-		passwordKeepHistory,
-		passwordInHistory,
-		passwordChange,
-		passwordWarning,
-		passwordLockout,
-		passwordMaxFailure,
-		passwordResetDuration,
-		passwordUnlock,
-		passwordLockoutDuration,
-		passwordCheckSyntax,
-                passwordMustChange,
-                passwordStorageScheme,
-                passwordMinAge,
-                passwordResetFailureCount
-
-objectclass glue
-		oid  2.16.840.1.113730.3.2.30
-		superior top
-
-objectclass netscapeMachineData
-		oid  2.16.840.1.113730.3.2.32
-		superior top
-
-objectclass dcObject
-	oid 1.3.6.1.4.1.1466.344
-	superior top
-	requires 
-		dc
-
-objectclass subschema
-	oid 2.5.20.1
-	superior top
-	allows 
-		cn,
-		dITStructureRules,
-		nameForms,
-		dITContentRules,
-		objectClasses,
-		attributeTypes,
-		matchingRules,
-		matchingRuleUse
-
-objectclass vlvSearch
-    oid 2.16.840.1.113730.3.2.38
-    superior top
-    requires
-        cn,
-        vlvBase,
-        vlvScope,
-        vlvFilter
-    allows
-        multiLineDescription
-
-objectclass nsslapdConfig
-	oid 2.16.840.1.113730.3.2.39
-	superior top
-	allows cn
-
-objectclass directoryServerFeature
-    oid 2.16.840.1.113730.3.2.40
-    superior top
-    allows
-        oid,
-        cn,
-        multiLineDescription
-
-objectclass nsslapdPlugin
-	oid 2.16.840.1.113730.3.2.41 
-	superior top
-	requires
-		cn,
-		nsslapd-pluginPath,
-		nsslapd-pluginInitFunc,
-		nsslapd-pluginType,
-		nsslapd-pluginId,
-		nsslapd-pluginVersion,
-		nsslapd-pluginVendor,
-		nsslapd-pluginDescription,
-		nsslapd-pluginEnabled,
-		nsslapd-backend
-
-objectclass vlvIndex
-    oid 2.16.840.1.113730.3.2.42
-    superior top
-    requires
-        cn,
-        vlvSort
-    allows
-        vlvEnabled,
-        vlvUses
-	
-objectclass nsSNMP
-	OID 2.16.840.1.113730.3.2.43
-	superior top
-	requires 
-		cn,
-		nsSNMPEnabled
-	allows
-		nsSNMPOrganization,
-		nsSNMPLocation,
-		nsSNMPContact,
-		nsSNMPDescription,
-		nsSNMPMasterHost,
-		nsSNMPMasterPort
-
-objectclass nsIndex
-    oid 2.16.840.1.113730.3.2.44
-    superior top
-    requires
-		cn,
-		nsSystemIndex
-    allows
-		description,
-		nsIndexType,
-		nsMatchingRule
-
-#
-# ojectclass from rfc2307
-#	
-
-# posixAccount is an auxiliary class. You may use account as a structural
-# class.
-objectclass posixAccount
-	oid
-		1.3.6.1.1.1.2.0
-	superior
-		top
-	requires
-		objectClass,
-		cn,
-		uid,
-		uidNumber,
-		gidNumber,
-		homeDirectory
-	allows
-		userPassword,
-		loginShell,
-		gecos,
-		description
-
-# posixAccount is an auxiliary class. You may use account as a structural
-# class.
-objectclass shadowAccount
-	oid
-		1.3.6.1.1.1.2.1
-	superior
-		top
-	requires
-		objectClass,
-		uid
-	allows
-		userPassword,
-		shadowLastChange,
-		shadowMin,
-		shadowMax,
-		shadowWarning,
-		shadowInactive,
-		shadowExpire,
-		shadowFlag,
-		description
-
-objectclass posixGroup
-	oid
-		1.3.6.1.1.1.2.2
-	requires
-		objectClass,
-		cn,
-		gidNumber
-	allows
-		userPassword,
-		memberUid,
-		description
-
-objectclass ipService
-	oid
-		1.3.6.1.1.1.2.3
-	requires
-		objectClass,
-		cn,
-		ipServicePort,
-		ipServiceProtocol
-	allows
-		description
-
-objectclass ipProtocol
-	oid
-		1.3.6.1.1.1.2.4
-	requires
-		objectClass,
-		cn,
-		ipProtocolNumber
-	allows
-		description
-
-objectclass oncRpc
-	oid
-		1.3.6.1.1.1.2.5
-	requires
-		objectClass,
-		cn,
-		oncRpcNumber
-	allows
-		description
-
-# ipHost is a subclass of device
-objectclass ipHost
-	oid
-		1.3.6.1.1.1.2.6
-	requires
-		objectClass,
-		ipHostNumber,
-		cn
-	allows
-		manager,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-
-objectclass ipNetwork
-	oid
-		1.3.6.1.1.1.2.7
-	requires
-		objectClass,
-		ipNetworkNumber,
-		cn
-	allows
-		ipNetmaskNumber,
-		manager,
-		l,
-		description
-
-objectclass nisNetgroup
-	oid
-		1.3.6.1.1.1.2.8
-	requires
-		objectClass,
-		cn
-	allows
-		nisNetgroupTriple,
-		memberNisNetgroup,
-		description
-
-# the automount class is deprecated. Because cn is case insensitive
-# on matches, you may need to use another object class to unique
-# names.
-objectclass automount
-	oid
-		1.3.6.1.1.1.2.9
-	requires
-		objectClass,
-		cn,
-		automountInformation
-	allows
-		description
-
-# nisObject represents entries in NIS maps.
-objectclass nisObject
-	oid
-		1.3.6.1.1.1.2.10
-	requires
-		objectClass,
-		cn,
-		nisMapEntry,
-		nisMapName
-	allows
-		description
-
-# ieee802Device is a subclass of device
-objectclass ieee802Device
-	oid
-		1.3.6.1.1.1.2.11
-	requires
-		objectClass,
-		cn
-	allows
-		macAddress,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# bootableDevice is a subclass of device
-objectclass bootableDevice
-	oid
-		1.3.6.1.1.1.2.12
-	requires
-		objectClass,
-		cn
-	allows
-		bootFile,
-		bootParameter,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# nisMap is a structural class which may be used as a container
-# for instances of nisObject.
-objectclass nisMap
-	oid
-		1.3.6.1.1.1.2.13
-	requires
-		objectClass,
-		nisMapName
-	allows
-		description
-
diff --git a/ldap/cm/v4confs/412/java-object-schema.conf b/ldap/cm/v4confs/412/java-object-schema.conf
deleted file mode 100644
index 7a6c0ef5..00000000
--- a/ldap/cm/v4confs/412/java-object-schema.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Schema for storing java objects and java object references
-
-attribute javaClassName			1.3.6.1.4.1.42.2.27.4.1.6	ces	single
-
-attribute javaCodebase			1.3.6.1.4.1.42.2.27.4.1.7	ces
-
-attribute javaSerializedData	1.3.6.1.4.1.42.2.27.4.1.8	bin single
-
-attribute javaFactory			1.3.6.1.4.1.42.2.27.4.1.10	ces single
-
-attribute javaReferenceAddress	1.3.6.1.4.1.42.2.27.4.1.11	ces
-
-attribute javaDoc	1.3.6.1.4.1.42.2.27.4.1.12	ces
-
-attribute javaClassNames	1.3.6.1.4.1.42.2.27.4.1.13	ces
-
-objectclass javaContainer
-	oid 1.3.6.1.4.1.42.2.27.4.2.1
-	superior top
-	requires
-		cn
-
-objectclass javaObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.4
-	superior top
-	requires
-		javaClassName
-	allows
-		javaClassNames,
-		javaCodebase,
-		javaDoc,
-		description
-
-objectclass javaSerializedObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.5
-	superior javaObject
-	requires
-		javaSerializedData
-
-objectclass javaNamingReference
-	oid 1.3.6.1.4.1.42.2.27.4.2.7
-	superior javaObject
-	allows
-		javaReferenceAddress,
-        javaFactory
-
-objectclass javaMarshalledObject
-	oid 1.3.6.1.4.1.42.2.27.4.2.8
-	superior javaObject
-	requires
-		javaSerializedData
diff --git a/ldap/cm/v4confs/412/ns-admin-schema.conf b/ldap/cm/v4confs/412/ns-admin-schema.conf
deleted file mode 100644
index 73a03cac..00000000
--- a/ldap/cm/v4confs/412/ns-admin-schema.conf
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Netscape Administration Server LDAP Schema configuration file
-#
-# Version: 4.1
-# Description:
-#  Administration Server and Mission Control Console attributes
-#  and objectclasses.
-#
-
-#############################################################
-# Attributes
-#############################################################
-
-#
-# nsAdminConfig
-#
-attribute	nsAdminCgiWaitPid	cis
-attribute	nsAdminUsers		cis
-attribute	nsAdminAccessHosts	cis
-attribute	nsAdminAccessAddresses	cis
-attribute	nsAdminOneACLDir	cis
-attribute	nsAdminEnableDSGW	cis
-attribute	nsAdminEnableEnduser	cis
-attribute	nsAdminCacheLifetime	cis
-
-
-#
-# nsAdminResourceEditorExtension
-#
-attribute	nsAdminAccountInfo	cis
-attribute	nsDeleteclassname	cis
-
-#
-# nsAdminGlobalParameters
-#
-attribute	nsAdminEndUserHTMLIndex	cis
-
-#
-# nsGlobalParameters
-#
-attribute	nsUniqueAttribute	cis
-attribute	nsUserIDFormat		cis
-attribute	nsUserRDNComponent	cis
-attribute	nsGroupRDNComponent	cis
-attribute	nsWellKnownJarfiles	cis
-attribute	nsNYR			cis
-
-#
-# nsDefaultObjectClasses
-#
-attribute	nsDefaultObjectClass	cis
-
-#
-# nsAdminConsoleUser
-#
-attribute	nsPreference		cis
-
-#
-# nsCustomView
-#
-attribute	nsDisplayName		cis
-
-#
-# nsTopologyCustomView
-#
-attribute	nsViewConfiguration	cis
-
-#############################################################
-# Objectclasses
-#############################################################
-
-objectclass nsAdminServer
-    superior top
-    requires
-        cn,
-        nsServerID
-    allows
-        description
-
-objectclass nsAdminConfig
-    superior nsConfig
-    allows
-        nsAdminCgiWaitPid,
-        nsAdminUsers,
-        nsAdminAccessHosts,
-        nsAdminAccessAddresses,
-        nsAdminOneACLDir,
-        nsAdminEnableDSGW,
-	nsAdminEnableEnduser,
-	nsAdminCacheLifetime
-
-objectclass nsAdminResourceEditorExtension
-    superior nsAdminObject
-    requires
-        cn
-    allows
-	nsAdminAccountInfo,
-	nsDeleteclassname
-
-objectclass nsAdminGlobalParameters
-    superior top
-    requires
-        cn
-    allows
-        nsAdminEndUserHTMLIndex,
-        nsNickname
-        
-objectclass nsGlobalParameters
-    superior top
-    requires
-        cn
-    allows
-        nsUniqueAttribute,
-	nsUserIDFormat,
-	nsUserRDNComponent,
-	nsGroupRDNComponent,
-	nsWellKnownJarFiles,
-	nsNYR
-        
-objectclass nsDefaultObjectClasses
-    superior top
-    requires 
-        cn
-    allows
-        nsDefaultObjectClass
-
-objectclass nsAdminConsoleUser
-	superior top
-	requires
-		cn
-	allows
-		nsPreference
-		
-objectclass nsCustomView
-	superior nsAdminObject
-	allows
-		nsDisplayName,
-	
-objectclass nsTopologyCustomView
-	superior nsCustomView
-	requires
-		cn
-	allows
-		nsViewConfiguration
-
-objectclass nsTopologyPlugin
-	superior nsAdminObject
-	allows	
diff --git a/ldap/cm/v4confs/412/ns-calendar-globopt.conf b/ldap/cm/v4confs/412/ns-calendar-globopt.conf
deleted file mode 100644
index 9b49a483..00000000
--- a/ldap/cm/v4confs/412/ns-calendar-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-index   nsCalXItemId    pres,eq,sub
diff --git a/ldap/cm/v4confs/412/ns-calendar-schema.conf b/ldap/cm/v4confs/412/ns-calendar-schema.conf
deleted file mode 100644
index 1df0b736..00000000
--- a/ldap/cm/v4confs/412/ns-calendar-schema.conf
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsCalAccess                 2.16.840.1.113730.3.1.112  cis     
-attribute nsCalAccessDomain           2.16.840.1.113730.3.1.113  cis     
-attribute nsCalAdmd                   2.16.840.1.113730.3.1.114  cis     
-attribute nsCalDefaultNoteReminder    2.16.840.1.113730.3.1.115  cis     
-attribute nsCalDefaultReminder        2.16.840.1.113730.3.1.116  cis     
-attribute nsCalDefaultTaskReminder    2.16.840.1.113730.3.1.117  cis     
-attribute nsCalDisplayPrefs           2.16.840.1.113730.3.1.118  cis     
-attribute nsCalFlags                  2.16.840.1.113730.3.1.119  cis     
-attribute nsCalHost                   2.16.840.1.113730.3.1.120  cis     
-attribute nsCalLanguageId             2.16.840.1.113730.3.1.121  cis     
-attribute nsCalNodeAlias              2.16.840.1.113730.3.1.122  cis     
-attribute nsCalNotifMechanism         2.16.840.1.113730.3.1.123  cis     
-attribute nsCalOperatingPrefs         2.16.840.1.113730.3.1.124  cis     
-attribute nsCalOrgUnit2               2.16.840.1.113730.3.1.125  cis     
-attribute nsCalOrgUnit3               2.16.840.1.113730.3.1.126  cis     
-attribute nsCalOrgUnit4               2.16.840.1.113730.3.1.127  cis     
-attribute nsCalPasswordRequired       2.16.840.1.113730.3.1.128  cis     
-attribute nsCalPrmd                   2.16.840.1.113730.3.1.129  cis     
-attribute nsCalRefreshPrefs           2.16.840.1.113730.3.1.130  cis     
-attribute nsCalResourceCapacity       2.16.840.1.113730.3.1.131  cis     
-attribute nsCalResourceNumber         2.16.840.1.113730.3.1.132  cis     
-attribute nsCalServerVersion          2.16.840.1.113730.3.1.133  cis     
-attribute nsCalSysopCanWritePassword  2.16.840.1.113730.3.1.134  cis     
-attribute nsCalTimezone               2.16.840.1.113730.3.1.135  cis     
-attribute nsCalXItemId                2.16.840.1.113730.3.1.136  cis     
-
-
-objectclass nsCalUser
-		oid 2.16.840.1.113730.3.2.14
-        requires
-                objectClass
-        allows
-		c,
-		employeeNumber,
-                generationQualifier,
-		givenName,
-		initials,
-		mail,
-		o,
-		ou,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalRefreshPrefs,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass nsCalAdmin
-		oid 2.16.840.1.113730.3.2.15
-        requires
-                objectClass
-        allows
-		c,
-                cn,
-                facsimileTelephoneNumber,
-                generationQualifier,
-                givenName,
-                initials,
-		mail,
-		o,
-                ou,
-                postalAddress,
-                sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalAdmd,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalOrgUnit2,
-                nsCalOrgUnit3,
-                nsCalOrgUnit4,
-                nsCalPasswordRequired,
-                nsCalPrmd,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalXItemId
-
-objectclass nsCalResource
-		oid 2.16.840.1.113730.3.2.16
-        requires
-                objectClass
-        allows
-                cn,
-                facsimileTelephoneNumber,
-		givenName,
-		mail,
-                postalAddress,
-		sn,
-                telephoneNumber,
-                userPassword,
-                nsCalAccess,
-                nsCalAccessDomain,
-                nsCalDefaultNoteReminder,
-                nsCalDefaultReminder,
-                nsCalDefaultTaskReminder,
-                nsCalDisplayPrefs,
-                nsCalFlags,
-                nsCalHost,
-                nsCalLanguageId,
-                nsCalNodeAlias,
-                nsCalNotifMechanism,
-                nsCalOperatingPrefs,
-                nsCalPasswordRequired,
-                nsCalRefreshPrefs,
-                nsCalResourceCapacity,
-                nsCalResourceNumber,
-                nsCalServerVersion,
-                nsCalSysopCanWritePassword,
-                nsCalTimezone,
-                nsCalXItemId
-
-objectclass netscapeCalendarServer
-		oid 2.16.840.1.113730.3.2.17
-        requires
-                objectclass
-
-
-
diff --git a/ldap/cm/v4confs/412/ns-certificate-globopt.conf b/ldap/cm/v4confs/412/ns-certificate-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/412/ns-certificate-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/412/ns-certificate-schema.conf b/ldap/cm/v4confs/412/ns-certificate-schema.conf
deleted file mode 100644
index 02efd5a2..00000000
--- a/ldap/cm/v4confs/412/ns-certificate-schema.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-attribute 	nsCertConfig 	cis
-
-objectclass netscapeCertificateServer
-                oid 2.16.840.1.113730.3.2.18
-        requires
-                objectclass
-
-objectclass nsCertificateServer
-        requires
-                objectclass,
-                nsServerID
-        allows
-                serverHostName,
-                nsServerPort,
-		nsCertConfig
-
-
diff --git a/ldap/cm/v4confs/412/ns-common-schema.conf b/ldap/cm/v4confs/412/ns-common-schema.conf
deleted file mode 100644
index 2cb7e480..00000000
--- a/ldap/cm/v4confs/412/ns-common-schema.conf
+++ /dev/null
@@ -1,278 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# Common LDAP schema configuration file
-#
-# Version: 4.1
-# Description:
-#   This configuration file contains objectclasses and attributes 
-#   common to the Mission Control Framework
-#
-
-#############################################################
-# Attributes
-#############################################################
-
-#
-# Common Attributes
-#
-attribute nsServerID  			cis
-attribute nsBaseDN    			cis
-attribute nsBindDN    			cis
-attribute nsBindPassword 		cis
-attribute nsServerPort			cis
-attribute nsServerAddress 		cis
-attribute nsDirectoryInfoRef		dn
-attribute nsDirectoryURL		ces
-attribute nsDirectoryFailoverList	ces
-#
-# nsAdminDomain
-#
-attribute	nsAdminDomainName	cis
-
-#
-# nsHost
-#
-attribute	nsHostLocation 		cis
-attribute	nsHardwarePlatform	cis
-attribute	nsOsVersion		cis
-
-#
-# nsAdminGroup
-#
-attribute	nsAdminGroupName	cis
-attribute	nsConfigRoot		cis
-attribute	nsAdminSIEDN		dn
-
-#
-# nsApplication
-#
-attribute	nsVendor		cis
-attribute	nsProductName		cis
-attribute	nsNickName		cis
-attribute	nsProductVersion	cis
-attribute	nsBuildNumber		cis
-attribute	nsRevisionNumber	cis
-attribute	nsSerialNumber		cis
-attribute	nsInstalledLocation	cis
-attribute	nsExpirationDate	cis
-attribute	nsBuildSecurity		cis
-attribute	nsServerMigrationClassname	cis
-attribute	nsServerCreationClassname	cis
-attribute       nsLdapSchemaVersion     cis
-
-#
-# nsConfig
-#
-attribute	nsSuiteSpotUser		cis
-attribute	nsErrorLog		cis
-attribute	nsPidLog		cis
-attribute	nsAccessLog		cis
-attribute	nsDefaultAcceptLanguage	cis
-attribute	nsServerSecurity	cis
-
-#
-# nsEncryptionConfig
-#
-attribute	nsCertfile		cis
-attribute	nsKeyfile		cis
-attribute	nsSSL2			cis
-attribute	nsSSL3			cis
-attribute	nsSSLClientAuth		cis
-attribute	nsSSLSessionTimeout	cis
-attribute	nsSSL3SessionTimeout	cis
-attribute	nsSSL2Ciphers		cis
-attribute	nsSSL3Ciphers		cis
-
-#
-# nsEncryptionModule
-#
-attribute	nsSSLToken		cis
-attribute	nsSSLPersonalitySSL	cis
-attribute	nsSSLActivation		cis
-
-#
-# nsTask
-#
-attribute	nsTaskLabel		cis
-attribute	nsHelpRef		cis
-attribute	nsExecRef		cis
-attribute	nsLogSuppress		cis
-
-#
-# nsAdminObject
-#
-attribute	nsJarfilename		cis
-attribute	nsClassname		cis
-
-
-#############################################################
-# Object Classes
-#############################################################
-objectclass nsAdminDomain
-    superior organizationalUnit
-    allows
-	nsAdminDomainName
-
-objectclass nsHost
-    superior top
-    requires
-        cn
-    allows
-        serverHostName,
-        description,
-        l,
-        nsHostLocation,
-        nsHardwarePlatform,
-        nsOsVersion
-
-objectclass nsAdminGroup
-    superior top
-    requires
-        cn
-    allows
-	nsAdminGroupName,
-        description,
-        nsConfigRoot,
-	nsAdminSIEDN
-
-objectclass nsApplication
-    superior top
-    requires 
-        cn
-    allows 
-        nsVendor,
-        description, 
-        nsProductName,                 
-        nsNickName,           
-        nsProductVersion,              
-        nsBuildNumber, 
-        nsRevisionNumber,       
-        nsSerialNumber, 
-        nsInstalledLocation,    
-        installationTimeStamp,
-        nsExpirationDate,       
-        nsBuildSecurity,
-	nsLdapSchemaVersion,
-        nsServerMigrationClassname,
-        nsServerCreationClassname
-
-objectclass nsEncryptionConfig
-    superior top
-    requires
-        cn
-    allows
-        nsCertfile,
-        nsKeyfile,
-        nsSSL2,
-        nsSSL3,
-        nsSSLSessionTimeout,
-        nsSSL3SessionTimeout,
-        nsSSLClientAuth,
-        nsSSL2Ciphers,
-        nsSSL3Ciphers
- 
-objectclass nsEncryptionModule
-    superior top
-    requires
-        cn
-    allows
-        nsSSLToken,
-        nsSSLPersonalityssl,
-        nsSSLActivation
-
-
-objectclass nsResourceRef
-    superior top
-    requires
-        cn
-    allows
-        seeAlso
-            
-objectclass nsTask
-    superior top
-    requires
-        cn
-    allows
-        nsTaskLabel,
-        nsHelpref,
-        nsExecref,
-        nsLogSuppress
-    
-objectclass nsTaskGroup
-    superior top
-    requires
-        cn
-    allows
-        nsTaskLabel
-
-objectclass nsAdminObject
-    superior top
-    requires
-        cn
-    allows
-        nsJarFilename,
-        nsClassName    
-        
-objectclass nsConfig
-    superior top
-    requires
-        cn
-    allows
-        description,
-        nsServerPort,
-	nsServerAddress,
-        nsSuiteSpotUser,
-        nsErrorLog,
-        nsPidLog,
-        nsAccessLog,
-        nsDefaultAcceptLanguage,
-	nsServerSecurity
-
-objectclass nsDirectoryInfo
-    superior top
-    requires 
-	cn
-    allows
-	nsBindDN,
-	nsBindPassword,
-	nsDirectoryURL,
-	nsDirectoryFailoverList,
-	nsDirectoryInfoRef
diff --git a/ldap/cm/v4confs/412/ns-compass-globopt.conf b/ldap/cm/v4confs/412/ns-compass-globopt.conf
deleted file mode 100644
index 6c56c350..00000000
--- a/ldap/cm/v4confs/412/ns-compass-globopt.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-index	pipuid			pres,eq,sub
-index	pipstatus		eq
-
diff --git a/ldap/cm/v4confs/412/ns-compass-schema.conf b/ldap/cm/v4confs/412/ns-compass-schema.conf
deleted file mode 100644
index 52997ea4..00000000
--- a/ldap/cm/v4confs/412/ns-compass-schema.conf
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-
-# Compass server specific (not currently used) 
-
-objectclass netscapeCompassServer
-		oid 2.16.840.1.113730.3.2.19
-        requires        
-                objectclass
-
-
-# Attributes for personal interest profile classes
-
-attribute pipuid                      2.16.840.1.113730.3.1.137  cis     
-attribute pipcompassservers           2.16.840.1.113730.3.1.138  cis     
-attribute pipuniqueid                 2.16.840.1.113730.3.1.139  cis     
-attribute pipstatus                   2.16.840.1.113730.3.1.140  cis     
-attribute pipusertype                 2.16.840.1.113730.3.1.141  cis     
-attribute pipfrequency                2.16.840.1.113730.3.1.142  cis     
-attribute pipmedium                   2.16.840.1.113730.3.1.143  cis     
-attribute pipformat                   2.16.840.1.113730.3.1.144  cis     
-attribute piphour                     2.16.840.1.113730.3.1.145  cis     
-attribute pipmaxhits                  2.16.840.1.113730.3.1.146  cis     
-attribute pipresultset                2.16.840.1.113730.3.1.147  cis     
-attribute pipsortorder                2.16.840.1.113730.3.1.148  cis     
-attribute piptimestamp                2.16.840.1.113730.3.1.149  cis     
-attribute pipirlist                   2.16.840.1.113730.3.1.150  cis     
-attribute pipiroption                 2.16.840.1.113730.3.1.151  cis     
-attribute pippwp                      2.16.840.1.113730.3.1.152  cis     
-attribute piplastcount                2.16.840.1.113730.3.1.153  cis     
-attribute piptotalcount               2.16.840.1.113730.3.1.154  cis     
-attribute piptotalrun                 2.16.840.1.113730.3.1.155  cis     
-attribute pipnotify                   2.16.840.1.113730.3.1.156  cis     
-attribute pipprivilege                2.16.840.1.113730.3.1.157  cis     
-attribute pipgroup                    2.16.840.1.113730.3.1.158  cis     
-attribute pipidstcount                2.16.840.1.113730.3.1.159  cis     
-attribute pipstid                     2.16.840.1.113730.3.1.160  cis     
-attribute pipstname                   2.16.840.1.113730.3.1.161  cis     
-attribute pipstquery                  2.16.840.1.113730.3.1.162  cis     
-attribute pipsttaxonomy               2.16.840.1.113730.3.1.163  cis     
-attribute pipstinterest               2.16.840.1.113730.3.1.164  cis     
-attribute pipsttype                   2.16.840.1.113730.3.1.165  cis     
-attribute pipstprivacy                2.16.840.1.113730.3.1.166  cis     
-attribute pipststatus                 2.16.840.1.113730.3.1.167  cis     
-attribute pipstlastcount              2.16.840.1.113730.3.1.168  cis     
-attribute pipsttotalcount             2.16.840.1.113730.3.1.169  cis     
-attribute pipsttotalrun               2.16.840.1.113730.3.1.170  cis     
-attribute pipstcategory               2.16.840.1.113730.3.1.171  cis     
-attribute pipstfrequency              2.16.840.1.113730.3.1.172  cis     
-attribute pipstmedium                 2.16.840.1.113730.3.1.173  cis     
-attribute pipstformat                 2.16.840.1.113730.3.1.174  cis     
-attribute pipsthour                   2.16.840.1.113730.3.1.175  cis     
-attribute pipstmaxhits                2.16.840.1.113730.3.1.176  cis     
-attribute pipstresultset              2.16.840.1.113730.3.1.177  cis     
-attribute pipstsortorder              2.16.840.1.113730.3.1.178  cis     
-attribute pipsttimestamp              2.16.840.1.113730.3.1.179  cis     
-attribute pipstirlist                 2.16.840.1.113730.3.1.180  cis     
-attribute pipstiroption               2.16.840.1.113730.3.1.181  cis     
-attribute pipreservedcis1             2.16.840.1.113730.3.1.182  cis     
-attribute pipreservedcis2             2.16.840.1.113730.3.1.183  cis     
-attribute pipreservedcis3             2.16.840.1.113730.3.1.184  cis     
-attribute pipreservedcis4             2.16.840.1.113730.3.1.185  cis     
-attribute pipreservedcis5             2.16.840.1.113730.3.1.186  cis     
-attribute pipreservedcis6             2.16.840.1.113730.3.1.187  cis     
-attribute pipreservedces1             2.16.840.1.113730.3.1.188  ces     
-attribute pipreservedces2             2.16.840.1.113730.3.1.189  ces     
-attribute pipreservedces3             2.16.840.1.113730.3.1.190  ces     
-
-
-# Each interest profile is one of these and sits under the compass SIE
-
-objectclass personalInterestProfile 
-		oid 2.16.840.1.113730.3.2.20
-        requires        
-                objectclass,
-		pipuid
-	allows
-		pipuniqueid,
-		pipstatus,
-		pipusertype,
-		pipfrequency,
-		pipmedium,
-		pipformat,
-		piphour,
-		pipmaxhits,
-		pipresultset,
-		pipsortorder,
-		piptimestamp,
-		pipirlist,
-		pipiroption,
-		pippwp,
-		piplastcount,
-		piptotalcount,
-		piptotalrun,
-		pipnotify,
-		pipprivilege,
-		pipgroup,
-		pipidstcount,
-		pipstid,
-		pipstname,
-		pipstquery,
-		pipsttaxonomy,
-		pipstinterest,
-		pipsttype,
-		pipstprivacy,
-		pipststatus,
-		pipstlastcount,
-		pipsttotalcount,
-		pipsttotalrun,
-		pipstcategory,
-		pipstfrequency,
-		pipstmedium,
-		pipstformat,
-		pipsthour,
-		pipstmaxhits,
-		pipstresultset,
-		pipstsortorder,
-		pipsttimestamp,
-		pipstirlist,
-		pipstiroption,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
-
-# Replication of user info for template users, completeness, etc.
-# (not currently used)
-
-objectclass PIPUserInfo
-		oid 2.16.840.1.113730.3.2.21
-        requires        
-                objectclass
-	allows
-		cn,
-		mail,
-		userPassword,
-		description,
-		pipcompassservers,
-		pipuniqueid
-
-
-# Enhancements to a normal user entry (not currently used)
-
-objectclass PIPUser
-	oid 2.16.840.1.113730.3.2.22		
-	requires        
-        objectclass
-	allows
-		pipuniqueid,
-		pipcompassservers,
-		pipreservedcis1,
-		pipreservedcis2,
-		pipreservedcis3,
-		pipreservedcis4,
-		pipreservedcis5,
-		pipreservedcis6,
-		pipreservedces1,
-		pipreservedces2,
-		pipreservedces3
-
diff --git a/ldap/cm/v4confs/412/ns-cos-schema.conf b/ldap/cm/v4confs/412/ns-cos-schema.conf
deleted file mode 100644
index abea53fd..00000000
--- a/ldap/cm/v4confs/412/ns-cos-schema.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Attributes used by Class of Service
-
-attribute cosAttribute 2.16.840.1.113730.3.1.550 cis
-attribute cosSpecifier 2.16.840.1.113730.3.1.551 cis
-attribute cosTargetTree 2.16.840.1.113730.3.1.552 cis
-attribute cosTemplateDn 2.16.840.1.113730.3.1.553 cis
-
-# Object classes used by Class of Service
-
-objectclass cosDefinition
-	oid 2.16.840.1.113730.3.2.84
-	superior top
-	requires
-		objectclass
-	allows
-		aci,
-		cn,
-		uid,
-		costargettree,
-		costemplatedn,
-		cosspecifier,
-		cosattribute
diff --git a/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
deleted file mode 100644
index 97764e52..00000000
--- a/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#############################################################
-# Delegated User Administration Attributes
-#############################################################
-
-attribute  nsNumUsers		2.16.840.1.113730.3.1.554	int	single
-attribute  nsMaxUsers		2.16.840.1.113730.3.1.555	int	single
-attribute  nsNumDepts		2.16.840.1.113730.3.1.556	int	single
-attribute  nsMaxDepts		2.16.840.1.113730.3.1.557	int	single
-attribute  nsNumMailLists	2.16.840.1.113730.3.1.558	int	single
-attribute  nsMaxMailLists	2.16.840.1.113730.3.1.559	int	single
-attribute  nsNumDomains		2.16.840.1.113730.3.1.560	int	single
-attribute  nsMaxDomains		2.16.840.1.113730.3.1.561	int	single
-attribute  nsDefaultMaxDeptSize	2.16.840.1.113730.3.1.562	int	single
-attribute  nsdaCapability	2.16.840.1.113730.3.1.563	cis
-attribute  nsSearchFilter	2.16.840.1.113730.3.1.564	cis	single
-attribute  nsdaModifiableBy	2.16.840.1.113730.3.1.565	dn
-attribute  memberOf         1.2.840.113556.1.2.102      dn
-attribute  nsDADomain       2.16.840.1.113730.3.1.600   cis     single
-attribute  adminRole        2.16.840.1.113730.3.1.601   cis
-
-#############################################################
-# Delegated User Administration Objectclasses
-#############################################################
-
-objectclass nsManagedISP
-	oid 2.16.840.1.113730.3.2.85
-	superior top
-	allows
-		nsNumDomains
-
-objectclass nsManagedDomain
-	oid 2.16.840.1.113730.3.2.86
-	superior top
-	allows
-		nsNumUsers,
-		nsMaxUsers,
-		nsNumDepts,
-		nsMaxDepts,
-		nsNumMailLists,
-		nsMaxMailLists,
-		nsNumDomains,
-		nsMaxDomains,
-		nsDefaultMaxDeptSize,
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedOrgUnit
-	oid 2.16.840.1.113730.3.2.87
-	superior top
-	allows
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedDept
-	oid 2.16.840.1.113730.3.2.88
-	superior groupOfUniqueNames
-	allows
-		nsNumUsers,
-		nsMaxUsers,
-		nsNumDepts,
-		nsMaxDepts,
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedFamilyGroup
-	oid 2.16.840.1.113730.3.2.89
-	superior top
-	allows
-		nsNumUsers,
-		nsMaxUsers,
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedMailList
-	oid 2.16.840.1.113730.3.2.90
-	superior top
-	allows
-		nsNumUsers,
-		nsMaxUsers,
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedPerson
-	oid 2.16.840.1.113730.3.2.91
-	superior top
-	allows
-		memberOf,
-		nsdaDomain,
-		nsdaCapability,
-		nsSearchFilter,
-		owner,
-		nsdaModifiableBy
-
-objectclass nsManagedDeptAdminGroup
-	oid 2.16.840.1.113730.3.2.111
-	superior top
-
-objectclass inetAdmin
-	oid 2.16.840.1.113730.3.2.112
-	superior top
-	allows
-		memberOf,
-		adminRole
-
-objectclass nsUniquenessDomain
-	oid 2.16.840.1.113730.3.2.115
-	superior top
diff --git a/ldap/cm/v4confs/412/ns-directory-globopt.conf b/ldap/cm/v4confs/412/ns-directory-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/412/ns-directory-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/412/ns-directory-schema.conf b/ldap/cm/v4confs/412/ns-directory-schema.conf
deleted file mode 100644
index ef4ed640..00000000
--- a/ldap/cm/v4confs/412/ns-directory-schema.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute	nsSecureServerPort 		cis
-
-objectclass netscapeDirectoryServer
-		oid 2.16.840.1.113730.3.2.23
-        requires        
-                objectclass
-
-objectclass nsDirectoryServer
-        requires
-                objectclass,
-                nsServerID
-        allows
-                serverHostName,
-                nsServerPort,
-                nsSecureServerPort,
-                nsBindPassword,
-                nsBindDN,
-                nsBaseDN
diff --git a/ldap/cm/v4confs/412/ns-legacy-schema.conf b/ldap/cm/v4confs/412/ns-legacy-schema.conf
deleted file mode 100644
index 43231314..00000000
--- a/ldap/cm/v4confs/412/ns-legacy-schema.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-attribute    url                    	cis
-
-#use by Netscape Admin Server 4.1 for LegacyServers
-
-objectclass nsLegacyAdminGroup
-	superior
-		nsAdminGroup
-	allows
-		adminUrl
-
-objectclass nsLegacyApplication
-	superior 
-	     nsApplication
-	allows 
-
-objectclass nsLegacyAdminServer
-        superior
-                nsAdminServer
-        allows
-
-objectclass nsLegacyServer 
-	superior 
-	     netscapeServer
-	allows 
-	     nsServerID,
-	     url
diff --git a/ldap/cm/v4confs/412/ns-mail-globopt.conf b/ldap/cm/v4confs/412/ns-mail-globopt.conf
deleted file mode 100644
index cf392ea4..00000000
--- a/ldap/cm/v4confs/412/ns-mail-globopt.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Messaging Server
-index	mailAlternateAddress	eq
-index	mailHost	eq
-#index	uid,mail	eq
-#index	uniquemember,member	eq
diff --git a/ldap/cm/v4confs/412/ns-mail-schema.conf b/ldap/cm/v4confs/412/ns-mail-schema.conf
deleted file mode 100644
index 8cfa0b76..00000000
--- a/ldap/cm/v4confs/412/ns-mail-schema.conf
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-attribute	mailAccessDomain	2.16.840.1.113730.3.1.12 cis
-attribute	mailAlternateAddress	2.16.840.1.113730.3.1.13 cis
-attribute	mailAutoReplyMode	2.16.840.1.113730.3.1.14 cis
-attribute	mailAutoReplyText	2.16.840.1.113730.3.1.15 cis
-attribute	mailDeliveryOption	2.16.840.1.113730.3.1.16 cis
-attribute	mailForwardingAddress	2.16.840.1.113730.3.1.17 cis
-attribute	mailHost		2.16.840.1.113730.3.1.18 cis
-attribute	mailQuota		2.16.840.1.113730.3.1.21 cis
-attribute	mailRoutingAddress      2.16.840.1.113730.3.1.47 cis
-
-attribute	mailMessageStore	2.16.840.1.113730.3.1.19 ces
-attribute	mailProgramDeliveryInfo	2.16.840.1.113730.3.1.20 ces
-
-attribute	nsmsgDisallowAccess	ces
-
-attribute	vacationstartdate	cis
-attribute	vacationenddate		cis
-
-# mailRecipient is used to designate an LDAP entry as representing some
-# entity that can receive mail, e.g. a mail user or mail group.
-# Note: attributes 'mailAccessDomain' through 'userPassword' do not
-# belong to mailRecipient, but are included here for backward compatibility.
-objectClass mailRecipient
-	oid 2.16.840.1.113730.3.2.3
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mailAccessDomain,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota,
-		multiLineDescription,
-		uid,
-		userPassword
-
-attribute	nswmExtendedUserPrefs	2.16.840.1.113730.3.1.520 cis
-
-# nsMessagingServerUser is used to designate an LDAP entry as representing a
-# Netscape Messaging Server user account.  It is used in combination with
-# mailRecipient.
-objectClass nsMessagingServerUser
-	oid 2.16.840.113730.3.2.37
-	requires
-		objectClass
-	allows
-		cn,
-		mailAccessDomain,
-		mailAutoReplyMode,
-		mailAutoReplyText,
-		mailDeliveryOption,
-		mailForwardingAddress,
-		mailMessageStore,
-		mailProgramDeliveryInfo,
-		mailQuota,
-		nsmsgDisallowAccess,
-		nswmExtendedUserPrefs,
-		vacationstartdate,
-		vacationenddate
-
-attribute	mgrpAllowedDomain	2.16.840.1.113730.3.1.23 cis
-attribute	mgrpMsgRejectAction	2.16.840.1.113730.3.1.28 cis
-attribute	mgrpRFC822MailMember	2.16.840.1.113730.3.1.30 cis
-attribute	mgrpMsgMaxSize		2.16.840.1.113730.3.1.32 cis single
-attribute	mgrpBroadcasterPolicy	cis
-attribute	mgrpNoDuplicateChecks	cis single
-attribute	mgrpRemoveHeader	cis
-
-attribute	mgrpAllowedBroadcaster	2.16.840.1.113730.3.1.22 ces
-attribute	mgrpDeliverTo		2.16.840.1.113730.3.1.25 ces
-attribute	mgrpErrorsTo		2.16.840.1.113730.3.1.26 ces single
-attribute	mgrpModerator		2.16.840.1.113730.3.1.33 ces
-attribute	mgrpMsgRejectText	2.16.840.1.113730.3.1.29 ces
-attribute	mgrpAddHeader		ces
-
-attribute	mgrpApprovePassword	ces single
-
-# mailGroup is used to designate an LDAP entry as representing a mail group
-# (mailing list).  It is used in combination with mailRecipient.
-# Note: attributes 'mail' through 'mailRoutingAddress' belong to mailRecipient,
-# but are also included here for backward compatibility.
-objectClass mailGroup
-	oid 2.16.840.1.113730.3.2.4
-	requires
-		objectClass
-	allows
-		cn,
-		mail,
-		mailAlternateAddress,
-		mailHost,
-		mailRoutingAddress,
-		mgrpAddHeader,
-		mgrpAllowedBroadcaster,
-		mgrpAllowedDomain,
-		mgrpApprovePassword,
-		mgrpBroadcasterPolicy,
-		mgrpDeliverTo,
-		mgrpErrorsTo,
-		mgrpModerator,
-		mgrpMsgMaxSize,
-		mgrpMsgRejectAction,
-		mgrpMsgRejectText,
-		mgrpNoDuplicateChecks,
-		mgrpRemoveHeader,
-		mgrpRFC822MailMember,
-		owner
-
-attribute	mailEnhancedUniqueMember	2.16.840.1.113730.3.1.31 dn
-
-objectClass groupOfMailEnhancedUniqueNames
-	oid 2.16.840.1.113730.3.2.5
-	requires
-		objectClass,
-		cn
-	allows
-		businessCategory,
-		description,
-		mailEnhancedUniqueMember,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectClass	netscapeMailServer
-	oid 2.16.840.1.113730.3.2.24
-	requires
-		objectClass
-
diff --git a/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
deleted file mode 100644
index a7e0be55..00000000
--- a/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# ns-mcd-browser-schema.conf
-#
-# Netscape Mission Control Desktop browser client schema
-# This schema is used to hold browser client preferences.
-#
-
-attribute nsBCStartupBrowser              2.16.840.1.113730.3.1.409  cis
-attribute nsBCStartupMail                 2.16.840.1.113730.3.1.410  cis
-attribute nsBCStartupEditor               2.16.840.1.113730.3.1.411  cis
-attribute nsBCStartupCalendar             2.16.840.1.113730.3.1.412  cis
-attribute nsBCChromeButtonStyle           2.16.840.1.113730.3.1.413  cis
-attribute nsBCUseDocumentFonts            2.16.840.1.113730.3.1.414  cis
-attribute nsBCForegroundColor             2.16.840.1.113730.3.1.415  cis
-attribute nsBCBackgroundColor             2.16.840.1.113730.3.1.416  cis
-attribute nsBCAnchorColor                 2.16.840.1.113730.3.1.417  cis
-attribute nsBCVisitedColor                2.16.840.1.113730.3.1.418  cis
-attribute nsBCUnderlineAnchors            2.16.840.1.113730.3.1.419  cis
-attribute nsBCUseDocumentColors           2.16.840.1.113730.3.1.420  cis
-attribute nsBCStartupPage                 2.16.840.1.113730.3.1.421  cis
-attribute nsBCStartupHomePage             2.16.840.1.113730.3.1.422  cis
-attribute nsBCLinkExpiration              2.16.840.1.113730.3.1.423  cis
-attribute nsBCIntlAcceptLanguages         2.16.840.1.113730.3.1.424  cis
-attribute nsBCMimeType                    2.16.840.1.113730.3.1.425  cis
-attribute nsBCMimeAllowAdd                2.16.840.1.113730.3.1.426  cis
-attribute nsBCMimeAllowEdit               2.16.840.1.113730.3.1.427  cis
-attribute nsBCMimeAllowRemove             2.16.840.1.113730.3.1.428  cis
-attribute nsBCRelatedEnabled              2.16.840.1.113730.3.1.429  cis
-attribute nsBCRelatedAutoload             2.16.840.1.113730.3.1.430  cis
-attribute nsBCRelatedDisabledForDomains   2.16.840.1.113730.3.1.431  cis
-attribute nsBCGoBrowsingEnabled           2.16.840.1.113730.3.1.432  cis
-attribute nsBCOfflineStartupState         2.16.840.1.113730.3.1.433  cis
-attribute nsBCOfflineSendUnsentMessages   2.16.840.1.113730.3.1.434  cis
-attribute nsBCOfflinePromptSynchOnExit    2.16.840.1.113730.3.1.435  cis
-attribute nsBCAlwaysLoadImages            2.16.840.1.113730.3.1.436  cis
-attribute nsBCEnableJava                  2.16.840.1.113730.3.1.437  cis
-attribute nsBCEnableJavaScript            2.16.840.1.113730.3.1.438  cis
-attribute nsBCEnableStyleSheets           2.16.840.1.113730.3.1.439  cis
-attribute nsBCEmailAsFtpPassword          2.16.840.1.113730.3.1.440  cis
-attribute nsBCCookieBehavior              2.16.840.1.113730.3.1.441  cis
-attribute nsBCWarnAboutCookies            2.16.840.1.113730.3.1.442  cis
-attribute nsBCMemoryCacheSize             2.16.840.1.113730.3.1.443  cis
-attribute nsBCDiskCacheSize               2.16.840.1.113730.3.1.444  cis
-attribute nsBCCheckDocFrequency           2.16.840.1.113730.3.1.445  cis
-attribute nsBCProxyType                   2.16.840.1.113730.3.1.446  cis
-attribute nsBCProxyHttp                   2.16.840.1.113730.3.1.447  cis
-attribute nsBCProxySsl                    2.16.840.1.113730.3.1.448  cis
-attribute nsBCProxyFtp                    2.16.840.1.113730.3.1.449  cis
-attribute nsBCProxySocks                  2.16.840.1.113730.3.1.450  cis
-attribute nsBCProxyGopher                 2.16.840.1.113730.3.1.451  cis
-attribute nsBCProxyWais                   2.16.840.1.113730.3.1.452  cis
-attribute nsBCNoProxiesOn                 2.16.840.1.113730.3.1.453  cis
-attribute nsBCProxyAutoConfigUrl          2.16.840.1.113730.3.1.454  cis
-attribute nsBCAutoUpdateEnabled           2.16.840.1.113730.3.1.455  cis
-attribute nsBCAutoUpdateConfirmInstall    2.16.840.1.113730.3.1.456  cis
-
-
-objectclass nsBrowserClient 
-	oid 2.16.840.1.113730.3.2.78
-    superior top 
-    allows 
-	nsBCStartupBrowser,
-	nsBCStartupMail,
-	nsBCStartupEditor,
-	nsBCStartupCalendar,
-	nsBCChromeButtonStyle,
-	nsBCUseDocumentFonts,
-	nsBCForegroundColor,
-	nsBCBackgroundColor,
-	nsBCAnchorColor,
-	nsBCVisitedColor,
-	nsBCUnderlineAnchors,
-	nsBCUseDocumentColors,
-	nsBCStartupPage,
-	nsBCStartupHomePage,
-	nsBCLinkExpiration,
-	nsBCIntlAcceptLanguages,
-	nsBCMimeType,
-	nsBCMimeAllowAdd,
-	nsBCMimeAllowEdit,
-	nsBCMimeAllowRemove,
-	nsBCRelatedEnabled,
-	nsBCRelatedAutoload,
-	nsBCRelatedDisabledForDomains,
-	nsBCGoBrowsingEnabled,
-	nsBCOfflineStartupState,
-	nsBCOfflineSendUnsentMessages,
-	nsBCOfflinePromptSynchOnExit,
-	nsBCAlwaysLoadImages,
-	nsBCEnableJava,
-	nsBCEnableJavaScript,
-	nsBCEnableStyleSheets,
-	nsBCEmailAsFtpPassword,
-	nsBCCookieBehavior,
-	nsBCWarnAboutCookies,
-	nsBCMemoryCacheSize,
-	nsBCDiskCacheSize,
-	nsBCCheckDocFrequency,
-	nsBCProxyType,
-	nsBCProxyHttp,
-	nsBCProxySsl,
-	nsBCProxyFtp,
-	nsBCProxySocks,
-	nsBCProxyGopher,
-	nsBCProxyWais,
-	nsBCNoProxiesOn,
-	nsBCProxyAutoConfigUrl,
-	nsBCAutoUpdateEnabled,
-	nsBCAutoUpdateConfirmInstall
-
-# 
-# Netscape Mission Control Desktop browser security schema
-# This schema is used to hold browser security preferences.
-#
-
-attribute nsBSAskForPassword              2.16.840.1.113730.3.1.457  cis
-attribute nsBSPasswordLifetime            2.16.840.1.113730.3.1.458  cis
-attribute nsBSWarnEnteringSecure          2.16.840.1.113730.3.1.459  cis
-attribute nsBSWarnLeavingSecure           2.16.840.1.113730.3.1.460  cis
-attribute nsBSWarnViewingMixed            2.16.840.1.113730.3.1.461  cis
-attribute nsBSWarnSubmitInsecure          2.16.840.1.113730.3.1.462  cis
-attribute nsBSEnableSsl2                  2.16.840.1.113730.3.1.463  cis
-attribute nsBSEnableSsl3                  2.16.840.1.113730.3.1.464  cis
-attribute nsBSCertmgmtDisableFunctionMsg  2.16.840.1.113730.3.1.465  cis
-attribute nsBSSsl2Rc4128                  2.16.840.1.113730.3.1.466  cis
-attribute nsBSSsl2Rc2128                  2.16.840.1.113730.3.1.467  cis
-attribute nsBSSsl2DesEd3192               2.16.840.1.113730.3.1.468  cis
-attribute nsBSSsl2Des64                   2.16.840.1.113730.3.1.469  cis
-attribute nsBSSsl2Rc440                   2.16.840.1.113730.3.1.470  cis
-attribute nsBSSsl2Rc240                   2.16.840.1.113730.3.1.471  cis
-attribute nsBSSsl3RsaRc4128Md5            2.16.840.1.113730.3.1.472  cis
-attribute nsBSSsl3FipsDesEd3Sha           2.16.840.1.113730.3.1.473  cis
-attribute nsBSSsl3RsaRc4128Md5            2.16.840.1.113730.3.1.474  cis
-attribute nsBSSsl3RsaFipsDesSha           2.16.840.1.113730.3.1.475  cis
-attribute nsBSSsl3RsaDesSha               2.16.840.1.113730.3.1.476  cis
-attribute nsBSSsl3RsaRc440Md5             2.16.840.1.113730.3.1.477  cis
-attribute nsBSSsl3RsaRc240Md5             2.16.840.1.113730.3.1.478  cis
-attribute nsBSSsl3RsaNullMd5              2.16.840.1.113730.3.1.479  cis
-attribute nsBSSsl3FortezzaFortezzaSha     2.16.840.1.113730.3.1.480  cis
-attribute nsBSSsl3FortezzaRc4Sha          2.16.840.1.113730.3.1.481  cis
-
-
-objectclass nsBrowserSecurity
-	oid 2.16.840.1.113730.3.2.79
-    superior top 
-    allows 
-	nsBSAskForPassword,
-	nsBSPasswordLifetime,
-	nsBSWarnEnteringSecure,
-	nsBSWarnLeavingSecure,
-	nsBSWarnViewingMixed,
-	nsBSWarnSubmitInsecure,
-	nsBSEnableSsl2,
-	nsBSEnableSsl3,
-	nsBSCertmgmtDisableFunctionMsg,
-	nsBSSsl2Rc4128,
-	nsBSSsl2Rc2128,
-	nsBSSsl2DesEd3192,
-	nsBSSsl2Des64,
-	nsBSSsl2Rc440,
-	nsBSSsl2Rc240,
-	nsBSSsl3RsaRc4128Md5,
-	nsBSSsl3FipsDesEd3Sha,
-	nsBSSsl3RsaRc4128Md5,
-	nsBSSsl3RsaFipsDesSha,
-	nsBSSsl3RsaDesSha,
-	nsBSSsl3RsaRc440Md5,
-	nsBSSsl3RsaRc240Md5,
-	nsBSSsl3RsaNullMd5,
-	nsBSSsl3FortezzaFortezzaSha,
-	nsBSSsl3FortezzaRc4Sha
-
diff --git a/ldap/cm/v4confs/412/ns-mcd-config-schema.conf b/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
deleted file mode 100644
index 2eeb6856..00000000
--- a/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# 
-# ns-mcd-config-schema.conf
-# 
-# Netscape Mission Control Desktop schema
-# This schema is used to set MCD "config()" preferences.
-#
-
-attribute nsMcdUserAgent                 2.16.840.1.113730.3.1.482  cis
-attribute nsMcdUseXSender                2.16.840.1.113730.3.1.483  cis
-attribute nsMcdToolbarLogoUrl            2.16.840.1.113730.3.1.484  cis
-attribute nsMcdToolbarLogoWinSmallFile   2.16.840.1.113730.3.1.485  cis
-attribute nsMcdToolbarLogoWinLargeFile   2.16.840.1.113730.3.1.486  cis
-attribute nsMcdToolbarLogoFrames         2.16.840.1.113730.3.1.487  cis
-attribute nsMcdMacAnimationFile          2.16.840.1.113730.3.1.488  cis
-attribute nsMcdXAnimationFile            2.16.840.1.113730.3.1.489  cis
-attribute nsMcdNetSearchUrl              2.16.840.1.113730.3.1.490  cis
-attribute nsMcdMoreInfoPluginUrl         2.16.840.1.113730.3.1.491  cis
-attribute nsMcdAutoAdminConfigUrl        2.16.840.1.113730.3.1.492  cis
-attribute nsMcdAutoAdminAppendEmail      2.16.840.1.113730.3.1.493  cis
-attribute nsMcdAutoAdminRefreshInterval  2.16.840.1.113730.3.1.494  cis
-attribute nsMcdUseGuideButton            2.16.840.1.113730.3.1.495  cis
-attribute nsMcdGuideButtonProperties     2.16.840.1.113730.3.1.496  cis
-attribute nsMcdGuideMenuProperties       2.16.840.1.113730.3.1.497  cis
-attribute nsMcdHelpMenuProperties        2.16.840.1.113730.3.1.498  cis
-
-
-objectclass nsMcdConfig
-	oid 2.16.840.1.113730.3.2.80
-    superior top 
-    allows 
-	nsMcdUserAgent,
-	nsMcdUseXSender,
-	nsMcdToolbarLogoUrl,
-	nsMcdToolbarLogoWinSmallFile,
-	nsMcdToolbarLogoWinLargeFile,
-	nsMcdToolbarLogoFrames,
-	nsMcdMacAnimationFile,
-	nsMcdXAnimationFile,
-	nsMcdNetSearchUrl,
-	nsMcdMoreInfoPluginUrl,
-	nsMcdAutoAdminConfigUrl,
-	nsMcdAutoAdminAppendEmail,
-	nsMcdAutoAdminRefreshInterval,
-	nsMcdUseGuideButton,
-	nsMcdGuideButtonProperties,
-	nsMcdGuideMenuProperties,
-	nsMcdHelpMenuProperties
-	
diff --git a/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
deleted file mode 100644
index 290c9062..00000000
--- a/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Index required by Mission Control Desktop: Location Independence
-index nsLIProfileName eq
diff --git a/ldap/cm/v4confs/412/ns-mcd-li-schema.conf b/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
deleted file mode 100644
index 82034846..00000000
--- a/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# ns-mcd-li-schema.conf
-#
-# Netscape Mission Control Desktop Location Independence schema
-#
-
-attribute nsLIPtrURL           2.16.840.1.113730.3.1.399        ces           
-attribute nsLIPrefs            2.16.840.1.113730.3.1.400        ces 
-attribute nsLIProfileName      2.16.840.1.113730.3.1.401        cis         
-attribute nsLIData             2.16.840.1.113730.3.1.402        bin 
-attribute nsLIElementType      2.16.840.1.113730.3.1.403        cis        
-attribute nsLIServerType       2.16.840.1.113730.3.1.404        cis
-attribute nsLIVersion          2.16.840.1.113730.3.1.405        int
-
-objectclass nsLIPtr
-	oid 2.16.840.1.113730.3.2.74
-	requires
-		objectclass
-	allows
-		nsliptrurl,
-		owner
-
-objectclass nsLIProfile
-	oid  2.16.840.1.113730.3.2.75
-	requires
-		objectclass,
-		nsliprofilename
-	allows
-		nsliprefs,
-		uid,
-		owner
-
-objectclass nsLIProfileElement
-	oid  2.16.840.1.113730.3.2.76
-	requires
-		objectclass,
-		nslielementtype
-	allows
-		owner,
-		nslidata,
-		nsliversion
-
-objectclass nsLIServer
-	oid  2.16.840.1.113730.3.2.77
-	requires
-		objectclass,
-		serverhostname
-	allows
-		description,
-		cn,
-		nsserverport,
-		nsliservertype,
-		serverroot
diff --git a/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
deleted file mode 100644
index b232563f..00000000
--- a/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
+++ /dev/null
@@ -1,251 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# 
-# ns-mcd-mail-schema.conf
-# 
-# Netscape Mission Control Desktop mail client schema
-# This schema is used to hold mail client preferences.
-#
-
-attribute nsMCHTMLCompose								2.16.840.1.113730.3.1.331		 cis
-attribute nsMCDefaultHTMLAction							2.16.840.1.113730.3.1.332		 cis
-attribute nsMCRequestReturnReceipt						2.16.840.1.113730.3.1.333		 cis
-attribute nsMCIncorporateReturnReceipt					2.16.840.1.113730.3.1.334		 cis
-attribute nsMCMDNReportEnabled							2.16.840.1.113730.3.1.335		 cis
-attribute nsMCMDNReportNotInToCC						2.16.840.1.113730.3.1.336		 cis
-attribute nsMCMDNReportOutsideDomain					2.16.840.1.113730.3.1.337		 cis
-attribute nsMCMDNReportOther							2.16.840.1.113730.3.1.338		 cis
-attribute nsMCForwardMessageMode						2.16.840.1.113730.3.1.339		 cis
-attribute nsMCAutoQuote									2.16.840.1.113730.3.1.340		 cis
-attribute nsMCReplyOnTop								2.16.840.1.113730.3.1.341		 cis
-attribute nsMCSpellCheckBeforeSend						2.16.840.1.113730.3.1.342		 cis
-attribute nsMCWrapLongLines								2.16.840.1.113730.3.1.343		 cis
-attribute nsMCWrapLength								2.16.840.1.113730.3.1.344		 cis
-attribute nsMCStrictlyMime								2.16.840.1.113730.3.1.345		 cis
-attribute nsMCAutoCompleteUseAddressBooks				2.16.840.1.113730.3.1.346		 cis
-attribute nsMCAutoCompleteUseDirectory					2.16.840.1.113730.3.1.347		 cis
-attribute nsMCAutoCompleteEnabledServerName				2.16.840.1.113730.3.1.348		 cis
-attribute nsMCAutoCompleteShowDlgForMultipleMatches     2.16.840.1.113730.3.1.349		 cis
-attribute nsMCSkipDirectoryIfLocalMatchFound			2.16.840.1.113730.3.1.350		 cis
-attribute nsMCAddrBookLastnameFirst						2.16.840.1.113730.3.1.351		 cis
-attribute nsMCLimitMessageSize							2.16.840.1.113730.3.1.352		 cis
-attribute nsMCMaxMessageSize							2.16.840.1.113730.3.1.353		 cis
-attribute nsMCPromptPurgeThreshold     	      	      	2.16.840.1.113730.3.1.354		 cis
-attribute nsMCPurgeThreshold							2.16.840.1.113730.3.1.355		 cis
-attribute nsMCNewsKeepMethod							2.16.840.1.113730.3.1.356		 cis
-attribute nsMCNewsKeepDays								2.16.840.1.113730.3.1.357		 cis
-attribute nsMCNewsKeepCount								2.16.840.1.113730.3.1.358		 cis
-attribute nsMCNewsKeepOnlyUnread						2.16.840.1.113730.3.1.359		 cis
-attribute nsMCNewsRemoveBodiesByAge						2.16.840.1.113730.3.1.360		 cis
-attribute nsMCNewsRemoveBodiesDays						2.16.840.1.113730.3.1.361		 cis
-attribute nsMCSmtpServer								2.16.840.1.113730.3.1.362		 cis
-attribute nsMCSmtpUserName								2.16.840.1.113730.3.1.363		 cis
-attribute nsMCSmtpUseSSL								2.16.840.1.113730.3.1.364		 cis
-attribute nsMCImapServer								2.16.840.1.113730.3.1.365		 cis
-attribute nsMCImapServerProperties						2.16.840.1.113730.3.1.366		 cis
-attribute nsMCPopServer									2.16.840.1.113730.3.1.367		 cis
-attribute nsMCPopServerProperties						2.16.840.1.113730.3.1.368		 cis
-attribute nsMCLdapServer								2.16.840.1.113730.3.1.369		 cis
-attribute nsMCLdapServerProperties						2.16.840.1.113730.3.1.370		 cis
-attribute nsMCQuotedStyle								2.16.840.1.113730.3.1.371		 cis
-attribute nsMCQuotedSize								2.16.840.1.113730.3.1.372		 cis
-attribute nsMCCitationColor								2.16.840.1.113730.3.1.373		 cis
-attribute nsMCFixedWidthMessages						2.16.840.1.113730.3.1.374		 cis
-attribute nsMCPlaySound									2.16.840.1.113730.3.1.375		 cis
-attribute nsMCRememberSelectedMessage					2.16.840.1.113730.3.1.376		 cis
-attribute nsMCReuseMessageWindow						2.16.840.1.113730.3.1.377		 cis
-attribute nsMCConfirmMoveFoldersToTrash					2.16.840.1.113730.3.1.378		 cis
-attribute nsMCUseMapiServer								2.16.840.1.113730.3.1.379		 cis
-attribute nsMCNewsTimeout								2.16.840.1.113730.3.1.380		 cis
-attribute nsMCNavCrossesFolders							2.16.840.1.113730.3.1.381		 cis
-attribute nsMCSearchServer								2.16.840.1.113730.3.1.382		 cis
-attribute nsMCSearchSubFolders							2.16.840.1.113730.3.1.383		 cis
-attribute nsMCEncryptOutgoingMail						2.16.840.1.113730.3.1.384		 cis
-attribute nsMCCryptoSignOutgoingMail					2.16.840.1.113730.3.1.385		 cis
-attribute nsMCCryptoSignOutgoingNews					2.16.840.1.113730.3.1.386		 cis
-attribute nsMCWarnForwardEncrypted						2.16.840.1.113730.3.1.387		 cis
-attribute nsMCWarnReplyUnencrypted						2.16.840.1.113730.3.1.388		 cis
-attribute nsMCAllowAtSignInUserName						2.16.840.1.113730.3.1.389		 cis
-attribute nsMCReceiptRequestHeaderType					2.16.840.1.113730.3.1.390		 cis
-attribute nsMCPop3GetsNewMail							2.16.840.1.113730.3.1.391		 cis
-attribute nsMCImapAutoSubscribeOnOpen					2.16.840.1.113730.3.1.392		 cis
-attribute nsMCImapMimePartsOnDemand						2.16.840.1.113730.3.1.393		 cis
-attribute nsMCImapMimePartsOnDemandThreshold			2.16.840.1.113730.3.1.394		 cis
-attribute nsMCUseAltMail								2.16.840.1.113730.3.1.395		 cis
-attribute nsMCAltMailDll								2.16.840.1.113730.3.1.396		 cis
-attribute nsMCUseAltMailForNews							2.16.840.1.113730.3.1.397		 cis
-attribute nsPrefMap		     					     	2.16.840.1.113730.3.1.398		 cis	 
-attribute nsMCAuthLogin			                        2.16.840.1.113730.3.1.499        cis
-attribute nsMNCNavCrossesFolders	                    2.16.840.1.113730.3.1.500        cis
-attribute nsMNCMessageInThreadWindow	                2.16.840.1.113730.3.1.501        cis
-attribute nsMCAllowAtSignInUserName	                    2.16.840.1.113730.3.1.502        cis
-attribute nsMCImapOnlineDraftSent	                    2.16.840.1.113730.3.1.503        cis
-attribute nsMCCustomHeaders		                        2.16.840.1.113730.3.1.504        cis
-attribute nsMCHtmlDomains		                        2.16.840.1.113730.3.1.505        cis
-attribute nsMNCForceAsciiSearch		                    2.16.840.1.113730.3.1.506        cis
-attribute nsMCAddrBookLdapDisabled	                    2.16.840.1.113730.3.1.507        cis
-attribute nsMNCReuseThreadWindow	                    2.16.840.1.113730.3.1.508        cis
-attribute nsMCShowHeaders		                        2.16.840.1.113730.3.1.509        cis
-attribute nsMCIdentityDefaultdomain	                    2.16.840.1.113730.3.1.510       cis
-
-
-
-
-objectclass nsMailClient
-	oid 2.16.840.1.113730.3.2.72 
-    superior top 
-    allows 
-	 nsMCHTMLCompose, 
-	 nsMCDefaultHTMLAction, 
-	 nsMCRequestReturnReceipt, 
-	 nsMCIncorporateReturnReceipt, 
-	 nsMCMDNReportEnabled, 
-	 nsMCMDNReportNotInToCC, 
-	 nsMCMDNReportOutsideDomain, 
-	 nsMCMDNReportOther, 
-	 nsMCForwardMessageMode, 
-	 nsMCAutoQuote, 
-	 nsMCReplyOnTop,
-  	 nsMCSpellCheckBeforeSend,
-	 nsMCWrapLongLines, 
-	 nsMCWrapLength, 
-	 nsMCStrictlyMime,
-	 nsMCAutoCompleteUseAddressBooks,
-	 nsMCAutoCompleteUseDirectory,
-	 nsMCAutoCompleteEnabledServerName,
-	 nsMCAutoCompleteShowDlgForMultipleMatches,
-	 nsMCSkipDirectoryIfLocalMatchFound,
-	 nsMCAddrBookLastnameFirst,
-	 nsMCLimitMessageSize,
-	 nsMCMaxMessageSize,
-	 nsMCPromptPurgeThreshold,
-	 nsMCPurgeThreshold,
-	 nsMCNewsKeepMethod,
-	 nsMCNewsKeepDays,
-	 nsMCNewsKeepCount,
-	 nsMCNewsKeepOnlyUnread,
-	 nsMCNewsRemoveBodiesByAge,
-	 nsMCNewsRemoveBodiesDays,
-	 nsMCSmtpServer,
-	 nsMCSmtpUserName,
-	 nsMCSmtpUseSSL,
-	 nsMCImapServer,
-	 nsMCImapServerProperties,
-	 nsMCPopServer,
-	 nsMCPopServerProperties, 
-	 nsMCLdapServer,
-	 nsMCLdapServerProperties,
-	 nsMCQuotedStyle,
-	 nsMCQuotedSize,
-	 nsMCCitationColor,
-	 nsMCFixedWidthMessages,
-	 nsMCPlaySound,
-	 nsMCRememberSelectedMessage,
-	 nsMCReuseMessageWindow,
-	 nsMCConfirmMoveFoldersToTrash,
-	 nsMCUseMapiServer,
-	 nsMCNewsTimeout,
-	 nsMCNavCrossesFolders,
-	 nsMCSearchServer,
-	 nsMCSearchSubFolders,
- 	 nsMCEncryptOutgoingMail,
-	 nsMCCryptoSignOutgoingMail,
-	 nsMCCryptoSignOutgoingNews,
-	 nsMCWarnForwardEncrypted,
-	 nsMCWarnReplyUnencrypted,
-	 nsMCAllowAtSignInUserName,
-	 nsMCReceiptRequestHeaderType,
-	 nsMCPop3GetsNewMail,
-	 nsMCImapAutoSubscribeOnOpen,
-	 nsMCImapMimePartsOnDemand,
-	 nsMCImapMimePartsOnDemandThreshold,
-	 nsMCUseAltMail,
-	 nsMCAltMailDll,
-	 nsMCUseAltMailForNews,
-	 nsMCAuthLogin,
-	 nsMNCNavCrossesFolders,
-	 nsMNCMessageInThreadWindow,
-	 nsMCAllowAtSignInUserName,
-	 nsMCImapOnlineDraftSent,
-	 nsMCCustomHeaders,
-	 nsMCHtmlDomains,
-	 nsMNCForceAsciiSearch,
-	 nsMCAddrBookLdapDisabled,
-	 nsMNCReuseThreadWindow,
-	 nsMCShowHeaders,
-	 nsMCIdentityDefaultdomain
-	 
-
-# 
-# Netscape Mission Control Desktop Messenger security schema
-# This schema is used to hold Messenger security preferences.
-#
-
-attribute nsMSEncryptOutgoingMail		2.16.840.1.113730.3.1.511 cis
-attribute nsMSSignOutgoingMail			2.16.840.1.113730.3.1.512 cis
-attribute nsMSSignOutgoingNews			2.16.840.1.113730.3.1.513 cis
-attribute nsMSSmimeDesEde3			    2.16.840.1.113730.3.1.514 cis
-attribute nsMSSmimeRc2128			    2.16.840.1.113730.3.1.515 cis
-attribute nsMSSmimeDes				    2.16.840.1.113730.3.1.516 cis
-attribute nsMSSmimeRc264			    2.16.840.1.113730.3.1.517 cis
-attribute nsMSSmimeRc240			    2.16.840.1.113730.3.1.518 cis
-attribute nsMSSmimeFortezza			    2.16.840.1.113730.3.1.519 cis
-
-objectclass nsMailSecurity
-	oid  2.16.840.1.113730.3.2.81
-    superior top 
-    allows 
-	nsMSEncryptOutgoingMail,
-	nsMSSignOutgoingMail,
-	nsMSSignOutgoingNews,
-	nsMSSmimeDesEde3,
-	nsMSSmimeRc2128,
-	nsMSSmimeDes,
-	nsMSSmimeRc264,
-	nsMSSmimeRc240,
-	nsMSSmimeFortezza
-
-objectclass netscapePreferenceMap 
-    oid 2.16.840.1.113730.3.2.73
-    superior top 
-	allows
-	  	nsPrefMap,
-		uid
-
diff --git a/ldap/cm/v4confs/412/ns-media-globopt.conf b/ldap/cm/v4confs/412/ns-media-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/412/ns-media-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/412/ns-media-schema.conf b/ldap/cm/v4confs/412/ns-media-schema.conf
deleted file mode 100644
index 01b2cf95..00000000
--- a/ldap/cm/v4confs/412/ns-media-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeMediaServer
-		oid 2.16.840.1.113730.3.2.25
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v4confs/412/ns-mlm-schema.conf b/ldap/cm/v4confs/412/ns-mlm-schema.conf
deleted file mode 100644
index bb604b03..00000000
--- a/ldap/cm/v4confs/412/ns-mlm-schema.conf
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#
-# LDAP object classes used by MLM
-#
-
-attribute	mgmemMemberOfGroup		cis
-attribute	mgmemRefDN			ces  single
-attribute	mgmemMailUserPassword		bin  single
-attribute	mgmemGroupMemberParam		ces
-attribute	mgmemGroupServerParam		ces
-
-attribute	mgmanJoinability		ces
-attribute	mgmanJoinLocalType		cis  single
-attribute	mgmanMemberVisibility		ces
-attribute	mgmanIntroText			ces  single
-attribute	mgmanGroupStat			ces
-attribute	mgmanHidden			cis  single
-attribute	mgmanGroupKey			cis  single
-attribute	mgmanAllowSubscribe		cis
-attribute	mgmanDenySubscribe		cis
-
-attribute	mgmanGConfNewGroupParent	dn   single
-attribute	mgmanGConfRemoteUserParent	dn   single
-attribute	mgmanGConfSearchBase		dn   single
-attribute	mgmanGConfGroupCreationUser	dn
-attribute	mgmanGConfSearchGroupUser	dn
-attribute	mgmanGConfAdmin			dn
-attribute	mgmanGConfGroupTemplate		dn   single
-attribute	mgmanGConfDefaultInheritance	cis
-attribute	mgmanGConfKey			cis
-attribute	mgmanGConfSearchAttribute	cis
-attribute	mgmanGConfSearchRelationship	cis
-attribute	mgmanGConfSearchTreeNode	cis
-attribute	mgmanGConfSortAttributeDirMembers	cis
-attribute	mgmanGConfSortAttributeGroupMembers	cis
-attribute	mgmanGConfGroupDomains		dn
-
-
-objectClass mailGroupMember
-	requires
-		objectClass,
-		mail
-	allows
-		mgmemMemberOfGroup,
-		mgmemRefDN,
-		preferredLanguage,
-		userCertificate,
-		mgmemMailUserPassword,
-		mgmemGroupMemberParam,
-		mgmemGroupServerParam,
-		c,
-		cn,
-		sn,
-		givenName
-
-
-objectClass mailGroupManagement
-	requires
-		objectClass
-	allows
-		description,
-		labeledURL,
-		mgmanAllowSubscribe,
-		mgmanDenySubscribe,
-		mgmanGroupKey,
-		mgmanGroupStat,
-		mgmanHidden,
-		mgmanIntroText,
-		mgmanJoinability,
-		mgmanJoinLocalType,
-		mgmanMemberVisibility,
-		multilineDescription,
-		userCertificate,
-		userPassword
-
-objectClass mailGroupManagement_GlobalConfig
-	requires
-		objectClass
-	allows
-		cn,
-		mgmanGConfAdmin,
-		mgmanGConfDefaultInheritance,
-		mgmanGConfGroupCreationUser,
-		mgmanGConfGroupDomains,
-		mgmanGConfGroupTemplate,
-		mgmanGConfKey,
-		mgmanGConfNewGroupParent,
-		mgmanGConfRemoteUserParent,
-		mgmanGConfSearchAttribute,
-		mgmanGConfSearchBase,
-		mgmanGConfSearchGroupUser,
-		mgmanGConfSearchRelationship,
-		mgmanGConfSearchTreeNode,
-		mgmanGConfSortAttributeDirMembers,
-		mgmanGConfSortAttributeGroupMembers
-
diff --git a/ldap/cm/v4confs/412/ns-msg-schema.conf b/ldap/cm/v4confs/412/ns-msg-schema.conf
deleted file mode 100644
index 25712bf7..00000000
--- a/ldap/cm/v4confs/412/ns-msg-schema.conf
+++ /dev/null
@@ -1,743 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#used by Netscape Messaging Server 4.0
-#
-#
-attribute	nsmsgaccounturl	cis
-attribute	nsmsgadddeliveredto	cis
-attribute	nsmsgaddheaders	cis
-attribute	nsmsgadmins	cis
-attribute	nsmsgalias		cis
-attribute	nsmsgallowadminproxy	cis
-attribute	nsmsgallowanonymouslogin	cis
-attribute	nsmsgallowbarelf	cis
-attribute	nsmsgallowbdat	cis
-attribute	nsmsgallowehlo	cis
-attribute	nsmsgallowetrn	cis
-attribute	nsmsgallowexpn	cis
-attribute	nsmsgallowhelp	cis
-attribute	nsmsgallowonex	cis
-attribute	nsmsgallowsize	cis
-attribute	nsmsgallowverb	cis
-attribute	nsmsgallowvrfy	cis
-attribute	nsmsgaltqueues	cis
-attribute	nsmsgalwaysqueue	cis
-attribute	nsmsgauthcachesize	cis
-attribute	nsmsgauthcachettl	cis
-attribute	nsmsgauthmaildomain	cis
-attribute	nsmsgbanner	cis
-attribute	nsmsgbinarypath	cis
-attribute	nsmsgbuffersize	cis
-attribute	nsmsgcheckdeferredqueue	cis
-attribute	nsmsgcleanupage		cis
-attribute	nsmsgclearcontrolinterval	cis
-attribute	nsmsgclearcontrolsafetime	cis
-attribute	nsmsgcollectiondeltatime	cis
-attribute	nsmsgconfigversion		cis
-attribute	nsmsgcontact		cis
-attribute	nsmsgcounterdeltatime	cis
-attribute	nsmsgdbcachesize	cis
-attribute	nsmsgdbtmpdir	cis
-attribute	nsmsgdefaultacl	cis
-attribute	nsmsgdefaultdomain	cis
-attribute	nsmsgdefaultecho	cis
-attribute	nsmsgdefaultgid	cis
-attribute	nsmsgdefaultmailboxquota	cis
-attribute	nsmsgdefaultoverquota	cis
-attribute	nsmsgdefaultpartition	cis
-attribute	nsmsgdefaultreply	cis
-attribute	nsmsgdefaultuid	cis
-attribute	nsmsgdefaultvacation	cis
-attribute	nsmsgdeferredperiod	cis
-attribute	nsmsgdeleteheaders	cis
-attribute	nsmsgdescription		cis
-attribute	nsmsgdiskflushinterval		cis
-attribute	nsmsgdnsresolveclient	cis
-attribute	nsmsgdocanonicalize	cis
-attribute	nsmsgdoclientdnslookup	cis
-attribute	nsmsgdodsn	cis
-attribute	nsmsgdoetrn	cis
-attribute	nsmsgdomainallowed	cis
-attribute	nsmsgdomainlangtable	cis
-attribute	nsmsgdomainname	cis
-attribute	nsmsgdomainnotallowed	cis
-attribute	nsmsgdomainsecurity	cis
-attribute	nsmsgdorewritefromusingauth	cis
-attribute	nsmsgdorewritesenderusingauth	cis
-attribute	nsmsgenable		cis
-attribute	nsmsgenablesslport	cis
-attribute	nsmsgenveloperewritemethod	cis
-attribute	nsmsgexclusive	cis
-attribute	nsmsgexpirestart	cis
-attribute	nsmsgexpirytime	cis
-attribute	nsmsgexternalmxserverip	cis
-attribute	nsmsgfallbacksearchmethod	cis
-attribute	nsmsgfilemode	cis
-attribute	nsmsgfilterurl	cis
-attribute	nsmsgflushinterval	cis
-attribute	nsmsgfolderpattern	cis
-attribute	nsmsgfoldersizebytes	cis
-attribute	nsmsgfolderurl	cis
-attribute	nsmsgforeignpercentaddr	cis
-attribute	nsmsgformsigkey	cis
-attribute	nsmsghidehostname	cis
-attribute	nsmsghopcountexceedactions	cis
-attribute	nsmsghostoncommandline	cis
-attribute	nsmsghostrewrites	cis
-attribute	nsmsgidletimeout	cis
-attribute	nsmsgipsecurity	cis
-attribute	nsmsginstalledlanguages	cis
-attribute	nsmsginternalmxserverip	cis
-attribute	nsmsgldapmemcache	cis
-attribute	nsmsgldapmemcachesize	cis
-attribute	nsmsgldapmemcachettl	cis
-attribute	nsmsgldappoolsize	cis
-attribute	nsmsgldaputilconfig	cis
-attribute	nsmsglistenaddr	cis
-attribute	nsmsglistenq	cis
-attribute	nsmsglisturl	cis
-attribute	nsmsglocaldefaultmaxruncount	cis
-attribute	nsmsglocaldefaultminruncount	cis
-attribute	nsmsglocalmaildomains	cis
-attribute	nsmsglocation		cis
-attribute	nsmsglog	cis
-attribute	nsmsglogdir	cis
-attribute	nsmsgloglevel	cis
-attribute	nsmsglogtype		cis
-attribute	nsmsgmaildeliveryprogram	cis
-attribute	nsmsgmasterhost	cis
-attribute	nsmsgmasterport	cis
-attribute	nsmsgmaxbadcommands	cis
-attribute	nsmsgmaxbranches	cis
-attribute	nsmsgmaxcontrolrecipients cis
-attribute	nsmsgmaxcputime	cis
-attribute	nsmsgmaxerrorobjectsize	cis
-attribute	nsmsgmaxheaderlines	cis
-attribute	nsmsgmaxlogfiles	cis
-attribute	nsmsgmaxlogfilesize	cis
-attribute	nsmsgmaxlogsize	cis
-attribute	nsmsgmaxmessagesize	cis
-attribute	nsmsgmaxmtahops	cis
-attribute	nsmsgmaxpostsize	cis
-attribute	nsmsgmaxqueuetime	cis
-attribute	nsmsgmaxruncount	cis
-attribute	nsmsgmaxruncountdeferred	cis
-attribute	nsmsgmaxscriptsize	cis
-attribute	nsmsgmaxsessions	cis
-attribute	nsmsgmaxstateobjectsize	cis
-attribute	nsmsgmaxthreads	cis
-attribute	nsmsgmessagecount	cis
-attribute	nsmsgmessagedays	cis
-attribute	nsmsgmessagehostname	cis
-attribute	nsmsgmessagesize	cis
-attribute	nsmsgmessagesizedays	cis
-attribute	nsmsgminfreediskspace	cis
-attribute	nsmsgminruncount	cis
-attribute	nsmsgmsgalarmdescription	cis
-attribute	nsmsgmsgalarmnoticehost	cis
-attribute	nsmsgmsgalarmnoticeport	cis
-attribute	nsmsgmsgalarmnoticercpt	cis
-attribute	nsmsgmsgalarmnoticesender	cis
-attribute	nsmsgmsgalarmnoticetemplate	cis
-attribute	nsmsgmsgalarmstatinterval	cis
-attribute	nsmsgmsgalarmthreshold	cis
-attribute	nsmsgmsgalarmthresholddirection	cis
-attribute	nsmsgmsgalarmwarninginterval	cis
-attribute	nsmsgmtaid		cis
-attribute	nsmsgmtaname		cis
-attribute	nsmsgneedsender	cis
-attribute	nsmsgnegativehostattr	cis
-attribute	nsmsgnestedgroups	cis
-attribute	nsmsgnetworkdefaultmaxruncount	cis
-attribute	nsmsgnetworkdefaultminruncount	cis
-attribute	nsmsgnewsprefix	cis
-attribute	nsmsgnewsspool	cis
-attribute	nsmsgnewuserforms	cis
-attribute	nsmsgntaccount	cis
-attribute	nsmsgntpassword	cis
-attribute	nsmsgntrunoptn	cis
-attribute	nsmsgnumdays	cis
-attribute	nsmsgnumenvelopequeuefiles	cis
-attribute	nsmsgnummessages	cis
-attribute	nsmsgnumprocesses	cis
-attribute	nsmsgorganization		cis
-attribute	nsmsgpartition	cis
-attribute	nsmsgpath	cis
-attribute	nsmsgplaintextloginpause	cis
-attribute	nsmsgplaintextmincipher	cis
-attribute	nsmsgpopminpoll	cis
-attribute	nsmsgport	cis
-attribute	nsmsgpositivehostattr	cis
-attribute	nsmsgprotocolubeconfig	cis
-attribute	nsmsgproxydomainallowed	cis
-attribute	nsmsgquotaexceededactions	cis
-attribute	nsmsgquotaexceededmsg	cis
-attribute	nsmsgquotaexceededmsginterval	cis
-attribute	nsmsgquotagraceperiod	cis
-attribute	nsmsgquotawarn	cis
-attribute	nsmsgreadtimeout	cis
-attribute	nsmsgrenotifyinterval	cis
-attribute	nsmsgrequirecrlf	cis
-attribute	nsmsgreserved0	cis
-attribute	nsmsgreserved1	cis
-attribute	nsmsgreserved2	cis
-attribute	nsmsgreserved3	cis
-attribute	nsmsgreserved4	cis
-attribute	nsmsgreserved5	cis
-attribute	nsmsgreserved6	cis
-attribute	nsmsgreserved7	cis
-attribute	nsmsgreserved8	cis
-attribute	nsmsgreserved9	cis
-attribute	nsmsgresourcetimeout	cis
-attribute	nsmsgrewritetocc	cis
-attribute	nsmsgrolloverdelta	cis
-attribute	nsmsgrolloversize	cis
-attribute	nsmsgrollovertime	cis
-attribute	nsmsgroutingattribute	cis
-attribute	nsmsgroutstripimapfolders	cis
-attribute	nsmsgsessiontimeout	cis
-attribute	nsmsgshellpath	cis
-attribute	nsmsgsitelanguage	cis
-attribute	nsmsgsmtphost	cis
-attribute	nsmsgsmtpport	cis
-attribute	nsmsgsmtprewritestyle	cis
-attribute	nsmsgsourceurl	cis
-attribute	nsmsgspooldir	cis
-attribute	nsmsgsslcachesize	cis
-attribute	nsmsgsslpasswdfile	cis
-attribute	nsmsgsslport		cis
-attribute	nmmsgsslsourceurl	cis
-attribute	nsmsgsslusessl	cis
-attribute	nsmsgsslusesslrelay	cis
-attribute	nsmsgstripcr	cis
-attribute	nsmsgsystemmaildir	cis
-attribute	nsmsgtimeoutcommand	cis
-attribute	nsmsgtimeoutdata	cis
-attribute	nsmsgtimeoutdatadot	cis
-attribute	nsmsgtimeoutdatasend	cis
-attribute	nsmsgtimeoutgreet	cis
-attribute	nsmsgtimeouthelo	cis
-attribute	nsmsgtimeoutmail	cis
-attribute	nsmsgtimeoutquit	cis
-attribute	nsmsgtimeoutrcpt	cis
-attribute	nsmsgtimeoutrset	cis
-attribute	nsmsgumask	cis
-attribute	nsmsgunknownacctsactions	cis
-attribute	nsmsgusemx	cis
-attribute	nsmsgverifyrcpts	cis
-attribute	nsmsgversion		cis
-
-objectclass netscapeMessagingServer
-	superior top
-	requires
-		cn,
-		nsServerID
-	allows
-		description
-
-objectclass nsmsgcfgcontainer
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfggen
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgaccounturl,
-		nsmsgconfigversion,
-		nsmsgfilterurl,
-		nsmsgfolderurl,
-		nsmsginstalledlanguages,
-		nsmsglisturl,
-		nsmsgnewuserforms,
-		nsmsgsitelanguage
-		
-objectclass nsmsgcfgsnmp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgcontact,
-		nsmsgcollectiondeltatime,
-		nsmsgdescription,
-		nsmsgenable,
-		nsmsglocation,
-		nsmsgmtaid,
-		nsmsgmtaname,
-		nsmsgmasterhost,
-		nsmsgmasterport,
-		nsmsgorganization,
-		nsmsgversion
-		
-objectclass nsmsgcfgstore
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgadmins,
-		nsmsgcleanupage,
-		nsmsgdbcachesize,
-		nsmsgdbtmpdir,
-		nsmsgdefaultacl,
-		nsmsgdefaultmailboxquota,
-		nsmsgdefaultpartition,
-		nsmsgdiskflushinterval,
-		nsmsgexpirestart,
-		nsmsgquotaexceededmsg,
-		nsmsgquotaexceededmsginterval,
-		nsmsgquotagraceperiod,
-		nsmsgquotawarn,
-		nsmsgumask
-
-objectclass nsmsgcfgexpirerule
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgfolderpattern,
-		nsmsgexclusive,
-		nsmsgfoldersizebytes,
-		nsmsgmessagecount,
-		nsmsgmessagedays,
-		nsmsgmessagesize,
-		nsmsgmessagesizedays
-
-objectclass nsmsgcfgpartition
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgpath
-
-objectclass nsmsgcfguser
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgpublic
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgalias
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgalias
-
-objectclass nsmsgcfglog
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgbuffersize,
-		nsmsgexpirytime,
-		nsmsgflushinterval,
-		nsmsglogdir,
-		nsmsgloglevel,
-		nsmsglogtype,
-		nsmsgmaxlogfiles,
-		nsmsgmaxlogfilesize,
-		nsmsgmaxlogsize,
-		nsmsgminfreediskspace,
-		nsmsgrollovertime
-
-objectclass nsmsgcfgservice
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgauthcachesize,
-		nsmsgauthcachettl,
-		nsmsgdnsresolveclient,
-		nsmsgldapmemcache,
-		nsmsgldapmemcachesize,
-		nsmsgldapmemcachettl,
-		nsmsglistenaddr,
-		nsmsgplaintextloginpause,
-		nsmsgreadtimeout,
-		nsmsgsslpasswdfile
-
-objectclass nsmsgcfgpop
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowanonymouslogin,
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgidletimeout,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgpopminpoll,
-		nsmsgport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgimap
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowanonymouslogin,
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgidletimeout,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgsslcachesize,
-		nsmsgsslport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfghttp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowadminproxy,
-		nsmsgallowanonymouslogin,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgdomainsecurity,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgidletimeout,
-		nsmsgipsecurity,
-		nsmsgmaxmessagesize,
-		nsmsgmaxsessions,
-		nsmsgmaxthreads,
-		nsmsgmaxpostsize,
-		nsmsgnumprocesses,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgproxydomainallowed,
-		nsmsgresourcetimeout,
-		nsmsgsessiontimeout,
-		nsmsgsmtphost,
-		nsmsgsmtpport,
-		nsmsgsourceurl,
-		nsmsgspooldir,
-		nsmsgsslcachesize,
-		nsmsgsslport,
-		nsmsgsourceurl,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgnntp
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgbanner,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgenable,
-		nsmsgenablesslport,
-		nsmsgnewsprefix,
-		nsmsgnewsspool,
-		nsmsgpartition,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgsslport,
-		nsmsgsslusessl
-
-objectclass nsmsgcfgmta
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgaltqueues,
-		nsmsgauthmaildomain,
-		nsmsgbanner,
-		nsmsgclearcontrolinterval,
-		nsmsgclearcontrolsafetime,
-		nsmsgcounterdeltatime,
-		nsmsgdefaultdomain,
-		nsmsgdeferredperiod,
-		nsmsgdocanonicalize,
-		nsmsgdoclientdnslookup,
-		nsmsgdodsn,
-		nsmsgdomainallowed,
-		nsmsgdomainnotallowed,
-		nsmsgdomainname,
-		nsmsgdomainlangtable,
-		nsmsgenable,
-		nsmsgforeignpercentaddr,
-		nsmsgldappoolsize,
-		nsmsgldaputilconfig,
-		nsmsglocaldefaultmaxruncount,
-		nsmsglocaldefaultminruncount,
-		nsmsgmaxheaderlines,
-		nsmsgmaxqueuetime,
-		nsmsgmessagehostname,
-		nsmsgnetworkdefaultmaxruncount,
-		nsmsgnetworkdefaultminruncount,
-		nsmsgnumenvelopequeuefiles,
-		nsmsgplaintextmincipher,
-		nsmsgport,
-		nsmsgprotocolubeconfig,
-		nsmsgreserved0,
-		nsmsgreserved1,
-		nsmsgreserved2,
-		nsmsgreserved3,
-		nsmsgreserved4,
-		nsmsgreserved5,
-		nsmsgreserved6,
-		nsmsgreserved7,
-		nsmsgreserved8,
-		nsmsgreserved9,
-		nsmsgrolloverdelta,
-		nsmsgrolloversize,
-		nsmsgroutstripimapfolders,
-		nsmsgsslusessl,
-		nsmsgsslusesslrelay
-
-objectclass nsmsgcfgmtalog
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsglog,
-		nsmsgminruncount,
-		nsmsgmaxruncount,
-		nsmsgmaxruncountdeferred
-
-objectclass nsmsgcfgmtaautoreplyhandler
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultecho,
-		nsmsgdefaultreply,
-		nsmsgdefaultvacation
-
-objectclass nsmsgcfgmtaerrorhandler
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgformsigkey,
-		nsmsghopcountexceedactions,
-		nsmsgquotaexceededactions,
-		nsmsgrenotifyinterval,
-		nsmsgunknownacctsactions
-
-objectclass nsmsgcfgmtamboxdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgmtaprogdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultgid,
-		nsmsgdefaultuid,
-		nsmsgshellpath,
-		nsmsgntrunoptn, 
-		nsmsgntaccount, 
-		nsmsgntpassword
-
-objectclass nsmsgcfgmtaaccept
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowbdat,
-		nsmsgallowehlo,
-		nsmsgallowetrn,
-		nsmsgallowexpn,
-		nsmsgallowhelp,
-		nsmsgallowonex,
-		nsmsgallowsize,
-		nsmsgallowverb,
-		nsmsgallowvrfy,
-		nsmsghidehostname,
-		nsmsgmaxbadcommands,
-		nsmsgmaxmessagesize,
-		nsmsgminfreediskspace,
-		nsmsgnegativehostattr,
-		nsmsgpositivehostattr,
-		nsmsgrequirecrlf,
-		nsmsgtimeoutcommand,
-		nsmsgtimeoutdata,
-		nsmsgverifyrcpts
-
-objectclass nsmsgcfgmtasmtpdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgallowbarelf,
-		nsmsgalwaysqueue,
-		nsmsgcheckdeferredqueue,
-		nsmsgdoetrn,
-		nsmsgexternalmxserverip,
-		nsmsginternalmxserverip,
-		nsmsgtimeoutdata,
-		nsmsgtimeoutdatadot,
-		nsmsgtimeoutdatasend,
-		nsmsgtimeoutgreet,
-		nsmsgtimeouthelo,
-		nsmsgtimeoutmail,
-		nsmsgtimeoutquit,
-		nsmsgtimeoutrcpt,
-		nsmsgtimeoutrset,
-		nsmsgusemx
-
-objectclass nsmsgcfgmtarouter
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgadddeliveredto,
-		nsmsgaddheaders,
-		nsmsgdeleteheaders,
-		nsmsgdorewritefromusingauth,
-		nsmsgdorewritesenderusingauth,
-		nsmsgenveloperewritemethod,
-		nsmsgfallbacksearchmethod,
-		nsmsghostrewrites,
-		nsmsglocalmaildomains,
-		nsmsgmaxcontrolrecipients,
-		nsmsgmaxmtahops,
-		nsmsgnestedgroups,
-		nsmsgrewritetocc,
-		nsmsgroutingattribute,
-		nsmsgsmtprewritestyle
-
-objectclass nsmsgcfgmtaunixdeliver
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgdefaultgid,
-		nsmsgdefaultuid,
-		nsmsgfilemode,
-		nsmsgmaildeliveryprogram,
-		nsmsgneedsender,
-		nsmsgstripcr,
-		nsmsgsystemmaildir
-
-objectclass nsmsgcfgreport
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-
-objectclass nsmsgcfgalarmcontainer
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgmsgalarmnoticehost,
-		nsmsgmsgalarmnoticeport,
-		nsmsgmsgalarmnoticercpt,
-		nsmsgmsgalarmnoticesender,
-		nsmsgmsgalarmnoticetemplate
-
-objectclass nsmsgcfgalarm
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgmsgalarmdescription,
-		nsmsgmsgalarmstatinterval,
-		nsmsgmsgalarmthreshold,
-		nsmsgmsgalarmthresholddirection,
-		nsmsgmsgalarmwarninginterval
-
-objectclass nsmsgcfgscript
-	superior top
-	requires
-		objectclass,
-		cn
-	allows
-		nsmsgenable,
-		nsmsgbinarypath,
-		nsmsgloglevel,
-		nsmsgmaxscriptsize,
-		nsmsgmaxbranches,
-		nsmsgmaxcputime,
-		nsmsgmaxerrorobjectsize,
-		nsmsgmaxstateobjectsize
diff --git a/ldap/cm/v4confs/412/ns-netshare-schema.conf b/ldap/cm/v4confs/412/ns-netshare-schema.conf
deleted file mode 100644
index 8a03e929..00000000
--- a/ldap/cm/v4confs/412/ns-netshare-schema.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Enterprise Server
-attribute       netshareHomeURL            ces  single
-attribute       netshareServerType         cis  single
-attribute       netshareHomeTheme          cis  single
-attribute       netsharePrivate            cis  single
-attribute       netshareMemberOf           dn
-attribute       netshareUIConfig           bin  single
- 
-# added to either users or groups/projects to enable
-# as netshare user accounts or netshare projects
-objectclass netshareAccount
-       requires
-                objectclass,
-                netshareHomeURL
-       allows
-                netshareServerType,
-                netshareHomeTheme,
-                netsharePrivate,
-                netshareMemberOf,
-                netshareUIConfig
- 
-
-attribute       netsharePMNewProjParent            dn   single
-attribute       netsharePMSearchBase               dn   single
-attribute       netsharePMProjCreationUser         dn   single
-attribute       netsharePMAdmin                    dn
- 
-# this is for the netshare project management utility/CGI 
-# that is created under the SIE; this parallels the messaging
-# MLM schema somewhat to enable end-user maintenance/creation 
-# of netshare projects
-objectclass netshareProjectManagementGlobalConfig
-        requires
-                objectclass
-        allows
-                netsharePMNewProjParent,
-                netsharePMSearchBase,
-                netsharePMProjCreationUser,
-                netsharePMAdmin,
-                cn
diff --git a/ldap/cm/v4confs/412/ns-news-globopt.conf b/ldap/cm/v4confs/412/ns-news-globopt.conf
deleted file mode 100644
index 6f7b2f3b..00000000
--- a/ldap/cm/v4confs/412/ns-news-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape News Server
-#index	uniquemember,member	eq
-
diff --git a/ldap/cm/v4confs/412/ns-news-schema.conf b/ldap/cm/v4confs/412/ns-news-schema.conf
deleted file mode 100644
index 9d15c19e..00000000
--- a/ldap/cm/v4confs/412/ns-news-schema.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
-attribute nsnewsACL                   2.16.840.1.113730.3.1.191  cis     
-attribute nsaclrole                   2.16.840.1.113730.3.1.192  cis     
-attribute nsprettyname                2.16.840.1.113730.3.1.193  cis     
-attribute nsflags                     2.16.840.1.113730.3.1.194  cis     
-attribute nscreator                   2.16.840.1.113730.3.1.195  cis     
-attribute ngcomponent                 2.16.840.1.113730.3.1.196  dn      
-
-objectclass nginfo 
-	oid  2.16.840.1.113730.3.2.26
-	requires 
-		objectClass, 
-		ngcomponent 
-	allows 
-		nsnewsACL,  
-		subtreeACI, 
-		description,  
-		nsaclrole,  
-		nsprettyname, 
-		nsflags, 
-		nscreator 
-
-objectClass	netscapeNewsServer
-	oid 2.16.840.1.113730.3.2.27
-	requires
-		objectClass
-
diff --git a/ldap/cm/v4confs/412/ns-proxy-globopt.conf b/ldap/cm/v4confs/412/ns-proxy-globopt.conf
deleted file mode 100644
index 16158da2..00000000
--- a/ldap/cm/v4confs/412/ns-proxy-globopt.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-
diff --git a/ldap/cm/v4confs/412/ns-proxy-schema.conf b/ldap/cm/v4confs/412/ns-proxy-schema.conf
deleted file mode 100644
index 3151c9c7..00000000
--- a/ldap/cm/v4confs/412/ns-proxy-schema.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeProxyServer
-		oid 2.16.840.1.113730.3.2.28
-        requires        
-                objectclass
-
diff --git a/ldap/cm/v4confs/412/ns-value-schema.conf b/ldap/cm/v4confs/412/ns-value-schema.conf
deleted file mode 100644
index a7ee4f3b..00000000
--- a/ldap/cm/v4confs/412/ns-value-schema.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Schema for defining schemaless config for LDAP 
-# 
-
-attribute nsValueCIS          2.16.840.1.113730.3.1.243 cis
-attribute nsValueCES          2.16.840.1.113730.3.1.244 ces
-attribute nsValueTel          2.16.840.1.113730.3.1.245 tel
-attribute nsValueInt          2.16.840.1.113730.3.1.246 int
-attribute nsValueBin          2.16.840.1.113730.3.1.247 bin
-attribute nsValueDN           2.16.840.1.113730.3.1.248 dn
-attribute nsValueType         2.16.840.1.113730.3.1.249 cis
-attribute nsValueDefault      2.16.840.1.113730.3.1.250 cis
-attribute nsValueFlags        2.16.840.1.113730.3.1.251 cis
-attribute nsValueDescription  2.16.840.1.113730.3.1.252 cis
-attribute nsValueSyntax       2.16.840.1.113730.3.1.253 cis
-attribute nsValueHelpURL      2.16.840.1.113730.3.1.254 ces
-
-objectClass nsValueItem
-    oid 2.16.840.1.113730.3.2.45
-    requires
-        objectClass,
-        cn
-    allows
-        nsValueCIS,
-        nsValueCES,
-        nsValueTel,
-        nsValueInt,
-        nsValueBin,
-        nsValueDN,
-        nsValueType,
-        nsValueSyntax,
-        nsValueDescription,
-        nsValueHelpURL,
-        nsValueFlags,
-        nsValueDefault 
-
diff --git a/ldap/cm/v4confs/412/ns-wcal-globopt.conf b/ldap/cm/v4confs/412/ns-wcal-globopt.conf
deleted file mode 100644
index 9d8ad189..00000000
--- a/ldap/cm/v4confs/412/ns-wcal-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#used by Netscape Calendar Hosting Server 1.0
-
-index nswcalCALID pres,eq
diff --git a/ldap/cm/v4confs/412/ns-wcal-schema.conf b/ldap/cm/v4confs/412/ns-wcal-schema.conf
deleted file mode 100644
index 3d4f85d5..00000000
--- a/ldap/cm/v4confs/412/ns-wcal-schema.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Calendar Hosting Server
-
-# Login calendar URI for this user
-attribute nswcalCALID			2.16.840.1.113730.3.1.537 cis single
-
-# Calendar client specific user preferences for this user
-attribute nswcalExtendedUserPrefs	2.16.840.1.113730.3.1.538 cis
-
-# Lists calendar protocols not allowed to be used by this user
-attribute nswcalDisallowAccess	2.16.840.1.113730.3.1.539 cis single
-
-# Calendar host for this user's login calendar
-attribute nswcalHost			2.16.840.1.113730.3.1.540 cis
-
-# Quota associated with this user's calendars
-attribute nswcalQuota			2.16.840.1.113730.3.1.541 cis single
-
-# Used to designate a LDAP entry as representing a Netscape Calendar
-# Hosting Server user account. These first 10 attributes are
-# referenced by Netscape Calendar Hosting Server and the last 3
-# attributes are reserved for future use.
-objectClass nswcalUser
-	oid 2.16.840.1.113730.3.2.83
-	requires
-		objectClass
-	allows
-		cn,
-		givenName,
-		mail,
-		preferredlanguage,
-		sn,
-		uid,
-		userPassword,
-		nswcalCALID,
-		nswcalDisallowAccess,
-		nswcalExtendedUserPrefs,
-		nslicensedfor,
-		nswcalHost,
-		nswcalQuota
-
-# From http://www.imc.org/draft-ietf-calsch-locating
-attribute calCalURI              1.2.840.113556.1.4.478 cis
-attribute calFBURL               1.2.840.113556.1.4.479 cis
-attribute calCAPURI              1.2.840.113556.1.4.480 cis
-attribute calCalAdrURI           1.2.840.113556.1.4.481 cis
-attribute calOtherCalURIs        1.2.840.113556.1.4.482 cis
-attribute calOtherFBURLs         1.2.840.113556.1.4.483 cis
-attribute calOtherCAPURIs        1.2.840.113556.1.4.484 cis
-attribute calOtherCalAdrURIs     1.2.840.113556.1.4.485 cis
-
-# Used to designate a LDAP entry as representing a calendar user.
-objectClass calEntry
-	oid 1.2.840.113556.1.5.87
-	requires
-		objectClass
-	allows
-		calCalURI,
-		calFBURL,
-		calCAPURI,
-		calCalAdrURI,
-		calOtherCalURIs,
-		calOtherFBURLs,
-		calOtherCAPURIs,
-		calOtherCalAdrURIs
diff --git a/ldap/cm/v4confs/412/ns-web-globopt.conf b/ldap/cm/v4confs/412/ns-web-globopt.conf
deleted file mode 100644
index 6d19f242..00000000
--- a/ldap/cm/v4confs/412/ns-web-globopt.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Enterprise Server
-#index	uniquemember,member	eq
-
diff --git a/ldap/cm/v4confs/412/ns-web-schema.conf b/ldap/cm/v4confs/412/ns-web-schema.conf
deleted file mode 100644
index 08868577..00000000
--- a/ldap/cm/v4confs/412/ns-web-schema.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Used by Netscape Directory Server
-objectclass netscapeWebServer
-        oid 2.16.840.1.113730.3.2.29
-        superior top
-        requires
-                cn,
-                nsServerID
-        allows
-                description,
-                nsServerPort
-
diff --git a/ldap/cm/v4confs/412/slapd.at.conf b/ldap/cm/v4confs/412/slapd.at.conf
deleted file mode 100644
index 0e7371d1..00000000
--- a/ldap/cm/v4confs/412/slapd.at.conf
+++ /dev/null
@@ -1,423 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.at.conf for Netscape Directory Server 4.1
-#
-#  DO NOT MODIFY! 
-#
-#  The attributes listed in this file are Standard Attributes and are
-#  expected to present in Directory Server 4.1. Editing this file could 
-#  cause interoperability problems.
-#
-#  User Defined Attributes should be added by selecting 
-#  Schema | Edit or View Attributes from the Admin Server. 
-#
-#  User Defined Attributes are placed in slapd.user_at.conf.  
-# 
-#  All attributes are viewable over LDAP in the cn=schema entry under
-#  attributetypes.
-# 
-#  The format of this file is:
-#
-#  attribute attribute-name [attribute-aliases] [attribute-oid] syntax
-#  
-#  If no OID is specified, <attribute-name>-oid will be used as the OID
-#
-
-########################################################################
-# X.500(93) User Schema for use with LDAP
-# Taken from <draft-ietf-asid-ldapv3schema-x500-00.txt>
-########################################################################
-
-attribute objectClass                                         2.5.4.0                    cis     
-attribute aliasedObjectName                                   2.5.4.1                    dn      
-attribute knowledgeInformation                                2.5.4.2                    cis     
-attribute cn                         commonName               2.5.4.3                    cis     
-attribute sn                         surName                  2.5.4.4                    cis     
-attribute serialNumber                                        2.5.4.5                    cis     
-attribute c                          countryName              2.5.4.6                    cis     
-attribute l   locality               localityname             2.5.4.7                    cis     
-attribute st                         stateOrProvinceName      2.5.4.8                    cis     
-attribute street                     streetaddress            2.5.4.9                    cis     
-attribute o                          organizationname         2.5.4.10                   cis     
-attribute ou                         organizationalUnitName   2.5.4.11                   cis     
-attribute title                                               2.5.4.12                   cis     
-attribute description                                         2.5.4.13                   cis     
-attribute searchGuide                                         2.5.4.14                   ces     
-attribute businessCategory                                    2.5.4.15                   cis     
-attribute postalAddress                                       2.5.4.16                   cis     
-attribute postalCode                                          2.5.4.17                   cis     
-attribute postOfficeBox                                       2.5.4.18                   cis     
-attribute physicalDeliveryOfficeName                          2.5.4.19                   cis     
-attribute telephoneNumber                                     2.5.4.20                   tel     
-attribute telexNumber                                         2.5.4.21                   cis     
-attribute teletexTerminalIdentifier                           2.5.4.22                   cis
-attribute facsimileTelephoneNumber   fax                      2.5.4.23                   tel     
-attribute x121Address                                         2.5.4.24                   ces     
-attribute internationalIsdnNumber                             2.5.4.25                   ces     
-attribute registeredAddress                                   2.5.4.26                   cis     
-attribute destinationIndicator                                2.5.4.27                   cis     
-attribute preferredDeliveryMethod                             2.5.4.28                   cis single
-attribute presentationAddress                                 2.5.4.29                   ces     
-attribute supportedApplicationContext                         2.5.4.30                   cis     
-attribute member                                              2.5.4.31                   dn      
-attribute owner                                               2.5.4.32                   dn      
-attribute roleOccupant                                        2.5.4.33                   dn      
-attribute seeAlso                                             2.5.4.34                   dn      
-attribute userPassword                                        2.5.4.35                   bin     
-attribute userCertificate                                     2.5.4.36                   bin     
-attribute cACertificate               cACertificate           2.5.4.37                   bin     
-attribute authorityRevocationList     authorityRevocationList 2.5.4.38                   bin     
-attribute certificateRevocationList certificateRevocationList 2.5.4.39                   bin
-attribute crossCertificatePair        crossCertificatePair    2.5.4.40                   bin     
-attribute givenName                                           2.5.4.42                   cis     
-attribute initials                                            2.5.4.43                   cis     
-attribute generationQualifier                                 2.5.4.44                   cis
-attribute x500UniqueIdentifier                                2.5.4.45                   bin     
-attribute dnQualifier                                         2.5.4.46                   cis     
-attribute enhancedSearchGuide                                 2.5.4.47                   cis
-attribute protocolInformation                                 2.5.4.48                   cis
-attribute dn distinguishedName                                2.5.4.49                   dn 
-attribute uniqueMember                                        2.5.4.50                   dn      
-attribute houseIdentifier                                     2.5.4.51                   cis
-attribute supportedAlgorithms                                 2.5.4.52                   bin       
-attribute deltaRevocationList                                 2.5.4.53                   bin
-
-#######################################################################
-# LDAP Attributes                                                     #
-# Taken from <draft-ietf-asid-ldapv3-attributes-07.txt>               #
-#######################################################################
-
-attribute createTimestamp                                     2.5.18.1                   cis
-attribute modifyTimestamp                                     2.5.18.2                   cis
-attribute creatorsName                                        2.5.18.3                   dn
-attribute modifiersName                                       2.5.18.4                   dn
-attribute subschemaSubentry                                   2.5.18.10                  dn
-attribute attributeTypes                                      2.5.21.5                   cis
-attribute objectClasses                                       2.5.21.6                   cis
-attribute matchingRules                                       2.5.21.4                   cis
-attribute matchingRuleUse                                     2.5.21.8                   cis
-attribute dITStructureRules                                   2.5.21.1                   cis
-attribute dITContentRules                                     2.5.21.2                   cis
-attribute nameForms                                           2.5.21.7                   cis
-
-attribute namingContexts                                      1.3.6.1.4.1.1466.101.120.5 dn
-attribute altServer                                           1.3.6.1.4.1.1466.101.120.6 ces
-attribute supportedExtension                                  1.3.6.1.4.1.1466.101.120.7 cis
-attribute supportedControl                                    1.3.6.1.4.1.1466.101.120.13 cis
-attribute supportedSASLMechanisms                             1.3.6.1.4.1.1466.101.120.14 cis
-attribute supportedLDAPVersion                                1.3.6.1.4.1.1466.101.120.15 int
-attribute ldapSyntaxes                                        1.3.6.1.4.1.1466.101.120.16 cis
-
-#######################################################################
-# Pilot X.500 schema for use in LDAPv3                                #
-# Taken from <draft-ietf-asid-schema-pilot-00.txt>                    #
-#######################################################################
-
-attribute uid                                                 0.9.2342.19200300.100.1.1  cis     
-attribute textEncodedORAddress                                0.9.2342.19200300.100.1.2  cis     
-attribute mail                       rfc822mailbox            0.9.2342.19200300.100.1.3  cis     
-attribute info                                                0.9.2342.19200300.100.1.4  cis     
-attribute drink                                               0.9.2342.19200300.100.1.5  cis     
-attribute roomNumber                                          0.9.2342.19200300.100.1.6  cis     
-attribute userClass                                           0.9.2342.19200300.100.1.8  cis     
-attribute host                                                0.9.2342.19200300.100.1.9  cis     
-attribute manager                                             0.9.2342.19200300.100.1.10 dn      
-attribute documentIdentifier                                  0.9.2342.19200300.100.1.11 cis     
-attribute documentTitle                                       0.9.2342.19200300.100.1.12 cis     
-attribute documentVersion                                     0.9.2342.19200300.100.1.13 cis     
-attribute documentAuthor                                      0.9.2342.19200300.100.1.14 dn      
-attribute documentLocation                                    0.9.2342.19200300.100.1.15 cis     
-attribute homePhone                                           0.9.2342.19200300.100.1.20 tel     
-attribute secretary                                           0.9.2342.19200300.100.1.21 dn      
-attribute otherMailbox                                        0.9.2342.19200300.100.1.22 cis     
-attribute dc                         domaincomponent          0.9.2342.19200300.100.1.25 cis     
-attribute dNSRecord                                           0.9.2342.19200300.100.1.26 cis     
-attribute associatedName                                      0.9.2342.19200300.100.1.38 dn      
-attribute homePostalAddress                                   0.9.2342.19200300.100.1.39 cis     
-attribute personalTitle                                       0.9.2342.19200300.100.1.40 cis     
-attribute mobile                     mobileTelephoneNumber    0.9.2342.19200300.100.1.41 tel     
-attribute pager                      pagerTelephoneNumber     0.9.2342.19200300.100.1.42 tel     
-attribute co                         friendlycountryname      0.9.2342.19200300.100.1.43 cis     
-attribute uniqueIdentifier                                    0.9.2342.19200300.100.1.44 cis     
-attribute organizationalStatus                                0.9.2342.19200300.100.1.45 cis     
-attribute janetMailbox                                        0.9.2342.19200300.100.1.46 cis
-attribute mailPreferenceOption                                0.9.2342.19200300.100.1.47 int single     
-attribute buildingName                                        0.9.2342.19200300.100.1.48 cis     
-attribute dSAQuality                                          0.9.2342.19200300.100.1.49 cis single
-attribute singleLevelQuality                                  0.9.2342.19200300.100.1.50 cis single
-attribute subtreeMinimumQuality                               0.9.2342.19200300.100.1.51 cis single
-attribute subtreeMaximumQuality                               0.9.2342.19200300.100.1.52 cis single
-attribute personalSignature                                   0.9.2342.19200300.100.1.53 bin     
-attribute ditRedirect                                         0.9.2342.19200300.100.1.54 dn      
-attribute audio                                               0.9.2342.19200300.100.1.55 bin     
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis     
-attribute jpegPhoto                                           0.9.2342.19200300.100.1.60 bin     
-
-#definitions subsequent to RFC 1274
-
-attribute labeledUri                 labeledurl               1.3.6.1.4.1.250.1.57       ces
-
-
-############################################################################
-# Netscape Defined Attributes
-#
-# The Netscape base OID is                          2.16.840.1.113730 
-# The base OID for the Netscape Directory Server is 2.16.840.1.113730.3 
-# Netscape defined attributes have base             2.16.840.1.113730.3.1
-#
-# More Netscape defined attributes can be found included in ns-schema.conf
-############################################################################
-
-attribute carLicense                                          2.16.840.1.113730.3.1.1    cis     
-attribute departmentNumber                                    2.16.840.1.113730.3.1.2    cis     
-attribute employeeNumber                                      2.16.840.1.113730.3.1.3    cis single
-attribute employeeType                                        2.16.840.1.113730.3.1.4    cis     
-attribute changeNumber                                        2.16.840.1.113730.3.1.5    int     
-attribute targetDn                                            2.16.840.1.113730.3.1.6    dn      
-attribute changeType                                          2.16.840.1.113730.3.1.7    cis     
-attribute changes                                             2.16.840.1.113730.3.1.8    bin     
-attribute newRdn                                              2.16.840.1.113730.3.1.9    dn      
-attribute deleteOldRdn                                        2.16.840.1.113730.3.1.10   cis     
-attribute newSuperior                                         2.16.840.1.113730.3.1.11   dn      
-attribute ref                                                 2.16.840.1.113730.3.1.34   ces     
-attribute nsLicensedFor                                       2.16.840.1.113730.3.1.36   cis     
-attribute nsLicenseStartTime                                  2.16.840.1.113730.3.1.37   cis     
-attribute nsLicenseEndTime                                    2.16.840.1.113730.3.1.38   cis     
-attribute preferredLanguage                                   2.16.840.1.113730.3.1.39   cis single
-attribute userSMIMECertificate                                 2.16.840.1.113730.3.1.40   bin
-attribute ntUserDomainId                                      2.16.840.1.113730.3.1.41   cis single    
-attribute ntUserCreateNewAccount                              2.16.840.1.113730.3.1.42   cis single     
-attribute ntUserDeleteAccount                                 2.16.840.1.113730.3.1.43   cis single     
-attribute ntGroupDomainId                                     2.16.840.1.113730.3.1.44   cis single
-attribute ntGroupCreateNewGroup                               2.16.840.1.113730.3.1.45   cis single
-attribute ntGroupDeleteGroup                                  2.16.840.1.113730.3.1.46   cis single
-attribute ntGroupType                                  2.16.840.1.113730.3.1.47   cis single
-attribute replicaPort                                         2.16.840.1.113730.3.1.48   cis              
-attribute replicaUpdateFailedAt                               2.16.840.1.113730.3.1.49   cis              
-attribute replicaBeginOrc                                     2.16.840.1.113730.3.1.50   cis              
-attribute replicaUpdateReplayed                               2.16.840.1.113730.3.1.51   cis              
-attribute replicaUpdateSchedule                               2.16.840.1.113730.3.1.52   cis              
-attribute replicaBindMethod                                   2.16.840.1.113730.3.1.53   cis              
-attribute replicaUseSSL                                       2.16.840.1.113730.3.1.54   cis              
-attribute aci                                                 2.16.840.1.113730.3.1.55   bin              
-attribute lastModifiedBy                                      0.9.2342.19200300.100.1.24 dn               
-attribute replicaRoot                                         2.16.840.1.113730.3.1.57   dn               
-attribute replicaBindDn                                       2.16.840.1.113730.3.1.58   dn               
-attribute ntUserPriv                                          2.16.840.1.113730.3.1.59   bin single  
-attribute ntUserAuthFlags                                     2.16.840.1.113730.3.1.60   bin single  
-attribute ntUserUsrComment                                    2.16.840.1.113730.3.1.61   cis single  
-attribute ntUserParms                                         2.16.840.1.113730.3.1.62   cis single  
-attribute ntUserUnitsPerWeek                                  2.16.840.1.113730.3.1.63   bin single  
-attribute ntUserNumLogons                                     2.16.840.1.113730.3.1.64   bin single  
-attribute ntUserLogonServer                                   2.16.840.1.113730.3.1.65   cis single  
-attribute ntUserUniqueId                                      2.16.840.1.113730.3.1.66   bin single  
-attribute ntUserProfile                                       2.16.840.1.113730.3.1.67   cis single  
-attribute ntUserPasswordExpired                               2.16.840.1.113730.3.1.68   bin single  
-attribute subtreeACI                                          2.16.840.1.113730.3.1.69   ces              
-attribute serverRoot                                          2.16.840.1.113730.3.1.70   cis              
-attribute serverProductName                                   2.16.840.1.113730.3.1.71   cis              
-attribute serverVersionNumber                                 2.16.840.1.113730.3.1.72   cis              
-attribute installationTimeStamp                               2.16.840.1.113730.3.1.73   cis              
-attribute administratorContactInfo                            2.16.840.1.113730.3.1.74   cis              
-attribute adminUrl                                            2.16.840.1.113730.3.1.75   ces              
-attribute serverHostName                                      2.16.840.1.113730.3.1.76   cis              
-attribute changeTime                                          2.16.840.1.113730.3.1.77   cis              
-attribute cirReplicaRoot                                      2.16.840.1.113730.3.1.79   dn               
-attribute cirHost                                             2.16.840.1.113730.3.1.80   cis              
-attribute cirPort                                             2.16.840.1.113730.3.1.81   cis              
-attribute cirBindDn                                           2.16.840.1.113730.3.1.82   dn               
-attribute cirUsePersistentSearch                              2.16.840.1.113730.3.1.83   cis              
-attribute cirUseSsl                                           2.16.840.1.113730.3.1.84   cis              
-attribute cirBindCredentials                                  2.16.840.1.113730.3.1.85   ces              
-attribute cirLastUpdateApplied                                2.16.840.1.113730.3.1.86   cis              
-attribute cirUpdateSchedule                                   2.16.840.1.113730.3.1.87   cis              
-attribute cirUpdateFailedat                                   2.16.840.1.113730.3.1.88   cis              
-attribute cirSyncInterval                                     2.16.840.1.113730.3.1.89   cis              
-attribute cirBeginORC                                         2.16.840.1.113730.3.1.90   cis              
-attribute passwordExpirationTime                              2.16.840.1.113730.3.1.91   cis operational         
-attribute passwordExpWarned                                   2.16.840.1.113730.3.1.92   cis operational         
-attribute passwordRetryCount                                  2.16.840.1.113730.3.1.93   cis operational         
-attribute retryCountResetTime                                 2.16.840.1.113730.3.1.94   cis operational         
-attribute accountUnlockTime                                   2.16.840.1.113730.3.1.95   cis operational         
-attribute passwordHistory                                     2.16.840.1.113730.3.1.96   bin operational         
-attribute passwordMaxAge                                      2.16.840.1.113730.3.1.97   cis             
-attribute passwordExp                                         2.16.840.1.113730.3.1.98   cis                 
-attribute passwordMinLength                                   2.16.840.1.113730.3.1.99   cis                 
-attribute passwordKeepHistory                                 2.16.840.1.113730.3.1.100  cis                 
-attribute passwordInHistory                                   2.16.840.1.113730.3.1.101  cis                 
-attribute passwordChange                                      2.16.840.1.113730.3.1.102  cis                 
-attribute passwordCheckSyntax                                 2.16.840.1.113730.3.1.103  cis                 
-attribute passwordWarning								      2.16.840.1.113730.3.1.104  cis                 
-attribute passwordLockout                                     2.16.840.1.113730.3.1.105  cis                 
-attribute passwordMaxFailure                                  2.16.840.1.113730.3.1.106  cis                 
-attribute passwordResetDuration                               2.16.840.1.113730.3.1.107  cis                 
-attribute passwordUnlock				    				  2.16.840.1.113730.3.1.108  cis                 
-attribute passwordLockoutDuration                             2.16.840.1.113730.3.1.109  cis                 
-attribute ntGroupId                                           2.16.840.1.113730.3.1.110  bin single  
-attribute replicaHost                                         2.16.840.1.113730.3.1.197  cis              
-attribute memberURL                                           2.16.840.1.113730.3.1.198  ces              
-attribute memberCertificateDescription                        2.16.840.1.113730.3.1.199  ces              
-attribute replicaCredentials                                  2.16.840.1.113730.3.1.202  bin     
-attribute replicaEntryFilter                                  2.16.840.1.113730.3.1.203  ces
-attribute replicaNickName                                     2.16.840.1.113730.3.1.204  cis
-attribute filterInfo										  2.16.840.1.113730.3.1.206  cis
-attribute replicaCFUpdated                                    2.16.840.1.113730.3.1.217  cis
-attribute replicaAbandonedChanges                             2.16.840.1.113730.3.1.218  cis
-attribute vlvBase                                             2.16.840.1.113730.3.1.207  dn
-attribute vlvScope                                            2.16.840.1.113730.3.1.208  int
-attribute vlvFilter                                           2.16.840.1.113730.3.1.209  ces
-attribute vlvSort                                             2.16.840.1.113730.3.1.210  cis
-attribute vlvName                                             2.16.840.1.113730.3.1.211  ces
-attribute netscapeMDSuffix                                    2.16.840.1.113730.3.1.212  dn
-attribute vlvEnabled                                          2.16.840.1.113730.3.1.213  int
-attribute passwordAllowChangeTime                             2.16.840.1.113730.3.1.214  cis operational         
-attribute oid                                                 2.16.840.1.113730.3.1.215  cis
-attribute userPKCS12                                          2.16.840.1.113730.3.1.216  bin
-attribute vlvUses                                             2.16.840.1.113730.3.1.219  int
-attribute passwordMustChange                                  2.16.840.1.113730.3.1.220  cis
-attribute passwordStorageScheme                               2.16.840.1.113730.3.1.121  cis
-attribute passwordMinAge                                      2.16.840.1.113730.3.1.122  cis
-attribute passwordResetFailureCount                           2.16.840.1.113730.3.1.123  cis
-attribute nsslapd-pluginPath							      2.16.840.1.113730.3.1.224  cis
-attribute nsslapd-pluginInitfunc                              2.16.840.1.113730.3.1.225  cis
-attribute nsslapd-pluginType 	                              2.16.840.1.113730.3.1.226  cis
-attribute nsslapd-pluginId                                    2.16.840.1.113730.3.1.227  cis
-attribute nsslapd-pluginVersion                               2.16.840.1.113730.3.1.228  cis
-attribute nsslapd-pluginVendor                                2.16.840.1.113730.3.1.229  cis
-attribute nsslapd-pluginDescription                           2.16.840.1.113730.3.1.230  cis
-attribute nsslapd-pluginEnabled               	              2.16.840.1.113730.3.1.231  cis
-attribute nsSNMPEnabled                      	              2.16.840.1.113730.3.1.232  cis
-attribute nsSNMPOrganization                 	              2.16.840.1.113730.3.1.233  cis
-attribute nsSNMPLocation                     	              2.16.840.1.113730.3.1.234  cis
-attribute nsSNMPContact               	                      2.16.840.1.113730.3.1.235  cis
-attribute nsSNMPDescription									  2.16.840.1.113730.3.1.236  cis 
-attribute nsSNMPMasterHost									  2.16.840.1.113730.3.1.237  cis 
-attribute nsSNMPMasterPort									  2.16.840.1.113730.3.1.238  cis 
-attribute nsslapd-backend									  2.16.840.1.113730.3.1.239  cis 
-attribute replicatedattributelist                             2.16.840.1.113730.3.1.240  cis 
-attribute displayName                                         2.16.840.1.113730.3.1.241  cis single
-attribute nsSystemIndex                                       2.16.840.1.113730.3.1.242  cis 
-attribute nsIndexType                                         2.16.840.1.113730.3.1.327  cis 
-attribute nsMatchingRule                                      2.16.840.1.113730.3.1.328  cis 
-attribute nsAddressBookSyncURL                                2.16.840.1.113730.3.1.330  ces
-attribute nsSynchUserIDFormat                                 2.16.840.1.113730.3.1.406  cis
-attribute nsSynchUniqueAttribute                              2.16.840.1.113730.3.1.407  cis
-attribute replicaLastRelevantChange                           2.16.840.1.113730.3.1.408  int
-attribute ntUserHomeDir                                       2.16.840.1.113730.3.1.521  cis single     
-attribute ntUserComment                                       2.16.840.1.113730.3.1.522  cis single     
-attribute ntUserFlags                                         2.16.840.1.113730.3.1.523  bin single     
-attribute ntUserScriptPath                                    2.16.840.1.113730.3.1.524  cis single     
-attribute ntUserWorkstations                                  2.16.840.1.113730.3.1.525  cis single     
-attribute ntUserLastLogon                                     2.16.840.1.113730.3.1.526  cis single     
-attribute ntUserLastLogoff                                    2.16.840.1.113730.3.1.527  cis single     
-attribute ntUserAcctExpires                                   2.16.840.1.113730.3.1.528  cis single     
-attribute ntUserMaxStorage                                    2.16.840.1.113730.3.1.529  bin single     
-attribute ntUserLogonHours                                    2.16.840.1.113730.3.1.530  bin single     
-attribute ntUserBadPwCount                                    2.16.840.1.113730.3.1.531  bin single     
-attribute ntUserCountryCode                                   2.16.840.1.113730.3.1.532  cis single     
-attribute ntUserCodePage                                      2.16.840.1.113730.3.1.533  bin single     
-attribute ntUserPrimaryGroupId                                2.16.840.1.113730.3.1.534  bin single     
-attribute ntUserHomeDirDrive                                  2.16.840.1.113730.3.1.535  cis single     
-attribute ntGroupAttributes                                   2.16.840.1.113730.3.1.536  bin single
-
-#
-# Attribute types with OIDs
-#
-
-attribute associatedDomain                                    0.9.2342.19200300.100.1.37 cis     
-attribute documentPublisher                                   0.9.2342.19200300.100.1.56 cis single
-
-
-# 
-# Attributes which are used by some objectClass, but with unknown OID
-# 
-
-attribute abstract                                            abstract-oid               cis     
-attribute authorCn                   documentauthorcommonname authorcn-oid               cis     
-attribute authorSn                   documentauthorsurname    authorsn-oid               cis     
-attribute changeLog                                           2.16.840.1.113730.3.1.35   dn
-attribute changeLogMaximumAge                                 2.16.840.1.113730.3.1.200  cis     
-attribute changeLogMaximumSize                                2.16.840.1.113730.3.1.201  cis     
-attribute documentStore                                       documentStore-oid          cis     
-attribute keyWords                                            keyWords-oid               cis     
-attribute lastModifiedTime                                    0.9.2342.19200300.100.1.23 cis     
-attribute multiLineDescription                                multiLineDescription-oid   cis     
-attribute subject                                             subject-oid                cis     
-attribute ttl                        timeToLive               1.3.6.1.4.1.250.1.60       cis     
-attribute photo                                               0.9.2342.19200300.100.1.7  bin     
-attribute generation                                          generation-oid             ces     
-attribute obsoletedByDocument                                 obsoletedByDocument-oid    dn      
-attribute obsoletesDocument                                   obsoletesDocument-oid      dn      
-attribute reciprocalNamingLink                                reciprocalNaminglink-oid   dn      
-attribute updatedByDocument                                   updatedByDocument-oid      dn      
-attribute updatesDocument                                     updatesDocument-oid        dn      
-
-#
-# Attribute types from RFC 2307
-#
-
-attribute	uidNumber		1.3.6.1.1.1.1.0		int single
-attribute	gidNumber		1.3.6.1.1.1.1.1		int single
-attribute	gecos			1.3.6.1.1.1.1.2		cis single
-attribute	homeDirectory		1.3.6.1.1.1.1.3		ces single
-attribute	loginShell		1.3.6.1.1.1.1.4		ces single
-attribute	shadowLastChange	1.3.6.1.1.1.1.5		int single
-attribute	shadowMin		1.3.6.1.1.1.1.6		int single
-attribute	shadowMax		1.3.6.1.1.1.1.7		int single
-attribute	shadowWarning		1.3.6.1.1.1.1.8		int single
-attribute	shadowInactive		1.3.6.1.1.1.1.9		int single
-attribute	shadowExpire		1.3.6.1.1.1.1.10	int single
-attribute	shadowFlag		1.3.6.1.1.1.1.11	int single
-attribute	memberUid		1.3.6.1.1.1.1.12	ces
-attribute	memberNisNetgroup	1.3.6.1.1.1.1.13	ces
-attribute	nisNetgroupTriple	1.3.6.1.1.1.1.14	ces
-attribute	ipServicePort		1.3.6.1.1.1.1.15	int single
-attribute	ipServiceProtocol	1.3.6.1.1.1.1.16	cis
-attribute	ipProtocolNumber	1.3.6.1.1.1.1.17	int single
-attribute	oncRpcNumber		1.3.6.1.1.1.1.18	int single
-attribute	ipHostNumber		1.3.6.1.1.1.1.19	cis
-attribute	ipNetworkNumber		1.3.6.1.1.1.1.20	cis single
-attribute	ipNetmaskNumber		1.3.6.1.1.1.1.21	cis single
-attribute	macAddress		1.3.6.1.1.1.1.22	cis
-attribute	bootParameter		1.3.6.1.1.1.1.23	ces
-attribute	bootFile		1.3.6.1.1.1.1.24	ces
-attribute	automountInformation	1.3.6.1.1.1.1.25	ces
-attribute	nisMapName		1.3.6.1.1.1.1.26	cis
-attribute	nisMapEntry		1.3.6.1.1.1.1.27	ces single
diff --git a/ldap/cm/v4confs/412/slapd.oc.conf b/ldap/cm/v4confs/412/slapd.oc.conf
deleted file mode 100644
index 53ca2e65..00000000
--- a/ldap/cm/v4confs/412/slapd.oc.conf
+++ /dev/null
@@ -1,1101 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-#  slapd.oc.conf for Netscape Directory Server 4.1
-#
-#  DO NOT MODIFY! 
-#
-#  The ObjectClasses in this file are Standard ObjectClasses and are expected
-#  to be present in Directory Server 4.1 unchanged. Modifing this file may
-#  cause interoperability problems.
-#
-#  User Defined ObjectClasses should be added by selecting 
-#  Schema | Create ObjectClasses from the Admin Server. 
-#
-#  User Defined ObjectClasses are saved in slapd.user_oc.conf
-#  
-#  All ObjectClasses are viewable in the cn=schema entry under objectclasses.
-#
-# The format of this file is:
-#
-#  objectclass ObjectClassName
-#       [ oid ObjectIdentifier ]
-#       [ superior ParentObjectClass ]
-#       [ requires <comma separated list of required attributes> ]
-#       [ allows   <comma separated list of allowed attributes>  ]
-#  
-
-objectclass top
-	oid 2.5.6.0
-	requires
-		objectClass
-	allows
-		aci
-
-objectclass alias
-	oid 2.5.6.1
-	superior top
-	requires
-		aliasedObjectName
-
-objectclass country
-	oid 2.5.6.2
-	superior top
-	requires
-		c
-	allows
-		searchGuide,
-		description
-
-objectclass locality
-	oid 2.5.6.3
-	superior top
-	allows
-		description,
-		l,
-		searchGuide,
-		seeAlso,
-		st,
-		street
-
-objectclass organization
-	oid 2.5.6.4
-	superior top
-	requires
-		o
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass organizationalUnit
-	oid 2.5.6.5
-	superior top
-	requires
-		ou
-	allows
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass person
-	oid 2.5.6.6
-	superior top
-	requires
-		sn,
-		cn
-	allows
-		description,
-		seeAlso,
-		telephoneNumber,
-		userPassword
-
-objectclass organizationalPerson
-	oid 2.5.6.7
-	superior person
-	allows
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		title,
-		x121Address
-
-# The certificate attributes include all subtypes, such as ';binary'.
-#
-objectclass inetOrgPerson
-    oid 2.16.840.1.113730.3.2.2
-    superior organizationalPerson
-	allows
-		audio,
-		businessCategory,
-		carLicense,
-		departmentNumber,
-		displayName,
-		employeeType,
-		employeeNumber,
-		givenName,
-		homePhone,
-		homePostalAddress,
-		initials,
-		jpegPhoto,
-		labeledURI,
-		manager,
-		mobile,
-		pager,
-		photo,
-		preferredLanguage,
-		mail,
-		o,
-		roomNumber,
-		secretary,
-		uid,
-		x500uniqueIdentifier,
-		userCertificate,
-		userSMimeCertificate,
-		userPKCS12
- 
-objectclass ntUser
-	oid 2.16.840.1.113730.3.2.8
-	superior top
-	requires
-		ntUserDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntUserPriv,
-		ntUserHomeDir,
-		ntUserComment,
-		ntUserFlags,
-		ntUserScriptPath,
-		ntUserAuthFlags,
-		ntUserUsrComment,
-		ntUserParms,
-		ntUserWorkstations,
-		ntUserLastLogon,
-		ntUserLastLogoff,
-		ntUserAcctExpires,
-		ntUserMaxStorage,
-		ntUserUnitsPerWeek,
-		ntUserLogonHours,
-		ntUserBadPwCount,
-		ntUserNumLogons,
-		ntUserLogonServer,
-		ntUserCountryCode,
-		ntUserCodePage,
-		ntUserUniqueId,
-		ntUserPrimaryGroupId,
-		ntUserProfile,
-		ntUserHomeDirDrive,
-		ntUserPasswordExpired,
-		ntUserCreateNewAccount,
-		ntUserDeleteAccount
-
-objectclass ntGroup
-	oid 2.16.840.1.113730.3.2.9
-	superior top
-	requires
-		ntGroupDomainId
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		ntGroupId,
-		ntGroupAttributes,
-		ntGroupCreateNewGroup,
-		ntGroupDeleteGroup,
-		ntGroupType
-
-objectclass organizationalRole
-   oid 2.5.6.8
-   superior top  
-	requires
-		cn
-	allows
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		ou,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		roleOccupant,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass groupOfNames
-   oid 2.5.6.9
-   superior top  
-	requires
-		cn
-	allows
-		member,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfUniqueNames
-    oid 2.5.6.17
-    superior top  
-	requires
-		cn
-	allows
-		uniqueMember,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfCertificates
-    oid 2.16.840.1.113730.3.2.31
-    superior top  
-	requires
-		cn
-	allows
-		memberCertificateDescription,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass groupOfURLs
-    oid  2.16.840.1.113730.3.2.33
-    superior top  
-	requires
-		cn
-	allows
-		memberURL,
-		businessCategory,
-		description,
-		o,
-		ou,
-		owner,
-		seeAlso
-
-objectclass residentialPerson
-   oid 2.5.6.10
-   superior person  
-	requires
-		l
-	allows
-		businessCategory,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		st,
-		street,
-		teletexTerminalIdentifier,
-		telexNumber,
-		x121Address
-
-objectclass applicationProcess
-    oid 2.5.6.11
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso
-
-objectclass LDAPServer
-	oid 2.16.840.1.113730.3.2.35
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		generation,
-		changeLogMaximumAge,
-		changeLogMaximumSize
-
-objectclass LDAPReplica
-	oid 2.16.840.1.113730.3.2.36
-	superior top
-	requires
-		cn
-	allows
-		description,
-		l,
-		ou,
-		seeAlso,
-		replicaRoot,
-		replicaHost,
-		replicaPort,
-		replicaBindDn,
-		replicaCredentials,
-		replicaBindMethod,
-		replicaUseSSL,
-		replicaUpdateSchedule,
-		replicaUpdateReplayed,
-		replicaUpdateFailedAt,
-		replicaBeginORC,
-		replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList,
-		replicaCFUpdated,
-		replicaAbandonedChanges,
-		replicaLastRelevantChange
-
-objectclass applicationEntity
-    oid 2.5.6.12
-    superior top  
-	requires
-		presentationAddress,
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		supportedApplicationContext
-
-objectclass dSA
-   oid 2.5.6.13
-   superior applicationEntity  
-	allows
-		knowledgeInformation
-
-objectclass device
-    oid 2.5.6.14
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# This userCertificate attribute includes all subtypes, such as ';binary'.
-objectclass strongAuthenticationUser
-    oid 2.5.6.15
-    superior top 
-	requires
-		userCertificate
-
-# These attributes include all subtypes, such as ';binary'.
-objectclass certificationAuthority
-    oid 2.5.6.16
-    superior top 
-	requires
-		cACertificate
-	allows
-		authorityRevocationList,
-		certificateRevocationList,
-		crossCertificatePair
-
-objectclass pilotObject
-    oid 0.9.2342.19200300.100.4.3
-    superior top  
-	allows
-		audio,
-		dITRedirect,
-		info,
-		jpegPhoto,
-		lastModifiedBy,
-		lastModifiedTime,
-		manager,
-		photo,
-		uniqueIdentifier
-
-objectclass newPilotPerson
-    oid 0.9.2342.19200300.100.4.4
-    superior person 
-	allows
-		businessCategory,
-		drink,
-		homePhone,
-		homePostalAddress,
-		janetMailbox,
-		mail,
-		mailPreferenceOption,
-		mobile,
-		organizationalStatus,
-		otherMailbox,
-		pager,
-		personalSignature,
-		personalTitle,
-		preferredDeliveryMethod,
-		roomNumber,
-		secretary,
-		textEncodedORAddress,
-		uid,
-		userClass
-
-objectclass account
-    oid 0.9.2342.19200300.100.4.5
-    superior top  
-    requires
-		uid
-	allows
-		description,
-		host,
-		l,
-		o,
-		ou,
-		seeAlso
-
-objectclass document
-    oid 0.9.2342.19200300.100.4.6
-    superior pilotObject 
-	requires
-		documentIdentifier
-	allows
-		abstract,
-		authorCN,
-		authorSN,
-		cn,
-		description,
-		documentAuthor,
-		documentLocation,
-		documentPublisher,
-		documentStore,
-		documentTitle,
-		documentVersion,
-		keywords,
-		l,
-		o,
-		obsoletedByDocument,
-		obsoletesDocument,
-		ou,
-		seeAlso,
-		subject,
-		updatedByDocument,
-		updatesDocument
-
-objectclass room
-    oid 0.9.2342.19200300.100.4.7
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		roomNumber,
-		seeAlso,
-		telephoneNumber
-
-objectclass documentSeries
-    oid 0.9.2342.19200300.100.4.9
-    superior top  
-	requires
-		cn
-	allows
-		description,
-		l,
-		o,
-		ou,
-		seeAlso,
-		telephoneNumber
-
-objectclass domain
-    oid 0.9.2342.19200300.100.4.13
-    superior top  
-	requires
-		dc
-	allows
-		associatedName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		manager,
-		o,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-objectclass RFC822localPart
-    oid 0.9.2342.19200300.100.4.14
-    superior domain 
-	allows
-		cn,
-		sn
-
-objectclass DNSDomain
-    oid 0.9.2342.19200300.100.4.15
-    superior domain  
-	allows
-		dNSRecord
-
-objectclass domainRelatedObject
-    oid 0.9.2342.19200300.100.4.17
-    superior top 
-	requires
-		associatedDomain
-
-objectclass friendlyCountry
-    oid 0.9.2342.19200300.100.4.18
-    superior country 
-	requires
-		co
-
-objectclass simpleSecurityObject
-	oid 0.9.2342.19200300.100.4.19
-	superior top 
-	requires
-		userPassword
-
-objectclass pilotOrganization
-	oid pilotOrganization-OID
-	superior top
-	requires
-		ou,
-		o
-	allows
-		buildingName,
-		businessCategory,
-		description,
-		destinationIndicator,
-		facsimileTelephoneNumber,
-		internationaliSDNNumber,
-		l,
-		physicalDeliveryOfficeName,
-		postOfficeBox,
-		postalAddress,
-		postalCode,
-		preferredDeliveryMethod,
-		registeredAddress,
-		searchGuide,
-		seeAlso,
-		st,
-		street,
-		telephoneNumber,
-		teletexTerminalIdentifier,
-		telexNumber,
-		userPassword,
-		x121Address
-
-
-objectclass labeledURIObject
-	oid 1.3.6.1.4.1.250.3.15 
-	superior top
-	allows
-		labeledURI
-
-objectclass cacheObject
-	oid 1.3.6.1.4.1.250.3.18 
-	superior top
-	allows
-		ttl
-
-# objectclasses below added since Netscape Directory Server 1.01
-
-objectclass netscapeServer 
-	oid 2.16.840.1.113730.3.2.10
-	superior top
-	requires 
-		cn 
-	allows 
-		description,
-		serverRoot,
-		serverProductName,
-		serverVersionNumber,
-		installationTimeStamp,
-		administratorContactInfo,
-		userpassword,
-		adminURL,
-		serverHostName
-
-objectclass nsLicenseUser
-	oid 2.16.840.1.113730.3.2.7
-	superior top
-	allows
-		nsLicensedFor,
-		nsLicenseStartTime,
-		nsLicenseEndTime
-
-objectclass changeLogEntry
-	oid 2.16.840.1.113730.3.2.1
-	superior top
-	requires
-		targetdn,
-		changeTime,
-		changenumber,
-		changeType
-	allows
-		changes,
-		newrdn,
-		deleteoldrdn,
-		newsuperior,
-		filterinfo
-
-objectclass cirReplicaSource
-	oid 2.16.840.1.113730.3.2.11
-	requires 
-		cn,
-		objectClass
-	allows
-		cirReplicaRoot,
-                cirHost,
-                cirPort,
-                cirBindDN,
-                cirUsePersistentSearch,
-                cirUseSSL,
-                cirBindCredentials,
-                cirLastUpdateApplied,
-                cirUpdateSchedule,
-                cirSyncInterval,
-                cirUpdateFailedAt,
-                cirBeginORC,
-                replicaNickname,
-		replicaEntryFilter,
-		replicatedAttributeList
-
-objectclass referral
-	superior top
-	oid 2.16.840.1.113730.3.2.6
-	allows
-		ref
-
-objectclass passwordObject
-		oid  2.16.840.1.113730.3.2.12
-        requires
-                objectClass
-        allows
-                passwordExpirationTime,
-                passwordExpWarned,
-                passwordRetryCount,
-                retryCountResetTime,
-                accountUnlockTime,
-                passwordHistory,
-		passwordAllowChangeTime
-
-objectclass passwordPolicy
-		oid  2.16.840.1.113730.3.2.13
-        requires
-                objectClass
-        allows
-		passwordMaxAge,		
-		passwordExp,
-		passwordMinLength,
-		passwordKeepHistory,
-		passwordInHistory,
-		passwordChange,
-		passwordWarning,
-		passwordLockout,
-		passwordMaxFailure,
-		passwordResetDuration,
-		passwordUnlock,
-		passwordLockoutDuration,
-		passwordCheckSyntax,
-                passwordMustChange,
-                passwordStorageScheme,
-                passwordMinAge,
-                passwordResetFailureCount
-
-objectclass glue
-		oid  2.16.840.1.113730.3.2.30
-		superior top
-
-objectclass netscapeMachineData
-		oid  2.16.840.1.113730.3.2.32
-		superior top
-
-objectclass dcObject
-	oid 1.3.6.1.4.1.1466.344
-	superior top
-	requires 
-		dc
-
-objectclass subschema
-	oid 2.5.20.1
-	superior top
-	allows 
-		cn,
-		dITStructureRules,
-		nameForms,
-		dITContentRules,
-		objectClasses,
-		attributeTypes,
-		matchingRules,
-		matchingRuleUse
-
-objectclass vlvSearch
-    oid 2.16.840.1.113730.3.2.38
-    superior top
-    requires
-        cn,
-        vlvBase,
-        vlvScope,
-        vlvFilter
-    allows
-        multiLineDescription
-
-objectclass nsslapdConfig
-	oid 2.16.840.1.113730.3.2.39
-	superior top
-	allows cn
-
-objectclass directoryServerFeature
-    oid 2.16.840.1.113730.3.2.40
-    superior top
-    allows
-        oid,
-        cn,
-        multiLineDescription
-
-objectclass nsslapdPlugin
-	oid 2.16.840.1.113730.3.2.41 
-	superior top
-	requires
-		cn,
-		nsslapd-pluginPath,
-		nsslapd-pluginInitFunc,
-		nsslapd-pluginType,
-		nsslapd-pluginId,
-		nsslapd-pluginVersion,
-		nsslapd-pluginVendor,
-		nsslapd-pluginDescription,
-		nsslapd-pluginEnabled,
-		nsslapd-backend
-
-objectclass vlvIndex
-    oid 2.16.840.1.113730.3.2.42
-    superior top
-    requires
-        cn,
-        vlvSort
-    allows
-        vlvEnabled,
-        vlvUses
-	
-objectclass nsSNMP
-	OID 2.16.840.1.113730.3.2.43
-	superior top
-	requires 
-		cn,
-		nsSNMPEnabled
-	allows
-		nsSNMPOrganization,
-		nsSNMPLocation,
-		nsSNMPContact,
-		nsSNMPDescription,
-		nsSNMPMasterHost,
-		nsSNMPMasterPort
-
-objectclass nsIndex
-    oid 2.16.840.1.113730.3.2.44
-    superior top
-    requires
-		cn,
-		nsSystemIndex
-    allows
-		description,
-		nsIndexType,
-		nsMatchingRule
-
-#
-# ojectclass from rfc2307
-#	
-
-# posixAccount is an auxiliary class. You may use account as a structural
-# class.
-objectclass posixAccount
-	oid
-		1.3.6.1.1.1.2.0
-	superior
-		top
-	requires
-		objectClass,
-		cn,
-		uid,
-		uidNumber,
-		gidNumber,
-		homeDirectory
-	allows
-		userPassword,
-		loginShell,
-		gecos,
-		description
-
-# posixAccount is an auxiliary class. You may use account as a structural
-# class.
-objectclass shadowAccount
-	oid
-		1.3.6.1.1.1.2.1
-	superior
-		top
-	requires
-		objectClass,
-		uid
-	allows
-		userPassword,
-		shadowLastChange,
-		shadowMin,
-		shadowMax,
-		shadowWarning,
-		shadowInactive,
-		shadowExpire,
-		shadowFlag,
-		description
-
-objectclass posixGroup
-	oid
-		1.3.6.1.1.1.2.2
-	requires
-		objectClass,
-		cn,
-		gidNumber
-	allows
-		userPassword,
-		memberUid,
-		description
-
-objectclass ipService
-	oid
-		1.3.6.1.1.1.2.3
-	requires
-		objectClass,
-		cn,
-		ipServicePort,
-		ipServiceProtocol
-	allows
-		description
-
-objectclass ipProtocol
-	oid
-		1.3.6.1.1.1.2.4
-	requires
-		objectClass,
-		cn,
-		ipProtocolNumber
-	allows
-		description
-
-objectclass oncRpc
-	oid
-		1.3.6.1.1.1.2.5
-	requires
-		objectClass,
-		cn,
-		oncRpcNumber
-	allows
-		description
-
-# ipHost is a subclass of device
-objectclass ipHost
-	oid
-		1.3.6.1.1.1.2.6
-	requires
-		objectClass,
-		ipHostNumber,
-		cn
-	allows
-		manager,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-
-objectclass ipNetwork
-	oid
-		1.3.6.1.1.1.2.7
-	requires
-		objectClass,
-		ipNetworkNumber,
-		cn
-	allows
-		ipNetmaskNumber,
-		manager,
-		l,
-		description
-
-objectclass nisNetgroup
-	oid
-		1.3.6.1.1.1.2.8
-	requires
-		objectClass,
-		cn
-	allows
-		nisNetgroupTriple,
-		memberNisNetgroup,
-		description
-
-# the automount class is deprecated. Because cn is case insensitive
-# on matches, you may need to use another object class to unique
-# names.
-objectclass automount
-	oid
-		1.3.6.1.1.1.2.9
-	requires
-		objectClass,
-		cn,
-		automountInformation
-	allows
-		description
-
-# nisObject represents entries in NIS maps.
-objectclass nisObject
-	oid
-		1.3.6.1.1.1.2.10
-	requires
-		objectClass,
-		cn,
-		nisMapEntry,
-		nisMapName
-	allows
-		description
-
-# ieee802Device is a subclass of device
-objectclass ieee802Device
-	oid
-		1.3.6.1.1.1.2.11
-	requires
-		objectClass,
-		cn
-	allows
-		macAddress,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# bootableDevice is a subclass of device
-objectclass bootableDevice
-	oid
-		1.3.6.1.1.1.2.12
-	requires
-		objectClass,
-		cn
-	allows
-		bootFile,
-		bootParameter,
-		description,
-		l,
-		o,
-		ou,
-		owner,
-		seeAlso,
-		serialNumber
-
-# nisMap is a structural class which may be used as a container
-# for instances of nisObject.
-objectclass nisMap
-	oid
-		1.3.6.1.1.1.2.13
-	requires
-		objectClass,
-		nisMapName
-	allows
-		description
-
diff --git a/ldapserver.spec.tmpl b/ldapserver.spec.tmpl
deleted file mode 100644
index 3b1518a0..00000000
--- a/ldapserver.spec.tmpl
+++ /dev/null
@@ -1,232 +0,0 @@
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-# The way we do packaging seems to leave unpackaged files in the builddir;
-# however, we really don't want them
-%define _unpackaged_files_terminate_build 0
-# override the default build name format - we do not want the arch subdir
-%define _build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.%{flavor}.rpm
-# don't bother stripping - we already do this for optimized, and we definitely
-# want the symbols in the debug builds
-%define __os_install_post %{nil}
-Summary: @COMPANY-PRODUCT-NAME@
-Name: @LCASE-COMPANY-NAME-NOSP@-ds
-Version: @NOSP-VERSION@
-Release: 1.@PLATFORM@
-License: GPL plus extensions
-Group: System Environment/Daemons
-URL: @COMPANY-URL@
-Source: %{name}-%{version}.tar.gz
-BuildRoot: %{_builddir}
-BuildPreReq: perl, fileutils, make
-# Without Autoreq: 0, rpmbuild finds all sorts of crazy
-# dependencies that we don't care about, and refuses to install
-Autoreq: 0
-# Don't automatically generate provides list
-AutoProv: 0
-# Without Requires: something, rpmbuild will abort!
-Requires: perl,httpd,cyrus-sasl >= 2.1.15
-Prefix: /opt/%{name}
-
-%description
-@COMPANY-PRODUCT-NAME@ is an LDAPv3 compliant server.
-
-# wait! what's going on here?  where are the prep and build sections?
-# what kind of a .spec file is this anyway?
-# A: one that works well with the current DS build system
-# As we move towards a completely open source build
-# process, will begin doing things in the more RPM way
-# but for now, in order to make our tight deadlines and
-# support RHN distribution, this is the way we do it
-
-%install
-# all we do here is run setup -b to unpack the binaries
-# into the BuildRoot
-# the echo yes is for dsktune to continue
-# the second echo yes is for some platforms that need it
-(echo yes ; echo yes) | ./setup -b $RPM_BUILD_ROOT/%{prefix}
-# remove the setup log files so they aren't packaged
-rm -f $RPM_BUILD_ROOT/%{prefix}/setup/*/*.log
-
-%clean
-if [ -z "$RPM_INSTALL_PREFIX" ]; then
-	RPM_INSTALL_PREFIX=%{prefix}
-fi
-rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX
-
-%files
-# rather than listing individual files, we just package (and own)
-# the entire ldapserver directory - if we change this to put
-# files in different places, we won't be able to do this anymore
-%defattr(-,root,root,-)
-%{prefix}
-
-%pre
-# in case upgrade, need to shutdown the servers before the installation
-ls $RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-  for instance in `ls -d $RPM_INSTALL_PREFIX/slapd-*`
-  do
-    if [ -f $instance/logs/pid ]; then
-      pid=`cat $instance/logs/pid`
-      psval=`ps -ef | egrep $pid`
-      if [ "$psval" != "" ]; then
-        $instance/stop-slapd
-      fi
-    fi
-  done
-fi
-if [ -f $RPM_INSTALL_PREFIX/admin-serv/logs/pid ]; then
-  pid=`cat $RPM_INSTALL_PREFIX/admin-serv/logs/pid`
-  psval=`ps -ef | egrep $pid`
-  if [ "$psval" != "" ]; then
-    $RPM_INSTALL_PREFIX/stop-admin
-  fi
-fi
-
-%post
-echo ""
-if [ -z "$RPM_INSTALL_PREFIX" ]; then
-	RPM_INSTALL_PREFIX=%{prefix}
-fi
-# patch file to fix console ld libpath
-if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then
-    patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch > /dev/null 2>&1
-fi
-if [ "$1" -gt 1 ] ; then
-# patch file to upgrade admin server from 1.0 to 1.0.1
-    if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then
-        patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch > /dev/null 2>&1
-    fi
-# patch file to fix start-admin on Fedora Core 2
-    if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then
-        patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch > /dev/null 2>&1
-    fi
-# patch file to fix module load order
-    if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then
-        patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch > /dev/null 2>&1
-    fi
-# patch file to fix use of admpw for basic auth in the template file
-    if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch ] ; then
-        patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch > /dev/null 2>&1
-    fi
-# patch file to fix use of admpw for basic auth in the real config file
-    if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-admpw.patch ] ; then
-        patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-admpw.patch > /dev/null 2>&1
-    fi
-# fix up file permissions
-    testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf
-    if [ ! -f $testfile ] ; then
-        testfile=$RPM_INSTALL_PREFIX/admin-serv/config/adm.conf
-    fi
-    if [ -f $testfile ] ; then
-        usergroup=`ls -l $testfile | awk '{print $3":"$4}'`
-        if [ -d $RPM_INSTALL_PREFIX/admin-serv/config ] ; then
-            chown $usergroup $RPM_INSTALL_PREFIX/admin-serv/config
-        fi
-        if [ -d $RPM_INSTALL_PREFIX/bin/slapd/authck ] ; then
-            chown $usergroup $RPM_INSTALL_PREFIX/bin/slapd/authck
-        fi
-        if [ -d $RPM_INSTALL_PREFIX/alias ] ; then
-            chown $usergroup $RPM_INSTALL_PREFIX/alias
-        fi
-    fi
-    echo "Upgrade finished.  Please run $RPM_INSTALL_PREFIX/setup/setup to complete the upgrade." 
-else
-    echo "Install finished.  Please run $RPM_INSTALL_PREFIX/setup/setup to complete installation and set up the servers."
-fi
-
-%preun
-# only run uninstall if this is the last version of the package
-if [ "$1" = 0 ] ; then
-	if [ -z "$RPM_INSTALL_PREFIX" ]; then
-		RPM_INSTALL_PREFIX=%{prefix}
-	fi
-	cd $RPM_INSTALL_PREFIX
-	./uninstall -s -force
-fi
-
-%changelog
-* Wed Mar  1 2006 Rich Megginson <rmeggins@redhat.com> - 1.0.2-1
-- Added admserv-conf-tmpl.patch and admserv-conf-admpw.patch to fix the use of admpw for basic auth
-
-* Wed Feb 22 2006 Rich Megginson <rmeggins@redhat.com> - 1.0.2-1
-- Add patch to fix admin server httpd module load order; you
-- must now run setup after an upgrade; copy in the new 00core.ldif
-- schema file to the server instances
-
-* Tue Dec  6 2005 Rich Megginson <rmeggins@redhat.com> - 1.0.1-1
-- Use nosp version instead of gen version to get patch version numbers
-- Patch the admin server in the post install section
-- Remove the unnecessary log files after setup so they aren't packaged
-
-* Wed Nov 09 2005 Nathan Kinder <nkinder@redhat.com> 7.1-2
-- Changed cyrus-sasl dependency to >= 2.1.15 for RHEL3 compatibility
-
-* Fri Nov 04 2005 Noriko Hosoi <nhosoi@redhat.com> 7.1-2
-- Added a dependency: cyrus-sasl >= 2.1.19
-
-* Wed Sep 14 2005 Nathan Kinder <nkinder@redhat.com> 7.1-2
-- Added a dependency on the java-1.4.2-ibm package
-
-* Tue May 10 2005 Richard Megginson <rmeggins@redhat.com> 7.1-2
-- Change release to 2
-
-* Fri Apr  8 2005 Rich Megginson <rmeggins@redhat.com> 7.1-1
-- check for last version removal in preun
-
-* Tue Apr  5 2005 Rich Megginson <rmeggins@redhat.com> 7.1-1
-- make rpm name .flavor.rpm - flavor must be defined in rpmbuild
-
-* Tue Apr  5 2005 Rich Megginson <rmeggins@redhat.com> 7.1-1
-- Removed all of the setup and build stuff - just use the regular DS build process for that
-
-* Tue Apr  5 2005 Rich Megginson <rmeggins@redhat.com> 7.1-1
-- use platform specific packaging directory; add preun to do uninstall
-
-* Fri Apr  1 2005 Rich Megginson <rmeggins@redhat.com> 7.1-1
-- use setup -q to suppress tar output
-
-* Tue Mar 29 2005 Richard Megginson <rmeggins@redhat.com> 7.1-1
-- use INTERNAL_BUILD=1 for internal builds - change rev to 1
-
-* Tue Mar  8 2005 Richard Megginson <rmeggins@redhat.com> 7.1-0
-- use ${prefix} instead of /opt/ldapserver - prefix is defined as /opt/%{name}
-
-* Thu Jan 20 2005 Richard Megginson <rmeggins@redhat.com>
-- Initial build.
-
-