Resolves: #237356

Summary: Move DS Admin Code into Admin Server (Comment #3)
Description: Cleaning up NT code

4 files changed, 0 insertions, 421 deletions

diff --git a/httpd/src/.cvsignore b/httpd/src/.cvsignore
deleted file mode 100644
index e7b97c5b..00000000
--- a/httpd/src/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.depends
diff --git a/httpd/src/Makefile b/httpd/src/Makefile
deleted file mode 100644
index f08ce41b..00000000
--- a/httpd/src/Makefile
+++ /dev/null
@@ -1,218 +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.cpp for the Netsite Commerce and Communications servers.
-
-BUILD_ROOT = ../..
-
-MODULE=httpdBinary
-
-ifneq ($(ARCH), WINNT)
-OLD_BUILD_ROOT := $(BUILD_ROOT)
-BUILD_ROOT := $(shell cd $(OLD_BUILD_ROOT); pwd)
-BUILDSO=admin
-endif
-
-HTTPD_DIR=$(OBJDIR)
-OBJDEST=$(HTTPD_DIR)/obj
-
-include $(BUILD_ROOT)/nsconfig.mk
-
-ifeq ($(ARCH), WINNT)
-DLLS=$(HTTPD_DIR)/$(HTTPDLL_NAME).dll
-HTTPD_LIB=$(HTTPD_DIR)/$(HTTPDLL_NAME).lib
-EXTRA_LIBS+=$(NSPRLINK)
-
-ifeq ($(BSCINFO), yes)
-BSCS=$(HTTPD_DIR)/httpd.bsc
-endif
-
-else
-BINS=$(HTTPD_DIR)/ns-httpd
-endif
-
-ifeq ($(ARCH), SCO)
-EXTRA_OPTS := -Wl,-Bexport
-endif
-
-ifeq ($(ARCH), UNIXWARE)
-EXTRA_OPTS := -W l,-Bexport
-endif
-
-ifeq ($(ARCH), NCR)
-EXTRA_OPTS := -Wl,-Bexport
-endif
-
-ifeq ($(ARCH), SUNOS4)
-EXTRA_LIBS=-nostdlib /usr/lib/libc.a
-endif
-
-ifeq ($(ARCH), AIX)
-EXTRA_OPTS = -blibpath:../../bin/https:$(DEF_LIBPATH)
-endif
-
-ifeq ($(ARCH), SOLARIS)
-EXTRA_LIBS=$(GCCLIBS)
-endif
-
-ifeq ($(ARCH), WINNT)
-OS_TARGETS= admin $(DLLS)
-endif
-
-all: $(OBJDEST) $(OS_TARGETS) $(BINS) $(BSCS)
-
-include unixso.mk
-
-ifeq ($(ARCH), HPUX)
-comma:=,
-#EXTRA_LIBS +=/opt/CC/lib/cxxshl.o
-EXTRA_LIBS += $(NSCP_DISTDIR)/lib/libprstrms.$(LIB_SUFFIX)
-EXTRA_LIBS := $(subst -E,-E$(comma)+s,$(EXTRA_LIBS))
-EXTRA_OPTS := -Wl,+s,-E
-#The extra library below is required to debug shared libraries.
-ifeq ($(BUILD_DEBUG), full)
-EXTRA_LIBS += /opt/langtools/lib/end.o
-endif
-# THIS IS A TEMPORARY SOLUTION TO THE HPUX COMPILER LIMITATION.  WE
-# NEED TO INCLUDE ALL OF THE eh/LIBC object files into our main executable
-# to avoid having undefined symbols with plugins.
-LIBCARCHIVE = /opt/CC/lib/eh/libC.a
-endif
-
-$(OBJDEST):
-	mkdir -p $(OBJDEST)
-
-HTTPD_LIBS=
-
-ifeq ($(ARCH), WINNT)
-OSOBJS = ntnsapi.o
-FVERSION_FLAGS+=-s$(BUILD_SECURITY)
-else
-OSOBJS =
-endif
-
-ifneq ($(ARCH), WINNT)
-OBJS=
-else
-OBJS=$(addprefix $(OBJDEST)/, $(OSOBJS) )
-endif
-
-MODULE_CFLAGS=
-
-# Unixware linker braindamage.  The libnspr.so won't override select
-# at link time
-ifeq ($(ARCH), UNIXWARE)
-OBJS+=$(HTTPD_DIR)/obj/uxwrap.o
-endif
-
-ifeq ($(ARCH), NCR)
-#OBJS+=$(HTTPD_DIR)/httpd-lib/nspr20/uxwrap.o
-endif
-
-ifeq ($(ARCH), WINNT)
-# Don't define DEPLIBS for NT because standard macros like LINK_EXE
-# and LINK_DLL automatically pick up DEPLIBS which we don't always wan't.
-#                    $(LIBDIRMON) (temporily removed)
-DEPLIBS = $(addsuffix .$(LIB_SUFFIX), $(addprefix $(OBJDIR)/lib/lib, $(LIBADMIN) $(LIBLDAPU) $(LIBACCESS) $(HTTPD_LIBS))) 
-DEPLIBS += $(LIBSECURITY) \
-           $(LIBNSPR) \
-           $(LIBLDAP)
-
-DEPLINK = /LIBPATH:$(OBJDIR)/lib $(addsuffix .$(LIB_SUFFIX), $(addprefix lib, $(LIBADMIN) $(LIBLDAPU) $(LIBACCESS) $(HTTPD_LIBS))) \
-	$(LDAPLINK) $(SECURITYLINK) \
-	$(NSPRLINK)
-else
-# unixso.mk may define DEPLIBS
-ifndef DEPLIBS
-DEPLIBS = $(addsuffix .$(LIB_SUFFIX), \
-                    $(addprefix $(OBJDIR)/lib/lib,$(HTTPD_LIBS)) \
-                    $(OBJDIR)/lib/libaccess \
-                    $(OBJDIR)/lib/libbase \
-                    $(OBJDIR)/lib/libsi18n \
-                    $(LIBSSLIO)
-DEPLIBS += $(SECURITY_DEP) \
-           $(NSPR_DEP)
-
-DEPLINK = $(addsuffix .$(LIB_SUFFIX), \
-                    $(addprefix $(OBJDIR)/lib/lib,$(HTTPD_LIBS)) \
-                    $(OBJDIR)/lib/libaccess \
-                    $(OBJDIR)/lib/libbase \
-                    $(OBJDIR)/lib/libsi18n \
-                    $(SECURITYLINK) \
-                    $(NSPRLINK) \
-                    $(LIBSSLIO)
-endif
-
-endif
-
-ifndef PRODUCT_IS_DIRECTORY_SERVER
-ifeq ($(ARCH), AIX)
-ifdef OLD_AIX_LINKING
-# why is this redefined here?
-CCC = svxlC_r
-endif
-endif
-endif
-ifneq ($(ARCH), WINNT)
-$(BINS): $(DEPLIBS) $(OBJS)
-ifndef PRODUCT_IS_DIRECTORY_SERVER
-	echo "why are we doing this for directory server?"
-	cd $(HTTPD_DIR); $(PURIFY) $(CCC) -o ns-httpd $(OBJS) \
-            $(EXTRA_OPTS) $(DEPLINK) $(EXTRA_LIBS)
-endif # Directory Server
-else # WINNT
-
-$(DLLS): $(OBJS) $(DEPLIBS)
-	-@echo EXTRA_LIBS = $(EXTRA_LIBS)
-	$(PURIFY) $(LINK_DLL) $(DEPLINK) $(OBJS) $(EXTRA_LIBS)
-	cp $(HTTPD_LIB) $(NSCP_DISTDIR)/lib
-	echo $(DLLS) finished
-
-$(BINS): $(OBJS) $(EXEOBJS) $(HTTPD_LIB)
-	rm -f $@
-	echo $(BINS) finished
-
-ifeq ($(BSCINFO), yes)
-$(BSCS): $(OBJS)
-	$(BSCMAKE) $(OBJDEST)/*.sbr
-endif
-endif
-
-
-include $(INCLUDE_DEPENDS)
diff --git a/httpd/src/ntnsapi.c b/httpd/src/ntnsapi.c
deleted file mode 100644
index 9124955e..00000000
--- a/httpd/src/ntnsapi.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-/*
- * Aruna Victor	
- * NT NSAPI works differently from UNIX. The DLL doesn't know the addresses
- * of the functions in the server process and needs to be told them.
- */
-
-#include <nt/nsapi.h>
-
-#ifdef BUILD_DLL
-
-#include <libadmin/libadmin.h>
-#include <libaccess/aclproto.h>
-#include <base/fsmutex.h>
-#include <i18n.h>
-#include <base/ereport.h>
-
-VOID NsapiDummy()
-{	
-	int i = 0;
-	SafTable = (SafFunction **)MALLOC(400 * sizeof(VOID*));
-
-	/* Force references to libadmin */
-	SafTable[i++] = (SafFunction *)get_userdb_dir;
-	/* Functions from libadmin:error.c */
-	SafTable[i++] = (SafFunction *)report_error;
-	/* Functions from libadmin:template.c */
-	SafTable[i++] = (SafFunction *)helpJavaScriptForTopic;
-
-	/* Force references to base */
-	SafTable[i++] = (SafFunction *)fsmutex_init;
-
-}
-#endif /* BUILD_DLL */
-
-VOID InitializeSafFunctions() 
-{
-
-	SafTable = (SafFunction **)MALLOC(400 * sizeof(VOID *));
-
-/* Functions from file.h */
-	SafTable[SYSTEM_STAT] = (SafFunction *)system_stat;
-	SafTable[SYSTEM_FOPENRO] = (SafFunction *)system_fopenRO;
-	SafTable[SYSTEM_FOPENWA] = (SafFunction *)system_fopenWA;
-	SafTable[SYSTEM_FOPENRW] = (SafFunction *)system_fopenRW;
-	SafTable[SYSTEM_NOCOREDUMPS] = (SafFunction *)system_nocoredumps;
-	SafTable[SYSTEM_FWRITE] = (SafFunction *)system_fwrite;
-	SafTable[SYSTEM_FWRITE_ATOMIC] = (SafFunction *)system_fwrite_atomic;
-	SafTable[SYSTEM_WINERR] = (SafFunction *)system_winerr;
-	SafTable[SYSTEM_WINSOCKERR] = (SafFunction *)system_winsockerr;
-
-	SafTable[FILE_NOTFOUND] = (SafFunction *)file_notfound;
-	SafTable[FILE_UNIX2LOCAL] = (SafFunction *)file_unix2local;
-	SafTable[DIR_OPEN] = (SafFunction *)dir_open;
-	SafTable[DIR_READ] = (SafFunction *)dir_read;
-	SafTable[DIR_CLOSE] = (SafFunction *)dir_close;
-
-/* Functions from ereport.h */
-	SafTable[EREPORT] = (SafFunction *)ereport ;
-
-/* Functions from minissl.h */
-	SafTable[SSL_CLOSE] = (SafFunction *)PR_Close;
-	SafTable[SSL_SOCKET] = (SafFunction *)PR_NewTCPSocket;
-	SafTable[SSL_GET_SOCKOPT] = (SafFunction *)PR_GetSocketOption;
-	SafTable[SSL_SET_SOCKOPT] = (SafFunction *)PR_SetSocketOption;
-	SafTable[SSL_BIND] = (SafFunction *)PR_Bind;
-	SafTable[SSL_LISTEN] = (SafFunction *)PR_Listen;
-	SafTable[SSL_ACCEPT] = (SafFunction *)PR_Accept;
-	SafTable[SSL_READ] = (SafFunction *)PR_Read;
-	SafTable[SSL_WRITE] = (SafFunction *)PR_Write;
-	SafTable[SSL_GETPEERNAME] = (SafFunction *)PR_GetPeerName;
-
-
-/* Functions from shexp.h */
-	SafTable[SHEXP_VALID] = (SafFunction *)shexp_valid;
-	SafTable[SHEXP_MATCH] = (SafFunction *)shexp_match;
-	SafTable[SHEXP_CMP] = (SafFunction *)shexp_cmp;
-	SafTable[SHEXP_CASECMP] = (SafFunction *)shexp_casecmp;
-
-/* Functions from systhr.h */
-	SafTable[SYSTHREAD_START] = (SafFunction *)systhread_start;
-	SafTable[SYSTHREAD_ATTACH] = (SafFunction *)systhread_attach;
-	SafTable[SYSTHREAD_TERMINATE] = (SafFunction *)systhread_terminate;
-	SafTable[SYSTHREAD_SLEEP] = (SafFunction *)systhread_sleep;
-	SafTable[SYSTHREAD_INIT] = (SafFunction *)systhread_init;
-	SafTable[SYSTHREAD_NEWKEY] = (SafFunction *)systhread_newkey;
-	SafTable[SYSTHREAD_GETDATA] = (SafFunction *)systhread_getdata;
-	SafTable[SYSTHREAD_SETDATA] = (SafFunction *)systhread_setdata;
-
-/* Functions from systems.h */
-	SafTable[UTIL_STRCASECMP] = (SafFunction *)util_strcasecmp;
-	SafTable[UTIL_STRNCASECMP] = (SafFunction *)util_strncasecmp;
-
-/* Functions from util.h */
-	SafTable[UTIL_HOSTNAME] = (SafFunction *)util_hostname;
-	SafTable[UTIL_ITOA] = (SafFunction *)util_itoa;
-	SafTable[UTIL_VSPRINTF] = (SafFunction *)util_vsprintf;
-	SafTable[UTIL_SPRINTF] = (SafFunction *)util_sprintf;
-	SafTable[UTIL_VSNPRINTF] = (SafFunction *)util_vsnprintf;
-	SafTable[UTIL_SNPRINTF] = (SafFunction *)util_snprintf;
-
-	SafTable[LOG_ERROR_EVENT] = (SafFunction *)LogErrorEvent;
-
-/* Functions from aclproto.h */
-	SafTable[ACL_LISTCONCAT] = (SafFunction *)ACL_ListConcat;
-
-/* Functions from i18n.h */
-	SafTable[GETCLIENTLANG] = (SafFunction *)GetClientLanguage;
-
-/* Functions from file.h */
-        SafTable[SYSTEM_FOPENWT] = (SafFunction *)system_fopenWT;
-        SafTable[SYSTEM_MALLOC] = (SafFunction *)system_malloc;
-        SafTable[SYSTEM_FREE] = (SafFunction *)system_free;
-        SafTable[SYSTEM_REALLOC] = (SafFunction *)system_realloc;
-        SafTable[SYSTEM_STRDUP] = (SafFunction *)system_strdup;
-
-/* Functions from crit.h */
-        SafTable[CRIT_INIT] = (SafFunction *)crit_init;
-        SafTable[CRIT_ENTER] = (SafFunction *)crit_enter;
-        SafTable[CRIT_EXIT] = (SafFunction *)crit_exit;
-        SafTable[CRIT_TERMINATE] = (SafFunction *)crit_terminate;
-        SafTable[SYSTHREAD_CURRENT] = (SafFunction *)systhread_current;
-}
diff --git a/httpd/src/unixso.exp b/httpd/src/unixso.exp
deleted file mode 100644
index 55aae332..00000000
--- a/httpd/src/unixso.exp
+++ /dev/null
@@ -1,38 +0,0 @@
-acl_write_rights
-acl_read_rights
-SEC_ERROR_INVALID_AVA
-SEC_ERROR_INPUT_LEN
-SEC_ERROR_BAD_KEY
-SEC_ERROR_EXPIRED_CERTIFICATE
-SSL_ERROR_BAD_CERT_DOMAIN
-SEC_ERROR_UNTRUSTED_CERT
-SEC_ERROR_UNKNOWN_ISSUER
-SEC_ERROR_BAD_SIGNATURE
-SEC_ERROR_IO
-SEC_ERROR_INVALID_TIME
-XP_ERRNO_EWOULDBLOCK
-XP_ERRNO_EAGAIN
-pr_fdTable
-XP_ERRNO_EIO
-XP_ERRNO_EISCONN
-XP_ERRNO_EINVAL
-XP_ERRNO_EBADF
-XP_ERRNO_ECONNREFUSED
-SSL_ERROR_US_ONLY_SERVER
-SSL_ERROR_EXPORT_ONLY_SERVER
-SSL_ERROR_BAD_CERTIFICATE
-SSL_ERROR_UNSUPPORTED_CERTIFICATE_TYPE
-SSL_ERROR_NO_CERTIFICATE
-SSL_ERROR_UNSUPPORTED_VERSION
-SSL_ERROR_NO_CYPHER_OVERLAP
-SSL_ERROR_BAD_SERVER
-SSL_ERROR_BAD_CLIENT
-SEC_ERROR_OUTPUT_LEN
-SEC_ERROR_INVALID_ARGS
-SEC_ERROR_BAD_DATA
-SEC_ERROR_NO_MEMORY
-SEC_ERROR_BAD_DATABASE
-SEC_ERROR_BAD_DER
-SEC_ERROR_INVALID_ALGORITHM
-SEC_ERROR_LIBRARY_FAILURE
-SEC_ERROR_BAD_PASSWORD