summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--httpd/src/ntnsapi.c1
-rw-r--r--include/base/crit.h5
-rw-r--r--include/base/ereport.h4
-rw-r--r--include/base/file.h4
-rw-r--r--include/base/pool.h4
-rw-r--r--include/base/shexp.h4
-rw-r--r--include/base/systems.h6
-rw-r--r--include/base/systhr.h4
-rw-r--r--include/base/util.h17
-rw-r--r--include/netsite.h90
-rw-r--r--include/public/base/systems.h4
-rw-r--r--include/public/nsacl/aclapi.h6
-rw-r--r--include/public/nsacl/plistdef.h6
-rw-r--r--ldap/clients/dsgw/dsgw.h2
-rw-r--r--lib/base/system.cpp24
-rw-r--r--lib/libaccess/Makefile62
-rw-r--r--lib/libaccess/aclerror.cpp4
17 files changed, 15 insertions, 232 deletions
diff --git a/httpd/src/ntnsapi.c b/httpd/src/ntnsapi.c
index 4e545f12..bf3f1073 100644
--- a/httpd/src/ntnsapi.c
+++ b/httpd/src/ntnsapi.c
@@ -15,7 +15,6 @@
#include <libadmin/libadmin.h>
#include <libaccess/aclproto.h>
-#include <libaccess/nsadb.h>
#include <base/fsmutex.h>
#include <i18n.h>
#include <base/ereport.h>
diff --git a/include/base/crit.h b/include/base/crit.h
index ad0ed09a..03c46bab 100644
--- a/include/base/crit.h
+++ b/include/base/crit.h
@@ -24,11 +24,6 @@
#include "netsite.h"
#endif /* !NETSITE_H */
-/* Define C interface */
-#ifndef PUBLIC_BASE_CRIT_H
-#include "public/base/crit.h"
-#endif /* !PUBLIC_BASE_CRIT_H */
-
/* Define C++ interface */
#ifdef __cplusplus
diff --git a/include/base/ereport.h b/include/base/ereport.h
index e067a84e..9ef44e16 100644
--- a/include/base/ereport.h
+++ b/include/base/ereport.h
@@ -16,10 +16,6 @@
* Rob McCool
*/
-#ifndef PUBLIC_BASE_EREPORT_H
-#include "public/base/ereport.h"
-#endif /* !PUBLIC_BASE_EREPORT_H */
-
/* --- Begin function prototypes --- */
#ifdef INTNSAPI
diff --git a/include/base/file.h b/include/base/file.h
index c4ff47c3..869cf3f8 100644
--- a/include/base/file.h
+++ b/include/base/file.h
@@ -19,10 +19,6 @@
#include "../netsite.h"
#endif /* !NETSITE_H */
-#ifndef PUBLIC_BASE_FILE_H
-#include "public/base/file.h"
-#endif /* !PUBLIC_BASE_FILE_H */
-
/* --- Begin function prototypes --- */
#ifdef INTNSAPI
diff --git a/include/base/pool.h b/include/base/pool.h
index 8c8bf91b..b883e24e 100644
--- a/include/base/pool.h
+++ b/include/base/pool.h
@@ -30,10 +30,6 @@
#include "netsite.h"
#endif /* !NETSITE_H */
-#ifndef PUBLIC_BASE_POOL_H
-#include "public/base/pool.h"
-#endif /* !PUBLIC_BASE_POOL_H */
-
/* --- Begin function prototypes --- */
#ifdef INTNSAPI
diff --git a/include/base/shexp.h b/include/base/shexp.h
index a1e68c3e..1ed6cf0d 100644
--- a/include/base/shexp.h
+++ b/include/base/shexp.h
@@ -72,10 +72,6 @@
#endif /* USE_REGEX */
#endif /* !MCC_PROXY */
-#ifndef PUBLIC_BASE_SHEXP_H
-#include "public/base/shexp.h"
-#endif /* !PUBLIC_BASE_SHEXP_H */
-
/* --- Begin function prototypes --- */
#ifdef INTNSAPI
diff --git a/include/base/systems.h b/include/base/systems.h
index 1e77faf2..b1ce1188 100644
--- a/include/base/systems.h
+++ b/include/base/systems.h
@@ -256,7 +256,6 @@
#define NEED_SETEID_PROTO /* setegid, seteuid */
#define NET_SOCKETS
#define SHMEM_MMAP_FLAGS MAP_SHARED
-#define TCPLEN_T size_t
#define USE_PIPE
/*
* define this if your C++ platform has separate inline functions for
@@ -449,6 +448,7 @@ typedef void* PASSWD;
#include "public/base/systems.h"
#endif /* PUBLIC_BASE_SYSTEMS_H */
+
/* --- Begin defaults for values not defined above --- */
#ifndef DAEMON_LISTEN_SIZE
@@ -465,10 +465,6 @@ typedef void* PASSWD;
#define CONSTVALSTRCAST
#endif
-#ifndef TCPLEN_T
-#define TCPLEN_T int
-#endif
-
#ifndef THROW_HACK
#define THROW_HACK /* as nothing */
#endif
diff --git a/include/base/systhr.h b/include/base/systhr.h
index 12cae43c..7d7efee1 100644
--- a/include/base/systhr.h
+++ b/include/base/systhr.h
@@ -22,10 +22,6 @@
#ifdef THREAD_ANY
-#ifndef PUBLIC_BASE_SYSTHR_H
-#include "public/base/systhr.h"
-#endif /* !PUBLIC_BASE_SYSTHR_H */
-
/* --- Begin function prototypes --- */
#ifdef INTNSAPI
diff --git a/include/base/util.h b/include/base/util.h
index dfd26038..467247b2 100644
--- a/include/base/util.h
+++ b/include/base/util.h
@@ -17,9 +17,10 @@
* Rob McCool
*/
-#ifndef PUBLIC_BASE_UTIL_H
-#include "public/base/util.h"
-#endif /* !PUBLIC_BASE_UTIL_H */
+#ifndef PUBLIC_NSAPI_H
+#include "public/nsapi.h"
+#endif /* !PUBLIC_NSAPI_H */
+
/* --- Begin common function prototypes --- */
@@ -68,20 +69,10 @@ NSPR_END_EXTERN_C
#define util_strncasecmp INTutil_strncasecmp
#define util_localtime INTutil_localtime
-#ifdef NEED_STRCASECMP
-#define util_strcasecmp INTutil_strcasecmp
-#define strcasecmp INTutil_strcasecmp
-#endif /* NEED_STRCASECMP */
-
#ifdef NEED_STRINGS_H /* usually for strcasecmp */
#include <strings.h>
#endif
-#ifdef NEED_STRNCASECMP
-#define util_strncasecmp INTutil_strncasecmp
-#define strncasecmp INTutil_strncasecmp
-#endif /* NEED_STRNCASECMP */
-
#endif /* INTNSAPI */
#endif /* !BASE_UTIL_H */
diff --git a/include/netsite.h b/include/netsite.h
index 716d737a..e9f443d2 100644
--- a/include/netsite.h
+++ b/include/netsite.h
@@ -41,69 +41,6 @@
#include "base/systems.h"
#endif /* !BASE_SYSTEMS_H */
-#undef MAGNUS_VERSION_STRING
-
-#ifdef MCC_PROXY
-#define MAGNUS_VERSION PROXY_VERSION_DEF
-#define MAGNUS_VERSION_STRING PROXY_VERSION_STRING
-
-#elif defined(NS_CMS)
-#define MAGNUS_VERSION CMS_VERSION_DEF
-#define MAGNUS_VERSION_STRING CMS_VERSION_STRING
-
-#elif defined(NS_DS)
-#define MAGNUS_VERSION DS_VERSION_DEF
-#define MAGNUS_VERSION_STRING DS_VERSION_STRING
-
-#elif defined(MCC_ADMSERV)
-#define MAGNUS_VERSION ADMSERV_VERSION_DEF
-#define MAGNUS_VERSION_STRING ADMSERV_VERSION_STRING
-
-#elif defined(NS_CATALOG)
-#define MAGNUS_VERSION CATALOG_VERSION_DEF
-#define MAGNUS_VERSION_STRING CATALOG_VERSION_STRING
-
-#elif defined(NS_RDS)
-#define MAGNUS_VERSION RDS_VERSION_DEF
-#define MAGNUS_VERSION_STRING RDS_VERSION_STRING
-
-#elif defined(MCC_HTTPD)
-
-#ifdef NS_PERSONAL
-#define MAGNUS_VERSION PERSONAL_VERSION_DEF
-#else
-#define MAGNUS_VERSION ENTERPRISE_VERSION_DEF
-#endif
-
-#if defined(XP_UNIX) || defined(USE_ADMSERV)
-#if defined(NS_DS)
-#define MAGNUS_VERSION_STRING DS_VERSION_STRING
-#elif defined(NS_PERSONAL)
-#define MAGNUS_VERSION_STRING PERSONAL_VERSION_STRING
-#elif defined(NS_CATALOG)
-#define MAGNUS_VERSION_STRING CATALOG_VERSION_STRING
-#elif defined(NS_RDS)
-#define MAGNUS_VERSION_STRING RDS_VERSION_STRING
-#elif defined(NS_CMS)
-#define MAGNUS_VERSION_STRING CMS_VERSION_STRING
-#else
-#define MAGNUS_VERSION_STRING ENTERPRISE_VERSION_STRING
-#endif
-#endif /* XP_UNIX */
-
-#elif defined(MCC_NEWS)
-#define MAGNUS_VERSION_STRING NEWS_VERSION_STRING
-
-#elif defined(NS_MAIL)
-#define MAGNUS_VERSION MAIL_VERSION_DEF
-#define MAGNUS_VERSION_STRING MAIL_VERSION_STRING
-
-#elif defined(MCC_BATMAN)
-#define MAGNUS_VERSION BATMAN_VERSION_DEF
-#define MAGNUS_VERSION_STRING BATMAN_VERSION_STRING
-
-#endif
-
#ifndef VOID
#define VOID void
#endif
@@ -147,33 +84,6 @@ typedef int boolean;
NSPR_BEGIN_EXTERN_C
-/* -------------------------- System version on NT------------------------- */
-
-/* Encode the server version as a number to be able to provide inexpensive
- * dynamic checks on server version - this isn't added in yet. */
-
-#define ENTERPRISE_VERSION 1
-#define PERSONAL_VERSION 2
-#define CATALOG_VERSION 3
-#define RDS_VERSION 4
-#define CMS_VERSION 5
-#undef DS_VERSION
-#define DS_VERSION 6
-
-#define server_fasttrack (!strcmp(MAGNUS_VERSION_STRING, PERSONAL_VERSION_STRING))
-#define server_enterprise (!strcmp(MAGNUS_VERSION_STRING, ENTERPRISE_VERSION_STRING))
-
-/* This definition of MAGNUS_VERSION_STRING on NT should be used
- * only when building the ns-http DLL */
-
-#if defined(MCC_HTTPD) && defined(XP_WIN32) && !defined(USE_ADMSERV) && !defined(MCC_ADMSERV)
-#undef MAGNUS_VERSION_STRING
-#define MAGNUS_VERSION_STRING INTsystem_version()
-#endif /* XP_WIN32 */
-
-/* Set server's version dynamically */
-NSAPI_PUBLIC void INTsystem_version_set(char *ptr);
-
#ifndef APSTUDIO_READONLY_SYMBOLS
/* Include the public netsite.h definitions */
diff --git a/include/public/base/systems.h b/include/public/base/systems.h
index 64ccd05d..318206a8 100644
--- a/include/public/base/systems.h
+++ b/include/public/base/systems.h
@@ -27,9 +27,6 @@
#define ZERO(ptr,len) memset(ptr,0,len)
#define NEED_STRCASECMP
#define NEED_STRNCASECMP
-#if OSVERSION > 4200
-#define TCPLEN_T size_t
-#endif /* OSVERSION > 4200 */
#elif defined(BSDI)
@@ -168,7 +165,6 @@
#define SEM_FLOCK
#define SHMEM_UNIX_MMAP
#define ZERO(ptr,len) memset(ptr,0,len)
-#define TCPLEN_T size_t
#elif defined(Linux)
diff --git a/include/public/nsacl/aclapi.h b/include/public/nsacl/aclapi.h
index 428ac9a7..b7d9c2d6 100644
--- a/include/public/nsacl/aclapi.h
+++ b/include/public/nsacl/aclapi.h
@@ -18,9 +18,9 @@
#include "nserrdef.h"
#endif /* !PUBLIC_NSACL_NSERRDEF_H */
-#ifndef PUBLIC_BASE_POOL_H
-#include "../base/pool.h"
-#endif /* !PUBLIC_BASE_POOL_H */
+#ifndef PUBLIC_NSAPI_H
+#include "public/nsapi.h"
+#endif /* !PUBLIC_NSAPI_H */
#ifndef PUBLIC_NSACL_PLISTDEF_H
#include "plistdef.h"
diff --git a/include/public/nsacl/plistdef.h b/include/public/nsacl/plistdef.h
index b0de8382..50bf741e 100644
--- a/include/public/nsacl/plistdef.h
+++ b/include/public/nsacl/plistdef.h
@@ -15,9 +15,9 @@
* lists are a generalization of parameter blocks (pblocks).
*/
-#ifndef PUBLIC_BASE_POOL_H
-#include "../base/pool.h"
-#endif /* !PUBLIC_BASE_POOL_H */
+#ifndef PUBLIC_NSAPI_H
+#include "public/nsapi.h"
+#endif /* !PUBLIC_NSAPI_H */
typedef struct PListStruct_s *PList_t;
diff --git a/ldap/clients/dsgw/dsgw.h b/ldap/clients/dsgw/dsgw.h
index 909ca833..224a2f6f 100644
--- a/ldap/clients/dsgw/dsgw.h
+++ b/ldap/clients/dsgw/dsgw.h
@@ -32,8 +32,6 @@
#include "../../include/srchpref.h"
#if defined( XP_WIN32 )
-#define util_strcasecmp strcasecomp
-#define util_strncasecmp strncasecomp
#include "base/systems.h"
#include "proto-ntutil.h"
diff --git a/lib/base/system.cpp b/lib/base/system.cpp
index 556d94a4..88bbfe43 100644
--- a/lib/base/system.cpp
+++ b/lib/base/system.cpp
@@ -15,7 +15,6 @@
#ifdef XP_WIN32
#include <windows.h>
-static char *version = "Netscape Server/2.0";
#endif
#include "base/systems.h" /* find out if we have malloc pools */
@@ -52,29 +51,6 @@ static int thread_malloc_key = -1;
#define DEBUG_FREE_CHAR 'X'
#endif /* DEBUG_MALLOC */
-
-/* On NT, the server version string is not statically encoded based
- * upon a product compile define but dynamically set by the server
- * exe at startup.
- */
-
-NSAPI_PUBLIC char *system_version()
-{
-#ifdef XP_WIN32
- return version;
-#else /* XP_UNIX */
- return MAGNUS_VERSION_STRING;
-#endif /* XP_UNIX */
-}
-
-NSAPI_PUBLIC void system_version_set(char *server_version)
-{
-#ifdef XP_WIN32
- version = PERM_STRDUP(server_version);
-#endif
-}
-
-
NSAPI_PUBLIC void *system_malloc(int size)
{
#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY)
diff --git a/lib/libaccess/Makefile b/lib/libaccess/Makefile
index 8fb857b8..d7d270cd 100644
--- a/lib/libaccess/Makefile
+++ b/lib/libaccess/Makefile
@@ -40,11 +40,7 @@ $(UTESTDEST):
OSOBJS =
OBJS=$(addprefix $(OBJDEST)/, usi.o \
- attrec.o \
nseframe.o \
- nsdb.o \
- nsuser.o \
- nsgroup.o \
nsautherr.o \
symbols.o \
acltools.o \
@@ -67,23 +63,9 @@ OBJS=$(addprefix $(OBJDEST)/, usi.o \
acleval.o \
oneeval.o \
access_plhash.o \
- aclparse.o \
- aclbuild.o \
aclerror.o \
- nsadb.o \
- nscert.o \
- nsamgmt.o \
- nsgmgmt.o \
- nsdbmgmt.o \
- nsumgmt.o \
$(OSOBJS) \
)
-
-
-#
-# AVA Mapping files. Currently not compiled in (FORTEZZA for reference only).
-#
-AVAMAPFILES = lex.yy.o y.tab.o avapfile.o avadb.o
MODULE_CFLAGS=-I$(BUILD_ROOT)/include -DACL_LIB_INTERNAL $(TESTFLAGS)
@@ -128,47 +110,3 @@ flex:
$(LEX) -i aclscan.l
sed -f yy-sed lex.yy.c > acl.yy.cpp
rm lex.yy.c
-
-#
-# more AVA mapping stuff, needs to be made to work with the other lexx/yacc
-# code added for 3.0
-#
-#ifeq ($(ARCH), WINNT)
-#$(OBJDEST)/y.tab.o: $(OBJDEST)/y.tab.c $(VALUES) $(OBJDEST)/y.tab.h
-# $(CC) -c $(CFLAGS) $(MCC_INCLUDE) -I$(OBJDEST) -I. $< -Fo$*.o
-#else
-#$(OBJDEST)/y.tab.o: $(OBJDEST)/y.tab.c $(OBJDEST)/y.tab.h
-# $(CC) -c $(CFLAGS) $(MCC_INCLUDE) -I. -o $*.o $<
-#endif
-#
-#ifeq ($(ARCH), WINNT)
-#$(OBJDEST)/y.tab.h: wintab.h
-# cp wintab.h $(OBJDEST)/y.tab.h
-#
-#$(OBJDEST)/y.tab.c: winnt.y
-# cp winnt.y $(OBJDEST)/y.tab.c
-#
-#$(OBJDEST)/values.h: winnt.v
-# cp winnt.v $(OBJDEST)/values.h
-#else
-#$(OBJDEST)/y.tab.h $(OBJDEST)/y.tab.c: avaparse.y
-# yacc -d avaparse.y
-# mv y.tab.h $(OBJDEST)/
-# mv y.tab.c $(OBJDEST)/
-#endif
-#
-#$(OBJDEST)/lex.yy.o: $(OBJDEST)/lex.yy.c $(OBJDEST)/y.tab.h
-#ifeq ($(ARCH), WINNT)
-# $(CC) -c $(CFLAGS) $(MCC_INCLUDE) -I$(OBJDEST) -I. $< -Fo$*.o
-#else
-# $(CC) -c $(CFLAGS) $(MCC_INCLUDE) -I. -o $*.o $<
-#endif
-#
-#ifeq ($(ARCH), WINNT)
-#$(OBJDEST)/lex.yy.c: winnt.l
-# cp winnt.l $(OBJDEST)/lex.yy.c
-#else
-#$(OBJDEST)/lex.yy.c: avascan.l
-# lex avascan.l
-# mv lex.yy.c $(OBJDEST)/
-#endif
diff --git a/lib/libaccess/aclerror.cpp b/lib/libaccess/aclerror.cpp
index 3f05e2e9..a3e7f8aa 100644
--- a/lib/libaccess/aclerror.cpp
+++ b/lib/libaccess/aclerror.cpp
@@ -12,6 +12,7 @@
*/
#include "base/systems.h"
+#include "public/nsapi.h"
#ifdef NSPR20
#include "prprf.h"
#else
@@ -42,6 +43,9 @@
#define aclerrfail XP_GetAdminStr(DBT_AclerrfmtAclerrfail)
#define aclerrio XP_GetAdminStr(DBT_AclerrfmtAclerrio)
+char * NSAuth_Program = "NSAUTH";
+char * ACL_Program = "NSACL"; /* ACL facility name */
+
/*
* Description (aclErrorFmt)
*
generated by cgit (git 2.34.1) at 2024-11-19 14:30:42 +0000