remove obsolete files

15 files changed, 0 insertions, 10831 deletions

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