Bug(s) fixed: 167453

Bug Description: Use all open source components
Reviewed by: Noriko (Thanks!)
Fix Description: This changes the DS 72 build to pick up the new Admin
Server open source candidate (using Apache, modules, etc), and the new
adminutil and setuputil components.  The code has been changed to
reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil)
and new versions of these components (7.1) and new /s/b/c disk layout
where applicable.  We don't really get very much from the admin server
anymore, just the admin and base packages.  All of the other setup stuff
(setup, setup.inf, svrcore, etc.) come directly from the setuputil package.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none

5 files changed, 16 insertions, 16 deletions

diff --git a/ldap/admin/src/DSAdmin.mk b/ldap/admin/src/DSAdmin.mk
index 50a27fbe..0a1db8f2 100644
--- a/ldap/admin/src/DSAdmin.mk
+++ b/ldap/admin/src/DSAdmin.mk
@@ -62,7 +62,7 @@ ifneq ($(ARCH), WINNT)
 EXTRALDFLAGS += $(SSLLIBFLAG)
 endif
 
-EXTRA_LIBS += $(LIBPERL_A) $(SETUPSDK_S_LINK) $(LDAP_ADMLIB) \
+EXTRA_LIBS += $(LIBPERL_A) $(SETUPUTIL_S_LINK) $(LDAP_ADMLIB) \
         $(LDAPLINK) $(DEPLINK) $(ADMINUTIL_LINK) \
         $(NSPRLINK) $(NLSLINK) \
         $(NLSLINK_CONV_STATIC)
@@ -102,7 +102,7 @@ DSADMIN_BASENAME = DSAdmin$(DLL_PRESUFFIX).$(DLL_SUFFIX)
 OBJS= $(addprefix $(OBJDEST)/, $(DSADMIN_OBJS)) 
 DSADMIN_SO = $(addprefix $(BINDIR)/, $(DSADMIN_BASENAME))
 
-EXTRA_LIBS_DEP = $(SETUPSDK_DEP)
+EXTRA_LIBS_DEP = $(SETUPUTIL_DEP)
 
 # for Solaris, our most common unix build platform, we check for undefined
 # symbols at link time so we don't catch them at run time.  To do this, we
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile
index fedbd724..af5cb826 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/Makefile
@@ -95,8 +95,8 @@ ifeq ($(USE_ADMINSERVER), 1)
   EXTRA_LIBS += $(ADMINUTIL_LINK)
 endif
 EXTRA_LIBS += $(SECURITYLINK) $(NSPRLINK)
-ifeq ($(USE_SETUPSDK), 1)
-  EXTRA_LIBS += $(SETUPSDK_S_LINK)
+ifeq ($(USE_SETUPUTIL), 1)
+  EXTRA_LIBS += $(SETUPUTIL_S_LINK)
 endif
 EXTRA_LIBS += $(ICULINK) $(OLD_EXTRA_LIBS)
 
@@ -220,7 +220,7 @@ endif
 
 ifeq ($(ARCH), WINNT)
 OBJECTS += namegen.o latest_file.o
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
   OBJECTS += ds_remove_uninst.o
 endif
 endif
@@ -308,7 +308,7 @@ $(BINDIR)/ds_create.exe:	$(OBJDEST)/instindex.o $(OBJDEST)/cfg_sspt.o \
 	$(LINK_EXE) $(NT_NOLIBS) $(OBJDEST)/instindex.o \
 		$(OBJDEST)/create_instance.o $(OBJDEST)/cfg_sspt.o \
 		$(OBJDEST)/configure_instance.o $(OBJDEST)/script-gen.o \
-		$(SETUPSDK_S_LINK) $(LDAP_SDK_LIBS) $(LIBNT) \
+		$(SETUPUTIL_S_LINK) $(LDAP_SDK_LIBS) $(LIBNT) \
 		$(NSPRLINK) $(EXTRA_LIBS) $(DB_LIB)
 # linking this file causes a .exp and a .lib file to be generated which don't seem
 # to be required while running, so I get rid of them
@@ -317,10 +317,10 @@ $(BINDIR)/ds_create.exe:	$(OBJDEST)/instindex.o $(OBJDEST)/cfg_sspt.o \
 $(BINDIR)/ds_remove:  $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP)
 	$(LINK_EXE_NOLIBSOBJS)  $(SHARED) $(EXTRALDFLAGS) \
 		$(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/init_ds_env.o \
-		$(SETUPSDK_S_LINK) $(GLUEOBJ) $(EXTRA_LIBS)
+		$(SETUPUTIL_S_LINK) $(GLUEOBJ) $(EXTRA_LIBS)
 
 $(BINDIR)/ds_remove.exe:  $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP)
-	$(LINK_EXE) $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/ds_remove.o $(OBJDEST)/init_ds_env.o $(LDAP_SDK_LIBS) $(NSPRLINK) $(SETUPSDK_S_LINK) $(NT_NOLIBS)
+	$(LINK_EXE) $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/ds_remove.o $(OBJDEST)/init_ds_env.o $(LDAP_SDK_LIBS) $(NSPRLINK) $(SETUPUTIL_S_LINK) $(NT_NOLIBS)
 # linking this file causes a .exp and a .lib file to be generated which don't seem
 # to be required while running, so I get rid of them
 	$(RM) $(subst .exe,.exp,$@) $(subst .exe,.lib,$@)
@@ -330,9 +330,9 @@ $(OBJDEST)/%.o: %.c
 
 $(OBJDEST)/%.o: %.cpp
 ifeq ($(ARCH), WINNT)
-	$(CC) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPSDK_INCLUDE) $< $(OFFLAG)$@
+	$(CC) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@
 else
-	$(CXX) $(EXCEPTIONS) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPSDK_INCLUDE) $< $(OFFLAG)$@
+	$(CXX) $(EXCEPTIONS) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@
 endif
 
 ifneq ($(ARCH), WINNT)
diff --git a/ldap/admin/src/create_instance.c b/ldap/admin/src/create_instance.c
index aa08733f..aa0eedc3 100644
--- a/ldap/admin/src/create_instance.c
+++ b/ldap/admin/src/create_instance.c
@@ -1161,7 +1161,7 @@ char *create_server(server_config_s *cf, char *param_name)
                "        sleep 1;\n"
                "    else\n"
                "        PID=`cat $PIDFILE`\n"
-            /* rbyrne: setupsdk takes any message here as an error:
+            /* rbyrne: setuputil takes any message here as an error:
                 "        echo Server has been started. ns-slapd process started: $PID\n"*/
                "        exit 0;\n"
                "    fi\n"
@@ -1218,7 +1218,7 @@ char *create_server(server_config_s *cf, char *param_name)
                "        sleep 1;\n"
                "    else\n"
                "        PID=`cat $PIDFILE`\n"
-                /* rbyrne: setupsdk takes any message here as an error:
+                /* rbyrne: setuputil takes any message here as an error:
                "        echo Server has been started. ns-slapd process started: $PID\n"*/
                "        exit 0;\n"
                "    fi\n"
@@ -1297,7 +1297,7 @@ char *create_server(server_config_s *cf, char *param_name)
             "    fi\n"
             "    else\n"
             "        PID=`cat $PIDFILE`\n"
-            /* rbyrne: setupsdk takes any message here as an error:
+            /* rbyrne: setuputil takes any message here as an error:
             "        echo Server has been started. ns-slapd process started: $PID\n"*/
             "        exit 0;\n"
             "    fi\n"
@@ -1345,7 +1345,7 @@ char *create_server(server_config_s *cf, char *param_name)
            "        if test -f $PIDFILE ; then\n"
            "            rm -f $PIDFILE\n"
            "        fi\n"
-            /* rbyrne: setupsdk takes any message here as an error:
+            /* rbyrne: setuputil takes any message here as an error:
                "        echo Server has been stopped. ns-slapd process stopped: $PID\n"*/
            "        exit 0\n"
            "    fi\n"
diff --git a/ldap/admin/src/ds_newinst.c b/ldap/admin/src/ds_newinst.c
index 37576867..6f686cf3 100644
--- a/ldap/admin/src/ds_newinst.c
+++ b/ldap/admin/src/ds_newinst.c
@@ -37,7 +37,7 @@
 /*
  * ds_newinst.c - creates a new instance of directory server, scripts,
  * configuration, etc.  Does not create any Admin Server stuff or
- * deal with any setupsdk stuff, but may be optionally used to create
+ * deal with any setuputil stuff, but may be optionally used to create
  * and configure the config suffix (o=NetscapeRoot)
  */
 
diff --git a/ldap/admin/src/ds_remove_uninst.cpp b/ldap/admin/src/ds_remove_uninst.cpp
index 672be925..79fef790 100644
--- a/ldap/admin/src/ds_remove_uninst.cpp
+++ b/ldap/admin/src/ds_remove_uninst.cpp
@@ -37,7 +37,7 @@
  * END COPYRIGHT BLOCK **/
 // ds_remove_uninst.cpp
 //
-// ds_remove routines that use c++ calls in adminsdk
+// ds_remove routines that use c++ calls in adminutil
 //
 #include <iostream.h>
 #include <fstream.h>