[389-commits] include/base include/libaccess include/netsite.h include/public ldap/include ldap/servers ldap/systools lib/base lib/ldaputil lib/libaccess Makefile.am Makefile.in
Mark Reynolds
mreynolds at fedoraproject.org
Tue Jun 16 16:45:49 UTC 2015
Makefile.am | 1
Makefile.in | 22
include/base/systems.h | 312 --------
include/base/systhr.h | 7
include/libaccess/symbols.h | 8
include/netsite.h | 2
include/public/base/systems.h | 122 ---
include/public/nsapi.h | 2
ldap/include/lthread.h | 402 -----------
ldap/include/proto-ntutil.h | 111 ---
ldap/servers/plugins/distrib/Makefile.AIX | 76 --
ldap/servers/plugins/distrib/Makefile.BSDI | 62 -
ldap/servers/plugins/distrib/Makefile.IRIX | 62 -
ldap/servers/plugins/distrib/Makefile.OSF1 | 61 -
ldap/servers/plugins/distrib/Makefile.ReliantUNIX | 62 -
ldap/servers/plugins/distrib/Makefile.UnixWare | 62 -
ldap/servers/plugins/distrib/Makefile.UnixWareUDK | 62 -
ldap/servers/plugins/http/http_impl.c | 25
ldap/servers/plugins/pwdstorage/crypt_pwd.c | 2
ldap/servers/plugins/pwdstorage/pwd_init.c | 2
ldap/servers/plugins/replication/cl5_api.c | 2
ldap/servers/plugins/replication/repl5_init.c | 10
ldap/servers/plugins/replication/repl_shared.h | 4
ldap/servers/plugins/replication/replutil.c | 2
ldap/servers/plugins/replication/tests/makesim | 8
ldap/servers/plugins/uiduniq/plugin-utils.h | 4
ldap/servers/plugins/vattrsp_template/vattrsp.c | 14
ldap/servers/slapd/back-ldbm/back-ldbm.h | 10
ldap/servers/slapd/back-ldbm/index.c | 4
ldap/servers/slapd/back-ldbm/ldbm_attr.c | 5
ldap/servers/slapd/config.c | 13
ldap/servers/slapd/configdse.c | 2
ldap/servers/slapd/connection.c | 4
ldap/servers/slapd/csngen.c | 11
ldap/servers/slapd/daemon.c | 27
ldap/servers/slapd/detach.c | 17
ldap/servers/slapd/fe.h | 26
ldap/servers/slapd/globals.c | 58 -
ldap/servers/slapd/libglobs.c | 30
ldap/servers/slapd/libmakefile | 60 -
ldap/servers/slapd/localhost.c | 4
ldap/servers/slapd/main.c | 25
ldap/servers/slapd/ntuserpin.c | 214 -----
ldap/servers/slapd/passwd_extop.c | 4
ldap/servers/slapd/proto-slap.h | 14
ldap/servers/slapd/slap.h | 26
ldap/servers/slapd/slapi-plugin.h | 13
ldap/servers/slapd/snmp_collator.c | 9
ldap/servers/slapd/ssl.c | 54 -
ldap/servers/slapd/time.c | 4
ldap/servers/slapd/tools/ldaptool.h | 24
ldap/servers/slapd/tools/ldclt/data.c | 21
ldap/servers/slapd/tools/ldclt/ldapfct.c | 183 -----
ldap/servers/slapd/tools/ldclt/ldclt.c | 217 -----
ldap/servers/slapd/tools/ldclt/opCheck.c | 121 ---
ldap/servers/slapd/tools/ldclt/port.h | 16
ldap/servers/slapd/tools/ldclt/remote.h | 18
ldap/servers/slapd/tools/ldclt/utils.c | 95 --
ldap/servers/slapd/tools/migratecred.c | 8
ldap/servers/slapd/tools/mkdep.c | 74 --
ldap/servers/slapd/util.c | 3
ldap/systools/idsktune.c | 798 ----------------------
ldap/systools/viewcore.c | 8
lib/base/dnsdmain.cpp | 4
lib/base/file.cpp | 17
lib/base/systhr.cpp | 6
lib/ldaputil/examples/Certmap.mak | 286 -------
lib/ldaputil/examples/Makefile | 5
lib/ldaputil/examples/init.c | 7
lib/ldaputil/examples/plugin.c | 4
lib/libaccess/symbols.cpp | 4
71 files changed, 71 insertions(+), 3991 deletions(-)
New commits:
commit d42a531c6d0457766638bd941f7e8c85f6dcb30a
Author: Mark Reynolds <mreynolds at redhat.com>
Date: Tue Jun 16 09:34:25 2015 -0400
Ticket 47998 - remove remaining obsolete OS code/files
Description: Removed remaining OS code (Tru64, SNI, SCO, UNIXware, etc)
https://fedorahosted.org/389/ticket/47998
Reviewed by: nhosoi(Thanks!)
diff --git a/Makefile.am b/Makefile.am
index 39fc2ee..8dcdb36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -746,7 +746,6 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
ldap/servers/slapd/modify.c \
ldap/servers/slapd/modrdn.c \
ldap/servers/slapd/modutil.c \
- ldap/servers/slapd/ntuserpin.c \
ldap/servers/slapd/object.c \
ldap/servers/slapd/objset.c \
ldap/servers/slapd/operation.c \
diff --git a/Makefile.in b/Makefile.in
index 218bc8d..a29509d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -740,9 +740,8 @@ am__libslapd_la_SOURCES_DIST = ldap/servers/slapd/add.c \
ldap/servers/slapd/log.c ldap/servers/slapd/mapping_tree.c \
ldap/servers/slapd/match.c ldap/servers/slapd/modify.c \
ldap/servers/slapd/modrdn.c ldap/servers/slapd/modutil.c \
- ldap/servers/slapd/ntuserpin.c ldap/servers/slapd/object.c \
- ldap/servers/slapd/objset.c ldap/servers/slapd/operation.c \
- ldap/servers/slapd/opshared.c \
+ ldap/servers/slapd/object.c ldap/servers/slapd/objset.c \
+ ldap/servers/slapd/operation.c ldap/servers/slapd/opshared.c \
ldap/servers/slapd/pagedresults.c ldap/servers/slapd/pblock.c \
ldap/servers/slapd/plugin.c ldap/servers/slapd/plugin_acl.c \
ldap/servers/slapd/plugin_internal_op.c \
@@ -819,7 +818,6 @@ am_libslapd_la_OBJECTS = ldap/servers/slapd/libslapd_la-add.lo \
ldap/servers/slapd/libslapd_la-modify.lo \
ldap/servers/slapd/libslapd_la-modrdn.lo \
ldap/servers/slapd/libslapd_la-modutil.lo \
- ldap/servers/slapd/libslapd_la-ntuserpin.lo \
ldap/servers/slapd/libslapd_la-object.lo \
ldap/servers/slapd/libslapd_la-objset.lo \
ldap/servers/slapd/libslapd_la-operation.lo \
@@ -2126,9 +2124,8 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
ldap/servers/slapd/log.c ldap/servers/slapd/mapping_tree.c \
ldap/servers/slapd/match.c ldap/servers/slapd/modify.c \
ldap/servers/slapd/modrdn.c ldap/servers/slapd/modutil.c \
- ldap/servers/slapd/ntuserpin.c ldap/servers/slapd/object.c \
- ldap/servers/slapd/objset.c ldap/servers/slapd/operation.c \
- ldap/servers/slapd/opshared.c \
+ ldap/servers/slapd/object.c ldap/servers/slapd/objset.c \
+ ldap/servers/slapd/operation.c ldap/servers/slapd/opshared.c \
ldap/servers/slapd/pagedresults.c ldap/servers/slapd/pblock.c \
ldap/servers/slapd/plugin.c ldap/servers/slapd/plugin_acl.c \
ldap/servers/slapd/plugin_internal_op.c \
@@ -4384,9 +4381,6 @@ ldap/servers/slapd/libslapd_la-modrdn.lo: \
ldap/servers/slapd/libslapd_la-modutil.lo: \
ldap/servers/slapd/$(am__dirstamp) \
ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp)
-ldap/servers/slapd/libslapd_la-ntuserpin.lo: \
- ldap/servers/slapd/$(am__dirstamp) \
- ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp)
ldap/servers/slapd/libslapd_la-object.lo: \
ldap/servers/slapd/$(am__dirstamp) \
ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp)
@@ -5537,7 +5531,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/libslapd_la-modify.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/libslapd_la-modrdn.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/libslapd_la-modutil.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/libslapd_la-ntuserpin.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/libslapd_la-object.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/libslapd_la-objset.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/libslapd_la-operation.Plo at am__quote@
@@ -7908,13 +7901,6 @@ ldap/servers/slapd/libslapd_la-modutil.lo: ldap/servers/slapd/modutil.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslapd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/libslapd_la-modutil.lo `test -f 'ldap/servers/slapd/modutil.c' || echo '$(srcdir)/'`ldap/servers/slapd/modutil.c
-ldap/servers/slapd/libslapd_la-ntuserpin.lo: ldap/servers/slapd/ntuserpin.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslapd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/libslapd_la-ntuserpin.lo -MD -MP -MF ldap/servers/slapd/$(DEPDIR)/libslapd_la-ntuserpin.Tpo -c -o ldap/servers/slapd/libslapd_la-ntuserpin.lo `test -f 'ldap/servers/slapd/ntuserpin.c' || echo '$(srcdir)/'`ldap/servers/slapd/ntuserpin.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ldap/servers/slapd/$(DEPDIR)/libslapd_la-ntuserpin.Tpo ldap/servers/slapd/$(DEPDIR)/libslapd_la-ntuserpin.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldap/servers/slapd/ntuserpin.c' object='ldap/servers/slapd/libslapd_la-ntuserpin.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslapd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/libslapd_la-ntuserpin.lo `test -f 'ldap/servers/slapd/ntuserpin.c' || echo '$(srcdir)/'`ldap/servers/slapd/ntuserpin.c
-
ldap/servers/slapd/libslapd_la-object.lo: ldap/servers/slapd/object.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslapd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/libslapd_la-object.lo -MD -MP -MF ldap/servers/slapd/$(DEPDIR)/libslapd_la-object.Tpo -c -o ldap/servers/slapd/libslapd_la-object.lo `test -f 'ldap/servers/slapd/object.c' || echo '$(srcdir)/'`ldap/servers/slapd/object.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ldap/servers/slapd/$(DEPDIR)/libslapd_la-object.Tpo ldap/servers/slapd/$(DEPDIR)/libslapd_la-object.Plo
diff --git a/include/base/systems.h b/include/base/systems.h
index 044cb83..3ba039f 100644
--- a/include/base/systems.h
+++ b/include/base/systems.h
@@ -64,66 +64,8 @@
/* --- Begin platform-specific definitions --- */
-#if defined(AIX)
-#define ACCELERATOR_CACHE
-#define AUTH_DBM
-#define BSD_RLIMIT
-#undef BSD_SIGNALS
-/* AIX can handle really big shoes */
-#define DAEMON_LISTEN_SIZE 4096
-#define DAEMON_NEEDS_SEMAPHORE
-#define DAEMON_UNIX_MOBRULE
-#define DLL_CAPABLE
-#define DLL_DLOPEN
-#define DLL_DLOPEN_FLAGS RTLD_NOW|RTLD_GLOBAL
-#define DNS_CACHE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS MAP_SHARED
-#define HAS_STATFS
-#define HAVE_ATEXIT
-#define HAVE_PW_R /* reent passwd routines */
-#define HAVE_STRERROR_R
-#define HAVE_STRTOK_R
-#define HAVE_TIME_R 2 /* arg count */
-#define HAVE_STRFTIME /* no cftime */
-#define JAVA_STATIC_LINK
-#undef NEED_CRYPT_H
-#define NEED_SETEID_PROTO /* setegid, seteuid */
-#define NEED_STRINGS_H /* for strcasecmp */
-#define NET_SOCKETS
-#define SA_HANDLER_T(x) (void (*)(int))x
-#if OSVERSION < 4210
-#define SA_NOCLDWAIT 0 /* AIX < 4.2 don't got this */
-#endif /* OSVERSION < 4210 */
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-#ifdef HW_THREADS
-#define THREAD_ANY
-#endif
-
-#elif defined(BSDI)
-
-#define ACCELERATOR_CACHE
-#define AUTH_DBM
-#define BSD_MAIL
-#define BSD_RLIMIT
-#define BSD_SIGNALS
-#define BSD_TIME
-#define DAEMON_UNIX_MOBRULE
-#define DNS_CACHE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS (MAP_FILE | MAP_SHARED)
-#define HAS_STATFS
-#define HAVE_ATEXIT
-#undef NEED_CRYPT_PROTO
-#define NET_SOCKETS
-#ifndef NO_DOMAINNAME
-#define NO_DOMAINNAME
-#endif
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-#define JAVA_STATIC_LINK
-
-#elif defined(HPUX)
+#if defined(HPUX)
#define ACCELERATOR_CACHE
#define AUTH_DBM
@@ -149,169 +91,6 @@
/* warning: mmap doesn't work under 9.04 */
#define SHMEM_MMAP_FLAGS MAP_FILE | MAP_VARIABLE | MAP_SHARED
-#elif defined (IRIX)
-
-#define ACCELERATOR_CACHE
-#define AUTH_DBM
-#define BSD_RLIMIT
-#undef BSD_SIGNALS
-#define DAEMON_UNIX_MOBRULE
-#define DLL_CAPABLE
-#define DLL_DLOPEN
-#define DLL_DLOPEN_FLAGS RTLD_NOW
-#define DNS_CACHE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS MAP_SHARED
-#define HAS_STATVFS
-#define HAVE_ATEXIT
-#define HAVE_STRTOK_R
-#ifdef IRIX
-#define HAVE_TIME_R 2 /* arg count */
-#else
-#define HAVE_TIME_R 3 /* arg count */
-#define NEED_SETEID_PROTO /* setegid, seteuid */
-#endif
-#define JAVA_STATIC_LINK
-#define NEED_CRYPT_H
-#define NET_SOCKETS
-#define SA_HANDLER_T(x) (void (*)(int))x
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-#define THROW_HACK throw()
-
-#elif defined(NCR)
-
-#define ACCELERATOR_CACHE
-#define AUTH_DBM
-#undef BSD_RLIMIT
-/* #define DAEMON_NEEDS_SEMAPHORE */
-#define DAEMON_UNIX_MOBRULE
-#define DLL_CAPABLE
-#define DLL_DLOPEN
-#define DLL_DLOPEN_FLAGS RTLD_NOW
-#define DNS_CACHE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS MAP_SHARED
-#define HAS_STATVFS
-#define HAVE_ATEXIT
-#define HAVE_STRTOK_R
-#define JAVA_STATIC_LINK
-#define NEED_CRYPT_H
-#define NEED_FILIO
-#define NEED_GHN_PROTO
-#define NET_SOCKETS
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-
-#elif defined(NEC)
-
-#define ACCELERATOR_CACHE
-#define DNS_CACHE
-#define AUTH_DBM
-#undef BSD_RLIMIT
-#define DAEMON_NEEDS_SEMAPHORE
-#define DAEMON_UNIX_MOBRULE
-#define DLL_DLOPEN
-#define DLL_DLOPEN_FLAGS RTLD_NOW
-#define DLL_CAPABLE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS MAP_SHARED
-#define HAS_STATVFS
-#define HAVE_ATEXIT
-#define HAVE_STRTOK_R
-#define HAVE_TIME_R 2 /* arg count */
-#define JAVA_STATIC_LINK
-#define NEED_CRYPT_H
-#define NEED_FILIO
-#define NET_SOCKETS
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-
-#elif defined(OSF1)
-
-#define ACCELERATOR_CACHE
-#define AUTH_DBM
-#define BSD_RLIMIT
-#undef BSD_SIGNALS
-#define BSD_TIME
-#define DAEMON_NEEDS_SEMAPHORE
-#define DAEMON_UNIX_MOBRULE
-#define DLL_CAPABLE
-#define DLL_DLOPEN
-#define DLL_DLOPEN_FLAGS RTLD_NOW
-#define DNS_CACHE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS MAP_SHARED
-#define HAVE_ATEXIT
-#define HAVE_STRFTIME /* no cftime */
-#define HAVE_TIME_R 2 /* ctime_r arg count */
-#define NET_SOCKETS
-#define SA_HANDLER_T(x) (void (*)(int))x
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-
-#elif defined(SCO)
-
-#define ACCELERATOR_CACHE
-#define AUTH_DBM
-#undef BSD_RLIMIT
-#undef BSD_SIGNALS
-#define DAEMON_NEEDS_SEMAPHORE
-#define DAEMON_UNIX_MOBRULE
-#define DLL_CAPABLE
-#define DLL_DLOPEN
-#define DLL_DLOPEN_FLAGS RTLD_NOW
-#define DNS_CACHE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS MAP_SHARED
-#define HAS_STATVFS
-#define HAVE_ATEXIT
-#undef NEED_CRYPT_H
-#undef NEED_FILIO
-#undef NEED_GHN_PROTO
-#undef NEED_SETEID_PROTO /* setegid, seteuid */
-#define NET_SOCKETS
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-#define SA_HANDLER_T(x) (void (*)(int))x
-
-
-#elif defined(SNI)
-
-#define ACCELERATOR_CACHE
-#define AUTH_DBM
-#undef BSD_RLIMIT
-#define DAEMON_NEEDS_SEMAPHORE
-#define DAEMON_UNIX_MOBRULE
-#define DLL_CAPABLE
-#define DLL_DLOPEN
-#define DLL_DLOPEN_FLAGS RTLD_NOW
-#define DNS_CACHE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS MAP_SHARED
-#define HAS_STATVFS
-#define HAVE_ATEXIT
-#define JAVA_STATIC_LINK
-#define NEED_CRYPT_H
-#define NEED_FILIO
-#define NEED_SETEID_PROTO /* setegid, seteuid */
-#define NET_SOCKETS
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-#define USE_PIPE
-/*
- * define this if your C++ platform has separate inline functions for
- * e.g. const char *strchr(const char *, char)
- * and
- * char *strchr(char *, char)
- * and your compiler complains about this:
- * func(const char *bla)
- * {
- * char *fasel = strchr(bla, '.');
- * ....
- * because it says that you cannot initialize a char * with a const char *
- */
-#define HAS_CONSTVALUED_STRFUNCS
-
-/* hack for C++ platforms where bool is a keyword */
-#ifndef boolean
-#define boolean boolean
-#endif
-
#elif defined(Linux)
#define ACCELERATOR_CACHE
@@ -333,12 +112,12 @@
#define HAS_STATFS
#define JAVA_STATIC_LINK
#define SA_HANDLER_T(x) (void (*)(int))(x)
-
#undef NEED_CRYPT_PROTO
#define NET_SOCKETS
#ifndef NO_DOMAINNAME
#define NO_DOMAINNAME
#endif
+
#elif defined(SOLARIS) || defined(SOLARISx86)
#define ACCELERATOR_CACHE
@@ -369,21 +148,6 @@
#endif
#define SHMEM_MMAP_FLAGS MAP_SHARED
-#elif defined (SONY)
-
-#define AUTH_DBM
-#undef BSD_RLIMIT
-#define DAEMON_NEEDS_SEMAPHORE
-#define DAEMON_UNIX_MOBRULE
-#define DLL_CAPABLE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS MAP_SHARED
-#define HAVE_ATEXIT
-#define NEED_CRYPT_H
-#define NEED_FILIO
-#define NET_SOCKETS
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-
#elif defined(SUNOS4)
#define ACCELERATOR_CACHE
@@ -407,37 +171,6 @@
#define NET_SOCKETS
#define SHMEM_MMAP_FLAGS MAP_SHARED
-#elif defined(UNIXWARE) || defined(UnixWare)
-
-#define ACCELERATOR_CACHE
-#define AUTH_DBM
-#undef BSD_RLIMIT
-#define DAEMON_UNIX_MOBRULE
-#define DLL_CAPABLE
-#define DLL_DLOPEN
-#define DLL_DLOPEN_FLAGS RTLD_NOW
-#define DNS_CACHE
-#define FILE_INHERIT_FCNTL
-#define FILE_MMAP_FLAGS MAP_SHARED
-#define HAS_STATVFS
-#define HAVE_ATEXIT
-#define NEED_CRYPT_H
-#define NEED_FILIO
-#define NEED_GHN_PROTO
-#define NEED_SETEID_PROTO /* setegid, seteuid */
-#define NET_SOCKETS
-#define SHMEM_MMAP_FLAGS MAP_SHARED
-
-#ifndef boolean
-#define boolean boolean
-#endif
-
-#if defined (UnixWare)
-/* UnixWare but not UNIXWARE... */
-#define NEED_STRINGS_H /* for strcasecmp */
-#define SA_HANDLER_T(x) (void (*)(int))x
-#endif
-
#else
#error "Missing defines in ns/netsite/include/base/systems.h"
#endif
@@ -483,10 +216,6 @@
#define THREAD_NSPR_USER
#else
#define THREAD_NSPR_KERNEL
-#ifdef IRIX
-#undef SEM_FLOCK
-#define SEM_IRIX
-#endif /* IRIX */
#endif /* SW_THREADS */
#define THREAD_ANY
@@ -514,43 +243,6 @@ typedef PRFileDesc *SYS_NETFD;
#define SYS_NETFD_T PRFileDesc *
#endif /* !SYS_NETFD_T */
-#ifdef SEM_WIN32
-
-typedef HANDLE SEMAPHORE;
-#define SEMAPHORE_T HANDLE
-#define SEM_ERROR NULL
-/* That oughta hold them (I hope) */
-#define SEM_MAXVALUE 32767
-
-#elif defined(SEM_IRIX)
-
-#ifndef OS_ULOCKS_H
-#include <ulocks.h>
-#define OS_ULOCKS_H
-#endif /* !OS_ULOCKS_H */
-
-typedef struct {
- usptr_t *arena;
- usema_t *sem;
-} semirix_s;
-typedef semirix_s* SEMAPHORE;
-#define SEMAPHORE_T semirix_s *
-#define SEM_ERROR NULL
-
-#elif defined(SEM_FLOCK)
-
-#define SEMAPHORE_T SYS_FILE
-typedef SYS_FILE SEMAPHORE;
-#define SEM_ERROR NULL
-
-#else /* ! SEM_WIN32, !SEM_IRIX */
-
-typedef int SEMAPHORE;
-#define SEMAPHORE_T int
-#define SEM_ERROR -1
-
-#endif /* SEM_WIN32 */
-
#endif /* !APSTUDIO_READONLY_SYMBOLS */
#endif /* BASE_SYSTEMS_H */
diff --git a/include/base/systhr.h b/include/base/systhr.h
index 20cc4ad..30b5bab 100644
--- a/include/base/systhr.h
+++ b/include/base/systhr.h
@@ -65,15 +65,8 @@
NSPR_BEGIN_EXTERN_C
-#ifdef UnixWare
-typedef void(*ArgFn_systhread_start)(void *);
-NSAPI_PUBLIC
-SYS_THREAD INTsysthread_start( int prio, int stksz, \
- ArgFn_systhread_start, void *arg);
-#else
NSAPI_PUBLIC
SYS_THREAD INTsysthread_start(int prio, int stksz, void (*fn)(void *), void *arg);
-#endif
NSAPI_PUBLIC SYS_THREAD INTsysthread_current(void);
diff --git a/include/libaccess/symbols.h b/include/libaccess/symbols.h
index f56b934..e6ff343 100644
--- a/include/libaccess/symbols.h
+++ b/include/libaccess/symbols.h
@@ -117,16 +117,8 @@ NSPR_BEGIN_EXTERN_C
extern int symTableAddSym(void * table, Symbol_t * newsym, void * symref);
extern void symTableRemoveSym(void * table, Symbol_t * sym);
extern void symTableDestroy(void * table, int flags);
-
-/* for ANSI C++ on SCO UDK, otherwise fn name is managled */
-#ifdef UnixWare
-typedef int (*ArgFn_symTableEnum)(Symbol_t * sym, void * parg);
-extern void symTableEnumerate(void * table, void * argp, ArgFn_symTableEnum);
-#else /* UnixWare */
extern void symTableEnumerate(void * table, void * argp,
int (*func)(Symbol_t * sym, void * parg));
-#endif /* UnixWare */
-
extern int symTableFindSym(void * table, const char * symname,
int symtype, void **psymref);
extern int symTableNew(void **ptable);
diff --git a/include/netsite.h b/include/netsite.h
index 9147430..295e539 100644
--- a/include/netsite.h
+++ b/include/netsite.h
@@ -78,12 +78,10 @@
#define VOID void
#endif
-#ifndef SNI
#if !defined (boolean) && !defined (__GNUC__)
typedef int boolean;
#endif
-#endif
#define NS_TRUE 1
#define NS_FALSE 0
diff --git a/include/public/base/systems.h b/include/public/base/systems.h
index cfd1388..049eb48 100644
--- a/include/public/base/systems.h
+++ b/include/public/base/systems.h
@@ -54,28 +54,7 @@
/* --- Begin native platform configuration definitions --- */
-#if defined(AIX)
-
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define MALLOC_POOLS
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#define ZERO(ptr,len) memset(ptr,0,len)
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-
-#elif defined(BSDI)
-
-#define BSD_FLOCK
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define MALLOC_POOLS
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#define ZERO(ptr,len) memset(ptr,0,len)
-
-#elif defined(HPUX)
+#if defined(HPUX)
#define FILE_UNIX
#define FILE_UNIX_MMAP
@@ -85,78 +64,6 @@
#define SHMEM_UNIX_MMAP
#define ZERO(ptr,len) memset(ptr,0,len)
-#elif defined (IRIX)
-
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define MALLOC_POOLS
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#define ZERO(ptr,len) memset(ptr,0,len)
-
-#elif defined(NCR)
-
-#define CASECMPARG_T unsigned
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define MALLOC_POOLS
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-#ifndef S_ISLNK
-#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#define ZERO(ptr,len) memset(ptr,0,len)
-
-#elif defined(NEC)
-
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define MALLOC_POOLS
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-#ifndef S_ISLNK
-#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#define ZERO(ptr,len) memset(ptr,0,len)
-
-#elif defined(OSF1)
-
-#undef BSD_FLOCK
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define MALLOC_POOLS
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#define ZERO(ptr,len) memset(ptr,0,len)
-
-#elif defined(SCO)
-
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define MALLOC_POOLS
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#define ZERO(ptr,len) memset(ptr,0,len)
-
-#elif defined(SNI)
-
-#define CASECMPARG_T const
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define MALLOC_POOLS
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#if 0
-#define socketpair(a,b,c,d) pipe(d)
-#endif
-#define ZERO(ptr,len) memset(ptr,0,len)
-
#elif defined(SOLARIS) || defined (SOLARISx86)
#undef FILE_UNIX /* avoid redefinition message */
@@ -168,16 +75,6 @@
#define SHMEM_UNIX_MMAP
#define ZERO(ptr,len) memset(ptr,0,len)
-#elif defined (SONY)
-
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#define ZERO(ptr,len) memset(ptr,0,len)
-
#elif defined(SUNOS4)
#define BSD_FLOCK
@@ -188,21 +85,6 @@
#define SHMEM_UNIX_MMAP
#define ZERO(ptr,len) memset(ptr,0,len)
-#elif defined(UNIXWARE) || defined(UnixWare)
-
-#define CASECMPARG_T const
-#define FILE_UNIX
-#define FILE_UNIX_MMAP
-#define MALLOC_POOLS
-#define NEED_STRCASECMP
-#define NEED_STRNCASECMP
-#ifndef S_ISLNK
-#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-#define SEM_FLOCK
-#define SHMEM_UNIX_MMAP
-#define ZERO(ptr,len) memset(ptr,0,len)
-
#elif defined(Linux)
#define FILE_UNIX
@@ -213,9 +95,7 @@
#define ZERO(ptr,len) memset(ptr,0,len)
#else
-
#error "Missing defines in ns/netsite/include/public/base/systems.h"
-
#endif
#ifndef NSPR_BEGIN_EXTERN_C
diff --git a/include/public/nsapi.h b/include/public/nsapi.h
index 5dde361..b85a81c 100644
--- a/include/public/nsapi.h
+++ b/include/public/nsapi.h
@@ -54,7 +54,7 @@
#include "base/systems.h"
-#if defined(FILE_UNIX_MMAP) || defined(FILE_WIN32_MMAP)
+#if defined(FILE_UNIX_MMAP)
#define FILE_MMAP
#endif
diff --git a/ldap/include/lthread.h b/ldap/include/lthread.h
deleted file mode 100644
index 910adb3..0000000
--- a/ldap/include/lthread.h
+++ /dev/null
@@ -1,402 +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
-
-/* lthread.h - ldap threads header file */
-
-#ifndef _LTHREAD_H
-#define _LTHREAD_H
-
-#if defined( THREAD_SUNOS4_LWP )
-/***********************************
- * *
- * thread definitions for sunos4 *
- * *
- ***********************************/
-
-#define _THREAD
-
-#include <lwp/lwp.h>
-#include <lwp/stackdep.h>
-
-typedef void *(*VFP)();
-
-/* thread attributes and thread type */
-typedef int pthread_attr_t;
-typedef thread_t pthread_t;
-
-/* default attr states */
-#define pthread_mutexattr_default NULL
-#define pthread_condattr_default NULL
-
-/* thread state - joinable or not */
-#define PTHREAD_CREATE_JOINABLE 0
-#define PTHREAD_CREATE_DETACHED 1
-/* thread scope - who is in scheduling pool */
-#define PTHREAD_SCOPE_PROCESS 0
-#define PTHREAD_SCOPE_SYSTEM 1
-
-/* mutex attributes and mutex type */
-typedef int pthread_mutexattr_t;
-typedef mon_t pthread_mutex_t;
-
-/* mutex and condition variable scope - process or system */
-#define PTHREAD_SHARE_PRIVATE 0
-#define PTHREAD_SHARE_PROCESS 1
-
-/* condition variable attributes and condition variable type */
-typedef int pthread_condattr_t;
-typedef struct lwpcv {
- int lcv_created;
- cv_t lcv_cv;
-} pthread_cond_t;
-
-#else /* end sunos4 */
-
-#if defined( THREAD_SUNOS5_LWP )
-/***********************************
- * *
- * thread definitions for sunos5 *
- * *
- ***********************************/
-
-#define _THREAD
-
-#include <thread.h>
-#include <synch.h>
-
-typedef void *(*VFP)();
-
-/* sunos5 threads are preemptive */
-#define PTHREAD_PREEMPTIVE 1
-
-/* thread attributes and thread type */
-typedef int pthread_attr_t;
-typedef thread_t pthread_t;
-
-/* default attr states */
-#define pthread_mutexattr_default NULL
-#define pthread_condattr_default NULL
-
-/* thread state - joinable or not */
-#define PTHREAD_CREATE_JOINABLE 0
-#define PTHREAD_CREATE_DETACHED THR_DETACHED
-/* thread scope - who is in scheduling pool */
-#define PTHREAD_SCOPE_PROCESS 0
-#define PTHREAD_SCOPE_SYSTEM THR_BOUND
-
-/* mutex attributes and mutex type */
-typedef int pthread_mutexattr_t;
-typedef mutex_t pthread_mutex_t;
-
-/* mutex and condition variable scope - process or system */
-#define PTHREAD_SHARE_PRIVATE USYNC_THREAD
-#define PTHREAD_SHARE_PROCESS USYNC_PROCESS
-
-/* condition variable attributes and condition variable type */
-typedef int pthread_condattr_t;
-typedef cond_t pthread_cond_t;
-
-#else /* end sunos5 */
-
-#if defined( THREAD_MIT_PTHREADS )
-/***********************************
- * *
- * definitions for mit pthreads *
- * *
- ***********************************/
-
-#define _THREAD
-
-#include <pthread.h>
-
-#else /* end mit pthreads */
-
-#if defined( THREAD_AIX_PTHREADS )
-/***********************************
- * *
- * definitions for aix pthreads *
- * *
- ***********************************/
-
-#define _THREAD
-
-#include <pthread.h>
-
-typedef void *(*VFP)(void *);
-
-/* thread state - joinable or not */
-#define PTHREAD_CREATE_JOINABLE 0
-
-/* default attr states */
-#define pthread_mutexattr_default NULL
-#define pthread_condattr_default NULL
-
-#else /* aix pthreads */
-
-#if defined( THREAD_HP_DCE_PTHREADS )
-/**************************************
- * *
- * definitions for HP dce pthreads *
- * *
- **************************************/
-
-#define _THREAD
-typedef void *(*VFP)();
-
-#include <pthread.h>
-
-/* dce threads are preemptive */
-#define PTHREAD_PREEMPTIVE 1
-
-/* pthread_kill() is a noop on HP */
-#define PTHREAD_KILL_IS_NOOP 1
-
-/* thread state - joinable or not */
-#define PTHREAD_CREATE_JOINABLE 0
-#define PTHREAD_CREATE_DETACHED 1
-
-#define pthread_attr_init( a ) pthread_attr_create( a )
-#define pthread_attr_destroy( a ) pthread_attr_delete( a )
-#define pthread_attr_setdetachstate( a, b ) \
- pthread_attr_setdetach_np( a, b )
-/*
- * HP's DCE threads implementation passes a (pthread_attr_t *)
- * for the second argument. So, we need to fake things a bit.
- * hpdce_pthread_create_detached() is in thread.c. Note that we
- * create threads and detach them. If you need to create a joinable
- * thread, you need to call hpdce_pthread_create_joinable() directly.
- */
-#define pthread_create( a, b, c, d ) \
- hpdce_pthread_create_detached( a, b, c, d )
-
-int
-hpdce_pthread_create_joinable( pthread_t *tid, pthread_attr_t *attr,
- VFP func, void *arg );
-int hpdce_pthread_create_detached( pthread_t *tid, pthread_attr_t *attr,
- VFP func, void *arg );
-#else /* HP dce pthreads */
-
-#if defined( THREAD_DCE_PTHREADS )
-/***********************************
- * *
- * definitions for dce pthreads *
- * *
- ***********************************/
-
-#define _THREAD
-typedef void *(*VFP)();
-
-#include <pthread.h>
-
-/* dce threads are preemptive */
-#define PTHREAD_PREEMPTIVE 1
-
-/* thread state - joinable or not */
-#ifndef PTHREAD_CREATE_JOINABLE
-#define PTHREAD_CREATE_JOINABLE 0
-#endif
-#ifndef PTHREAD_CREATE_DETACHED
-#define PTHREAD_CREATE_DETACHED 1
-#endif
-
-#define pthread_attr_init( a ) pthread_attr_create( a )
-#define pthread_attr_destroy( a ) pthread_attr_delete( a )
-#define pthread_attr_setdetachstate( a, b ) \
- pthread_attr_setdetach_np( a, b )
-#if defined( OSF1 )
-/* pthread_create's second parameter is passed by value, not by reference.
- * To work around this, call another function instead:
- */
-#define pthread_create( a, b, c, d ) std_pthread_create( a, b, c, d )
-extern int
-std_pthread_create (pthread_t *tid,
- pthread_attr_t *attr,
- pthread_startroutine_t func,
- pthread_addr_t arg); /* defined in thread.c */
-
-/* OSF1 doesn't support pthread_kill() */
-#define PTHREAD_KILL_IS_NOOP 1
-
-#endif /* OSF1 */
-
-#else /* dce pthreads */
-
-#if defined( THREAD_SGI_SPROC )
-/***********************************
- * *
- * thread definitions for sgi irix *
- * *
- ***********************************/
-
-#define _THREAD
-
-#include <sys/types.h>
-#include <sys/signal.h>
-#include <sys/procset.h>
-#include <sys/prctl.h>
-#include <ulocks.h>
-
-typedef void *(*VFP)(void *);
-
-/* sgi threads are preemptive */
-#define PTHREAD_PREEMPTIVE 1
-
-/* thread attributes and thread type */
-typedef int pthread_attr_t;
-typedef pid_t pthread_t;
-
-/* default attr states */
-#define pthread_mutexattr_default 0
-#define pthread_condattr_default 0
-
-/* thread state - joinable or not */
-#define PTHREAD_CREATE_JOINABLE 0
-#define PTHREAD_CREATE_DETACHED 1
-/* thread scope - who is in scheduling pool */
-#define PTHREAD_SCOPE_PROCESS 0
-#define PTHREAD_SCOPE_SYSTEM 1
-
-/* mutex attributes and mutex type */
-typedef int pthread_mutexattr_t;
-typedef int pthread_mutex_t;
-
-/* mutex and condition variable scope - process or system */
-#define PTHREAD_SHARE_PRIVATE 0
-#define PTHREAD_SHARE_PROCESS 1
-
-/* condition variable attributes and condition variable type */
-typedef int pthread_condattr_t;
-struct irix_cv_waiter {
- pid_t icvw_pid;
- struct irix_cv_waiter *icvw_next;
-};
-typedef struct irix_cv {
- pthread_mutex_t icv_mutex;
- pthread_mutex_t *icv_waitermutex;
- struct irix_cv_waiter *icv_waiterq;
-} pthread_cond_t;
-
-#else
-
-#endif /* sgi sproc */
-#endif /* dce pthreads */
-#endif /* hp dce pthreads */
-#endif /* aix pthreads */
-#endif /* mit pthreads */
-#endif /* sunos5 */
-#endif /* sunos4 */
-
-#ifndef _THREAD
-
-/***********************************
- * *
- * thread definitions for no *
- * underlying library support *
- * *
- ***********************************/
-
-typedef void *(*VFP)();
-
-/* thread attributes and thread type */
-typedef int pthread_attr_t;
-typedef int pthread_t;
-
-/* default attr states */
-#define pthread_mutexattr_default NULL
-#define pthread_condattr_default NULL
-
-/* thread state - joinable or not */
-#define PTHREAD_CREATE_JOINABLE 0
-#define PTHREAD_CREATE_DETACHED 0
-/* thread scope - who is in scheduling pool */
-#define PTHREAD_SCOPE_PROCESS 0
-#define PTHREAD_SCOPE_SYSTEM 0
-
-/* mutex attributes and mutex type */
-typedef int pthread_mutexattr_t;
-typedef int pthread_mutex_t;
-
-/* mutex and condition variable scope - process or system */
-#define PTHREAD_SHARE_PRIVATE 0
-#define PTHREAD_SHARE_PROCESS 0
-
-/* condition variable attributes and condition variable type */
-typedef int pthread_condattr_t;
-typedef int pthread_cond_t;
-
-#endif /* no threads support */
-
-/* POSIX standard pthread function declarations: */
-
-int pthread_attr_init( pthread_attr_t *attr );
-int pthread_attr_destroy( pthread_attr_t *attr );
-int pthread_attr_getdetachstate( pthread_attr_t *attr, int *detachstate );
-int pthread_attr_setdetachstate( pthread_attr_t *attr, int detachstate );
-
-int pthread_create( pthread_t *tid, pthread_attr_t *attr, VFP func, void *arg );
-void pthread_yield();
-void pthread_exit();
-int pthread_kill( pthread_t tid, int sig );
-#if defined( hpux ) || defined( OSF1 ) || defined( AIXV4 ) /* <thread.h> declares pthread_join */
-#else
-int pthread_join( pthread_t tid, int *status );
-#endif
-
-#if defined( hpux ) || defined( OSF1 ) /* <thread.h> declares pthread_mutex_init */
-#else
-int pthread_mutex_init( pthread_mutex_t *mp, pthread_mutexattr_t *attr );
-#endif
-int pthread_mutex_destroy( pthread_mutex_t *mp );
-int pthread_mutex_lock( pthread_mutex_t *mp );
-int pthread_mutex_unlock( pthread_mutex_t *mp );
-int pthread_mutex_trylock( pthread_mutex_t *mp );
-
-#if defined( hpux ) || defined( OSF1 ) /* <thread.h> declares pthread_cond_init */
-#else
-int pthread_cond_init( pthread_cond_t *cv, pthread_condattr_t *attr );
-#endif
-int pthread_cond_destroy( pthread_cond_t *cv );
-int pthread_cond_wait( pthread_cond_t *cv, pthread_mutex_t *mp );
-int pthread_cond_signal( pthread_cond_t *cv );
-int pthread_cond_broadcast( pthread_cond_t *cv );
-
-#endif /* _LTHREAD_H */
diff --git a/ldap/include/proto-ntutil.h b/ldap/include/proto-ntutil.h
deleted file mode 100644
index 2629577..0000000
--- a/ldap/include/proto-ntutil.h
+++ /dev/null
@@ -1,111 +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
-
-/******************************************************
- *
- *
- * proto-ntutil.h - Prototypes for utility functions used
- * throughout slapd on NT.
- *
- ******************************************************/
-#if defined( _WINDOWS )
-
-#ifndef _PROTO_NTUTIL
-#define _PROTO_NTUTIL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *
- * ntreg.c
- *
- */
-extern int SlapdGetRegSZ( LPTSTR lpszRegKey, LPSTR lpszValueName, LPTSTR lpszValue );
-extern void unixtodospath(char *szText);
-extern void dostounixpath(char *szText);
-
-
-/*
- *
- * getopt.c
- *
- */
-extern int getopt (int argc, char *const *argv, const char *optstring);
-extern char *optarg;
-/*
- *
- * ntevent.c
- *
- */
-extern BOOL MultipleInstances();
-extern BOOL SlapdIsAService();
-extern void InitializeSlapdLogging( LPTSTR lpszRegLocation, LPTSTR lpszEventLogName, LPTSTR lpszMessageFile );
-extern void ReportSlapdEvent(WORD wEventType, DWORD dwIdEvent, WORD wNumInsertStrings,
- char *pszStrings);
-extern BOOL ReportSlapdStatusToSCMgr(
- SERVICE_STATUS *serviceStatus,
- SERVICE_STATUS_HANDLE serviceStatusHandle,
- HANDLE Event,
- DWORD dwCurrentState,
- DWORD dwWin32ExitCode,
- DWORD dwCheckPoint,
- DWORD dwWaitHint);
-extern void WINAPI SlapdServiceCtrlHandler(DWORD dwOpcode);
-extern BOOL SlapdGetServerNameFromCmdline(char *szServerName, char *szCmdLine, int dirname);
-
-/*
- *
- * ntgetpassword.c
- *
- */
-extern char *Slapd_GetPassword();
-extern void CenterDialog(HWND hwndParent, HWND hwndDialog);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PROTO_NTUTIL */
-
-#endif /* _WINDOWS */
diff --git a/ldap/servers/plugins/distrib/Makefile.AIX b/ldap/servers/plugins/distrib/Makefile.AIX
deleted file mode 100644
index 4803d06..0000000
--- a/ldap/servers/plugins/distrib/Makefile.AIX
+++ /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 ---
-#
-# AIX Makefile for Directory Server plug-in examples
-# NOTE: Make sure to set the DSLIB variable to the path
-# to the libslapd_shr.a file (for example,
-# DSLIB = /usr/netscape/suitespot/lib/libslapd_shr.a
-
-CC = xlC_r
-LD = ld
-
-# Set this to the path to the libslapd_shr.a file
-DSLIB =
-
-INCLUDE_FLAGS= -I../../include
-CFLAGS= $(INCLUDE_FLAGS) -qarch=com
-LIBPATH=/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib:..:../../../../lib
-EXTRA_LIBS= -bI:/usr/lib/lowsys.exp -lC_r -lC -lpthreads -lc_r -lm \
- /usr/lib/libc.a $(DSLIB)
-LDFLAGS= -bE:libtest-plugin_shr.exp -bM:SRE -bnoentry -blibpath:$(LIBPATH) \
- $(EXTRA_LIBS)
-
-OBJS = distrib
-
-all: libtest-plugin_shr.a
-
-
-libtest-plugin_shr.a: $(OBJS)
- rm -f libtest-plugin_shr.exp
- echo "#!" > libtest-plugin_shr.exp
- nm -B -C -g $(OBJS) | \
- awk '/ [B,T,D] / {print $$3}' | \
- sed -e 's/^\.//' | sort -u >> libtest-plugin_shr.exp
- $(LD) $(LDFLAGS) -o $@ $(OBJS)
-
-.c.o:
- $(CC) $(CFLAGS) -c $<
-
-clean:
- -rm -f $(OBJS) libtest-plugin_shr.a
-
diff --git a/ldap/servers/plugins/distrib/Makefile.BSDI b/ldap/servers/plugins/distrib/Makefile.BSDI
deleted file mode 100644
index 50ffa8c..0000000
--- a/ldap/servers/plugins/distrib/Makefile.BSDI
+++ /dev/null
@@ -1,62 +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 ---
-#
-# SOLARIS Makefile for Directory Server plug-in examples
-#
-
-CC = cc
-LD = ld
-
-INCLUDE_FLAGS = -I../../include
-CFLAGS = $(INCLUDE_FLAGS) -D_REENTRANT -KPIC
-LDFLAGS = -G
-
-OBJS = distrib.o
-
-all: libtest-plugin.so
-
-
-libtest-plugin.so: $(OBJS)
- $(LD) $(LDFLAGS) -o $@ $(OBJS)
-
-.c.o:
- $(CC) $(CFLAGS) -c $<
-
-clean:
- -rm -f $(OBJS) libtest-plugin.so
-
diff --git a/ldap/servers/plugins/distrib/Makefile.IRIX b/ldap/servers/plugins/distrib/Makefile.IRIX
deleted file mode 100644
index 55cd3ce..0000000
--- a/ldap/servers/plugins/distrib/Makefile.IRIX
+++ /dev/null
@@ -1,62 +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 ---
-#
-# IRIX Makefile for Directory Server plug-in examples
-#
-
-CC = cc
-LD = ld
-
-INCLUDE_FLAGS = -I../../include
-CFLAGS = $(INCLUDE_FLAGS) -D_SGI_MP_SOURCE -fullwarn
-LDFLAGS = -32 -shared
-
-OBJS = distrib.o
-
-all: libtest-plugin.so
-
-
-libtest-plugin.so: $(OBJS)
- $(LD) $(LDFLAGS) -o $@ $(OBJS)
-
-.c.o:
- $(CC) $(CFLAGS) -c $<
-
-clean:
- -rm -f $(OBJS) libtest-plugin.so
-
diff --git a/ldap/servers/plugins/distrib/Makefile.OSF1 b/ldap/servers/plugins/distrib/Makefile.OSF1
deleted file mode 100644
index 3f61b6b..0000000
--- a/ldap/servers/plugins/distrib/Makefile.OSF1
+++ /dev/null
@@ -1,61 +0,0 @@
-# --- BEGIN COPYRIGHT BLOCK ---
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-# OSF1 Makefile for Directory Server plug-in examples
-
-CC = cc
-LD = ld
-
-INCLUDE = -I../../include
-CFLAGS = $(INCLUDE) -DIS_64 -ieee_with_inexact -pthread -DOSF1
-LDFLAGS = -shared -all -expect_unresolved "*" -taso
-
-
-OBJS = distrib.o
-
-all: libtest-plugin.so
-
-libtest-plugin.so: $(OBJS)
- $(LD) $(LDFLAGS) -o $@ $(OBJS)
-
-.c.o:
- $(CC) $(CFLAGS) -c $<
-
-clean:
- -rm -f $(OBJS) libtest-plugin.so
-
diff --git a/ldap/servers/plugins/distrib/Makefile.ReliantUNIX b/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
deleted file mode 100644
index 50ffa8c..0000000
--- a/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
+++ /dev/null
@@ -1,62 +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 ---
-#
-# SOLARIS Makefile for Directory Server plug-in examples
-#
-
-CC = cc
-LD = ld
-
-INCLUDE_FLAGS = -I../../include
-CFLAGS = $(INCLUDE_FLAGS) -D_REENTRANT -KPIC
-LDFLAGS = -G
-
-OBJS = distrib.o
-
-all: libtest-plugin.so
-
-
-libtest-plugin.so: $(OBJS)
- $(LD) $(LDFLAGS) -o $@ $(OBJS)
-
-.c.o:
- $(CC) $(CFLAGS) -c $<
-
-clean:
- -rm -f $(OBJS) libtest-plugin.so
-
diff --git a/ldap/servers/plugins/distrib/Makefile.UnixWare b/ldap/servers/plugins/distrib/Makefile.UnixWare
deleted file mode 100644
index 50ffa8c..0000000
--- a/ldap/servers/plugins/distrib/Makefile.UnixWare
+++ /dev/null
@@ -1,62 +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 ---
-#
-# SOLARIS Makefile for Directory Server plug-in examples
-#
-
-CC = cc
-LD = ld
-
-INCLUDE_FLAGS = -I../../include
-CFLAGS = $(INCLUDE_FLAGS) -D_REENTRANT -KPIC
-LDFLAGS = -G
-
-OBJS = distrib.o
-
-all: libtest-plugin.so
-
-
-libtest-plugin.so: $(OBJS)
- $(LD) $(LDFLAGS) -o $@ $(OBJS)
-
-.c.o:
- $(CC) $(CFLAGS) -c $<
-
-clean:
- -rm -f $(OBJS) libtest-plugin.so
-
diff --git a/ldap/servers/plugins/distrib/Makefile.UnixWareUDK b/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
deleted file mode 100644
index 50ffa8c..0000000
--- a/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
+++ /dev/null
@@ -1,62 +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 ---
-#
-# SOLARIS Makefile for Directory Server plug-in examples
-#
-
-CC = cc
-LD = ld
-
-INCLUDE_FLAGS = -I../../include
-CFLAGS = $(INCLUDE_FLAGS) -D_REENTRANT -KPIC
-LDFLAGS = -G
-
-OBJS = distrib.o
-
-all: libtest-plugin.so
-
-
-libtest-plugin.so: $(OBJS)
- $(LD) $(LDFLAGS) -o $@ $(OBJS)
-
-.c.o:
- $(CC) $(CFLAGS) -c $<
-
-clean:
- -rm -f $(OBJS) libtest-plugin.so
-
diff --git a/ldap/servers/plugins/http/http_impl.c b/ldap/servers/plugins/http/http_impl.c
index 98d0506..4da46cc 100644
--- a/ldap/servers/plugins/http/http_impl.c
+++ b/ldap/servers/plugins/http/http_impl.c
@@ -88,23 +88,14 @@ extern "C" {
#define LDAP_DEBUG_PLUGIN 0x10000 /* 65536 */
/* debugging stuff */
-# ifdef _WIN32
- extern int *module_ldap_debug;
-# define LDAPDebug( level, fmt, arg1, arg2, arg3 ) \
- { \
- if ( *module_ldap_debug & level ) { \
- slapd_log_error_proc( NULL, fmt, arg1, arg2, arg3 ); \
- } \
- }
-# else /* _WIN32 */
- extern int slapd_ldap_debug;
-# define LDAPDebug( level, fmt, arg1, arg2, arg3 ) \
- { \
- if ( slapd_ldap_debug & level ) { \
- slapd_log_error_proc( NULL, fmt, arg1, arg2, arg3 ); \
- } \
- }
-# endif /* Win32 */
+
+extern int slapd_ldap_debug;
+#define LDAPDebug( level, fmt, arg1, arg2, arg3 ) \
+{ \
+ if ( slapd_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt, arg1, arg2, arg3 ); \
+ } \
+}
#ifdef __cplusplus
}
diff --git a/ldap/servers/plugins/pwdstorage/crypt_pwd.c b/ldap/servers/plugins/pwdstorage/crypt_pwd.c
index cdf3831..0656fd7 100644
--- a/ldap/servers/plugins/pwdstorage/crypt_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/crypt_pwd.c
@@ -49,7 +49,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
-#if defined( hpux ) || defined ( AIX ) || defined (LINUX) || defined (OSF1)
+#if defined( hpux ) || defined (LINUX)
#ifndef __USE_XOPEN
#define __USE_XOPEN /* linux */
#endif /* __USE_XOPEN */
diff --git a/ldap/servers/plugins/pwdstorage/pwd_init.c b/ldap/servers/plugins/pwdstorage/pwd_init.c
index 4678f31..964986c 100644
--- a/ldap/servers/plugins/pwdstorage/pwd_init.c
+++ b/ldap/servers/plugins/pwdstorage/pwd_init.c
@@ -271,7 +271,6 @@ ssha512_pwd_storage_scheme_init( Slapi_PBlock *pb )
return( rc );
}
-#ifndef _WIN32
int
crypt_pwd_storage_scheme_init( Slapi_PBlock *pb )
{
@@ -296,7 +295,6 @@ crypt_pwd_storage_scheme_init( Slapi_PBlock *pb )
slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= crypt_pwd_storage_scheme_init %d\n\n", rc );
return( rc );
}
-#endif
int
clear_pwd_storage_scheme_init( Slapi_PBlock *pb )
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index 81c0408..0d9b8d9 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -164,7 +164,7 @@
* pointers are allocated 8 bytes but lower 4 bytes are used.
* The value 0 means use the default stacksize.
*/
-#if defined (OSF1) || defined (__LP64__) || defined (_LP64) /* 64-bit architectures need bigger stacks */
+#if defined (__LP64__) || defined (_LP64) /* 64-bit architectures need bigger stacks */
#if defined(__hpux) && defined(__ia64)
#define DEFAULT_THREAD_STACKSIZE 524288L
#else
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index 8e2f114..5800d50 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_init.c
@@ -70,18 +70,8 @@ nsslapd-plugindescription: Multi-Master Replication Plugin
#include "repl.h"
#include "repl5.h"
#include "cl5.h" /* changelog interface */
-
#include "plstr.h"
-/* #ifdef _WIN32
-int *module_ldap_debug = 0;
-
-void plugin_init_debug_level(int *level_ptr)
-{
- module_ldap_debug = level_ptr;
-}
-#endif*/
-
#define NSDS_REPL_NAME_PREFIX "Netscape Replication"
static char *start_oid_list[] = {
diff --git a/ldap/servers/plugins/replication/repl_shared.h b/ldap/servers/plugins/replication/repl_shared.h
index 9a0d014..62d1f4e 100644
--- a/ldap/servers/plugins/replication/repl_shared.h
+++ b/ldap/servers/plugins/replication/repl_shared.h
@@ -51,11 +51,7 @@
#include "slapi-plugin.h"
#include "ldif.h" /* GGOODREPL - is this cheating? */
-#ifdef _WIN32
-#define FILE_PATHSEP '\\'
-#else
#define FILE_PATHSEP '/'
-#endif
#define CHANGELOGDB_TRIM_INTERVAL 300 /* 5 minutes */
#define CHANGELOGDB_COMPACT_INTERVAL 2592000 /* 30 days */
diff --git a/ldap/servers/plugins/replication/replutil.c b/ldap/servers/plugins/replication/replutil.c
index e861f33..47c08aa 100644
--- a/ldap/servers/plugins/replication/replutil.c
+++ b/ldap/servers/plugins/replication/replutil.c
@@ -50,12 +50,10 @@
#include <string.h>
#include <sys/types.h>
#include <errno.h>
-#ifndef _WIN32
#include <sys/file.h>
#include <sys/socket.h>
#include <unistd.h>
#include <fcntl.h>
-#endif
#ifdef OS_solaris
#include <dlfcn.h> /* needed for dlopen and dlsym */
#endif /* solaris: dlopen */
diff --git a/ldap/servers/plugins/replication/tests/makesim b/ldap/servers/plugins/replication/tests/makesim
index 235a350..b9e17fc 100755
--- a/ldap/servers/plugins/replication/tests/makesim
+++ b/ldap/servers/plugins/replication/tests/makesim
@@ -54,20 +54,12 @@ include $(LDAP_SRC)/nsldap.mk
LDFLAGS += $(EXLDFLAGS)
-ifeq ($(ARCH), WINNT)
-SUBSYSTEM=console
-endif
-
DEPLIBS=
EXTRA_LIBS_DEP =
EXTRA_LIBS =
-ifeq ($(ARCH), WINNT)
-EXTRA_LIBS += user32.lib
-endif
-
DNP_SIM = $(addsuffix $(EXE_SUFFIX), \
$(addprefix $(BINDIR)/, dnp_sim))
diff --git a/ldap/servers/plugins/uiduniq/plugin-utils.h b/ldap/servers/plugins/uiduniq/plugin-utils.h
index 0fe65b3..ddd125c 100644
--- a/ldap/servers/plugins/uiduniq/plugin-utils.h
+++ b/ldap/servers/plugins/uiduniq/plugin-utils.h
@@ -71,10 +71,6 @@
#include "slapi-plugin-compat4.h"
#include <stdio.h>
#include <string.h>
-#ifdef _WINDOWS
-#undef strcasecmp
-#define strcasecmp strcmpi
-#endif
#ifdef LDAP_DEBUG
#ifndef DEBUG
diff --git a/ldap/servers/plugins/vattrsp_template/vattrsp.c b/ldap/servers/plugins/vattrsp_template/vattrsp.c
index 6e14269..22714fa 100644
--- a/ldap/servers/plugins/vattrsp_template/vattrsp.c
+++ b/ldap/servers/plugins/vattrsp_template/vattrsp.c
@@ -47,13 +47,11 @@
#include "slapi-plugin.h"
#include "slapi-private.h"
#include "vattr_spi.h"
+#include <sys/stat.h>
/* the global plugin handle */
static volatile vattr_sp_handle *vattr_handle = NULL;
-#include <sys/stat.h>
-
-
#define VATTRSP_PLUGIN_SUBSYSTEM "vattrsp-template-plugin" /* used for logging */
/* function prototypes */
@@ -89,22 +87,12 @@ static int vattrsp_vattr_types(
int flags
);
-
static Slapi_PluginDesc pdesc = { "vattrexamplesp", VENDOR, DS_PACKAGE_VERSION,
"vattr service provider example plugin" };
static void * vattrsp_plugin_identity = NULL;
-#ifdef _WIN32
-int *module_ldap_debug = 0;
-
-void plugin_init_debug_level(int *level_ptr)
-{
- module_ldap_debug = level_ptr;
-}
-#endif
-
/*
* Plugin identity mgmt
* --------------------
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index 074aa4c..c7bfd68 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -45,7 +45,7 @@
#ifndef _BACK_LDBM_H_
#define _BACK_LDBM_H_
-#if defined(irix) || defined(AIX) || defined(HPUX11) || defined(OS_solaris) || defined(linux)
+#if defined(HPUX11) || defined(OS_solaris) || defined(linux)
/* built-in 64-bit file I/O support */
#define DB_USE_64LFS
#endif
@@ -717,14 +717,6 @@ typedef struct tag_dblayer_handle dblayer_handle;
/* This structure was moved here from perfctrs.c so the ldbm_instance structure
* could use it. */
struct _perfctrs_private {
-#if defined(_WIN32)
- /* Handle to the shared memory object */
- HANDLE hMemory;
- /* Handle to the update event */
- HANDLE hEvent;
-#else
- /* Nothing yet */
-#endif
/* Pointer to the shared memory */
void *memory;
};
diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
index 0d9ac33..22e264e 100644
--- a/ldap/servers/slapd/back-ldbm/index.c
+++ b/ldap/servers/slapd/back-ldbm/index.c
@@ -44,10 +44,6 @@
/* index.c - routines for dealing with attribute indexes */
#include "back-ldbm.h"
-#if ( defined ( OSF1 ))
-#undef BUFSIZ
-#define BUFSIZ 1024
-#endif
static const char *errmsg = "database index operation failed";
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attr.c b/ldap/servers/slapd/back-ldbm/ldbm_attr.c
index 81481cf..ac5c653 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attr.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attr.c
@@ -1033,11 +1033,6 @@ static int replace_filter(Slapi_Filter *f, char *s)
{
Slapi_Filter *newf = NULL;
Slapi_Filter *temp = NULL;
-/* LP: Fix for defect 515161. Crash on AIX
- * slapi_str2filter is a nasty function that mangle whatever gets passed in.
- * AIX crashes on altering the literal string.
- * So we need to allocate the string and then free it.
- */
char *buf = slapi_ch_strdup(s);
newf = slapi_str2filter(buf);
diff --git a/ldap/servers/slapd/config.c b/ldap/servers/slapd/config.c
index d003f70..0e63258 100644
--- a/ldap/servers/slapd/config.c
+++ b/ldap/servers/slapd/config.c
@@ -58,18 +58,11 @@
#define MAXARGS 1000
-
-extern int should_detach;
+extern int should_detach;
extern Slapi_PBlock *repl_pb;
-
-
extern char* slapd_SSL3ciphers;
-
-#ifndef _WIN32
extern char *localuser;
-#endif
-
-char* rel2abspath( char * );
+char* rel2abspath( char * );
/*
See if the given entry has an attribute with the given name and the
@@ -251,7 +244,6 @@ slapd_bootstrap_config(const char *configdir)
continue;
}
/* increase file descriptors */
-#if !defined(AIX)
if (!maxdescriptors[0] &&
entry_has_attr_and_value(e, CONFIG_MAXDESCRIPTORS_ATTRIBUTE,
maxdescriptors, sizeof(maxdescriptors)))
@@ -265,7 +257,6 @@ slapd_bootstrap_config(const char *configdir)
CONFIG_MAXDESCRIPTORS_ATTRIBUTE, errorbuf);
}
}
-#endif /* !defined(AIX) */
/* see if we need to enable error logging */
if (!logenabled[0] &&
diff --git a/ldap/servers/slapd/configdse.c b/ldap/servers/slapd/configdse.c
index 954d446..6ab3dfd 100644
--- a/ldap/servers/slapd/configdse.c
+++ b/ldap/servers/slapd/configdse.c
@@ -74,9 +74,7 @@ static const char *requires_restart[] = {
"cn=config:nsslapd-changelogmaxentries",
"cn=config:nsslapd-changelogmaxage",
"cn=config:nsslapd-db-locks",
-#if !defined(_WIN32) && !defined(AIX)
"cn=config:nsslapd-maxdescriptors",
-#endif
"cn=config:" CONFIG_RETURN_EXACT_CASE_ATTRIBUTE,
"cn=config:" CONFIG_SCHEMA_IGNORE_TRAILING_SPACES,
"cn=config,cn=ldbm:nsslapd-idlistscanlimit",
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index 3ea0576..899d99a 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -43,11 +43,9 @@
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
-#ifndef _WIN32
#include <sys/time.h>
#include <sys/socket.h>
#include <stdlib.h>
-#endif
#include <signal.h>
#include "slap.h"
#include "prcvar.h"
@@ -1523,7 +1521,7 @@ connection_threadmain()
#ifdef ENABLE_NUNC_STANS
enable_nunc_stans = config_get_enable_nunc_stans();
#endif
-#if defined( OSF1 ) || defined( hpux )
+#if defined( hpux )
/* Arrange to ignore SIGPIPE signals. */
SIGNAL( SIGPIPE, SIG_IGN );
#endif
diff --git a/ldap/servers/slapd/csngen.c b/ldap/servers/slapd/csngen.c
index 5214c45..192d982 100644
--- a/ldap/servers/slapd/csngen.c
+++ b/ldap/servers/slapd/csngen.c
@@ -742,18 +742,7 @@ _csngen_adjust_local_time (CSNGen *gen, time_t cur_time)
* test code
* **************************************************************************
*/
-
-/*
- * The defult thread stacksize for nspr21 is 64k. For OSF, we require
- * a larger stacksize as actual storage allocation is higher i.e
- * pointers are allocated 8 bytes but lower 4 bytes are used.
- * The value 0 means use the default stacksize.
- */
-#if defined (OSF1) || defined(__LP64__) || defined (_LP64) /* 64-bit architectures need large stacks */
-#define DEFAULT_THREAD_STACKSIZE 131072L
-#else
#define DEFAULT_THREAD_STACKSIZE 0
-#endif
#define GEN_TREAD_COUNT 20
int s_thread_count;
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 820921c..5fa6893 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -58,13 +58,6 @@
#endif
#include <time.h>
#include <signal.h>
-#if defined(IRIX6_2) || defined(IRIX6_3)
-#include <sys/param.h>
-#endif
-#if defined(_AIX)
-#include <sys/select.h>
-#include <sys/param.h>
-#endif
#include <fcntl.h>
#define TCPLEN_T int
#ifdef NEED_FILIO
@@ -3245,21 +3238,15 @@ catch_signals()
static int
get_configured_connection_table_size()
{
- int size;
- size = config_get_conntablesize();
-
-/*
- * Cap the table size at nsslapd-maxdescriptors.
- */
-#if !defined(_WIN32) && !defined(AIX)
- {
- int maxdesc = config_get_maxdescriptors();
+ int size = config_get_conntablesize();
+ int maxdesc = config_get_maxdescriptors();
- if ( maxdesc >= 0 && size > maxdesc ) {
- size = maxdesc;
- }
+ /*
+ * Cap the table size at nsslapd-maxdescriptors.
+ */
+ if ( maxdesc >= 0 && size > maxdesc ) {
+ size = maxdesc;
}
-#endif
return size;
}
diff --git a/ldap/servers/slapd/detach.c b/ldap/servers/slapd/detach.c
index 3516c65..87b7e78 100644
--- a/ldap/servers/slapd/detach.c
+++ b/ldap/servers/slapd/detach.c
@@ -77,16 +77,13 @@ int
detach( int slapd_exemode, int importexport_encrypt,
int s_port, daemon_ports_t *ports_info )
{
-#ifndef _WIN32
int i, sd;
char *workingdir = 0;
char *errorlog = 0;
char *ptr = 0;
char errorbuf[BUFSIZ];
extern char *config_get_errorlog(void);
-#endif
-#ifndef _WIN32
if ( should_detach ) {
for ( i = 0; i < 5; i++ ) {
#if defined( sunos5 )
@@ -163,12 +160,9 @@ detach( int slapd_exemode, int importexport_encrypt,
}
(void) SIGNAL( SIGPIPE, SIG_IGN );
-#endif /* _WIN32 */
return 0;
}
-
-#ifndef _WIN32
/*
* close all open files except stdin/out/err
*/
@@ -187,16 +181,9 @@ close_all_files()
close( i );
}
}
-#endif /* !_WIN32 */
-
-/*
- * There is no need to do anything on some platforms (NT) and not try to
- * raise fds on AIX.
- */
static void raise_process_fd_limits(void)
{
-#if !defined(_WIN32) && !defined(AIX)
struct rlimit rl, setrl;
RLIM_TYPE curlim;
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
@@ -247,7 +234,6 @@ static void raise_process_fd_limits(void)
(void)getrlimit( RLIMIT_NOFILE, &rl );
LDAPDebug( LDAP_DEBUG_TRACE, "descriptor limit changed from %d to %d\n",
curlim, rl.rlim_cur, 0 );
-#endif /* !_WIN32 && !AIX */
}
/*
@@ -256,7 +242,6 @@ static void raise_process_fd_limits(void)
void
raise_process_limits()
{
-#if !defined(_WIN32)
struct rlimit rl;
raise_process_fd_limits();
@@ -286,7 +271,5 @@ raise_process_limits()
errno,0,0);
}
#endif /* RLIMIT_VMEM */
-
-#endif /* !_WIN32 */
}
diff --git a/ldap/servers/slapd/fe.h b/ldap/servers/slapd/fe.h
index ae67491..0595a2a 100644
--- a/ldap/servers/slapd/fe.h
+++ b/ldap/servers/slapd/fe.h
@@ -66,15 +66,6 @@ extern PRLock *time_func_mutex;
extern PRLock *currenttime_mutex;
extern time_t starttime;
extern char *configfile;
-#if defined( _WIN32 )
-extern LPTSTR pszServerName;
-#endif
-#if defined( _WIN32 )
-/* String constants (no change for international) */
-extern HANDLE hSlapdEventSource;
-extern SERVICE_STATUS LDAPServerStatus;
-extern SERVICE_STATUS_HANDLE hLDAPServerServiceStatus;
-#endif
/*
* auth.c
@@ -92,15 +83,6 @@ void op_thread_cleanup();
void connection_post_shutdown_cleanup();
/*
- * ntuserpin.c - Prompts for the key database passphrase.
- */
-#include "svrcore.h"
-typedef struct SVRCORENTUserPinObj SVRCORENTUserPinObj;
-SVRCOREError SVRCORE_CreateNTUserPinObj(SVRCORENTUserPinObj **out);
-void SVRCORE_SetNTUserPinInteractive(SVRCORENTUserPinObj *obj, PRBool interactive);
-void SVRCORE_DestroyNTUserPinObj(SVRCORENTUserPinObj *obj);
-
-/*
* connection.c
*/
void connection_abandon_operations( Connection *conn );
@@ -135,12 +117,10 @@ struct connection_table
int n_tcpe; /* standard socket last ( +1 ) index in fd */
int s_tcps; /* ssl socket start index in fd */
int s_tcpe; /* ssl socket last ( +1 ) in fd */
-#ifndef XP_WIN32
#if defined(ENABLE_LDAPI)
int i_unixs; /* unix socket start index in fd */
int i_unixe; /* unix socket last ( +1 ) in fd */
#endif /* ENABLE_LDAPI */
-#endif
PRLock *table_mutex;
};
typedef struct connection_table Connection_Table;
@@ -159,12 +139,6 @@ Connection* connection_table_get_first_active_connection (Connection_Table *ct);
Connection* connection_table_get_next_active_connection (Connection_Table *ct, Connection *c);
typedef int (*Connection_Table_Iterate_Function)(Connection *c, void *arg);
int connection_table_iterate_active_connections(Connection_Table *ct, void* arg, Connection_Table_Iterate_Function f);
-#if defined( _WIN32 )
-Connection* connection_table_get_connection_from_fd(Connection_Table *ct,PRFileDesc *prfd);
-#endif
-#if 0
-void connection_table_dump(Connection_Table *ct);
-#endif
/*
* daemon.c
diff --git a/ldap/servers/slapd/globals.c b/ldap/servers/slapd/globals.c
index e28362f..02ca373 100644
--- a/ldap/servers/slapd/globals.c
+++ b/ldap/servers/slapd/globals.c
@@ -67,13 +67,6 @@
#include "slap.h"
#include "fe.h"
-/* On UNIX, there's only one copy of slapd_ldap_debug */
-/* On NT, each module keeps its own module_ldap_debug, which */
-/* points to the process' slapd_ldap_debug */
-#ifdef _WIN32
-int *module_ldap_debug;
-#endif
-
int should_detach = 1;
time_t starttime;
PRThread *listener_tid;
@@ -87,61 +80,12 @@ Slapi_Counter *ops_completed;
Slapi_Counter *num_conns;
Slapi_Counter *max_threads_count;
Slapi_Counter *conns_in_maxthreads;
-
-/*
- DEC/COMPAQ has released a patch for 4.0d (e?) which will speed up
- malloc/free considerably in multithreaded multiprocessor
- applications (like directory server!), sort of like SmartHeap but
- not as snazzy. The last three parameters only take effect if the
- patch is installed, otherwise they are ignored. The rest of the
- parameters are included along with their default values, but they
- are commented out except:
- unsigned long __noshrink = 1; old - default is 0; apparently this is ignored for now
- int __fast_free_max = INT_MAX; old - default is 13; may cause excessive memory consumption
-*/
-#if defined(OSF1) && defined(LDAP_DONT_USE_SMARTHEAP)
-/* From an email from Dave Long at DEC/Compaq:
-
- The following is an example of how to tune for maximum speed on a
- system with three or more CPUs and with no concern for memory used:
-
- #include <limits.h>
- #include <sys/types.h>
-*/
-unsigned long __noshrink = 1; /* old - default is 0; apparently this is ignored for now */
-/*
- size_t __minshrink = 65536;
- double __minshrinkfactor = 0.001;
- size_t __mingrow = 65536;
- double __mingrowfactor = 0.1;
- unsigned long __madvisor = 0;
- unsigned long __small_buff = 0;
-*/
-int __fast_free_max = INT_MAX; /* old - default is 13; may cause excessive memory consumption */
-/*
- unsigned long __sbrk_override = 0;
- unsigned long __taso_mode = 0;
-*/
-
-/*
- These are the new parameters
-*/
-int __max_cache = 27;
-int __first_fit = 2;
-int __delayed_free = 1;
-/*
- Note that the allowed values for the new __max_cache tuning variable
- are: 15, 18, 21, 24, 27. Any other value is likely to actually harm
- performance or even cause a core dump.
-*/
-#endif
-
Connection_Table *the_connection_table = NULL;
char *pid_file = "/dev/null";
char *start_pid_file = "/dev/null";
-char *attr_dataversion = ATTR_DATAVERSION;
+char *attr_dataversion = ATTR_DATAVERSION;
extern void set_dll_entry_points( slapdEntryPoints *sep );
void
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 2499c57..e65d343 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -364,12 +364,10 @@ static struct config_get_and_set {
log_set_expirationtime, SLAPD_ACCESS_LOG,
(void**)&global_slapdFrontendConfig.accesslog_exptime,
CONFIG_INT, NULL, DEFAULT_LOG_EXPTIME},
-#ifndef _WIN32
{CONFIG_LOCALUSER_ATTRIBUTE, config_set_localuser,
NULL, 0,
(void**)&global_slapdFrontendConfig.localuser,
CONFIG_STRING, NULL, NULL/* deletion is not allowed */},
-#endif
{CONFIG_ERRORLOG_LOGROTATIONSYNCENABLED_ATTRIBUTE, NULL,
log_set_rotationsync_enabled, SLAPD_ERROR_LOG,
(void**)&global_slapdFrontendConfig.errorlog_rotationsync_enabled,
@@ -865,12 +863,10 @@ static struct config_get_and_set {
NULL, 0,
(void**)&global_slapdFrontendConfig.refer_url,
CONFIG_STRING, NULL, NULL/* deletion is not allowed */},
-#if !defined(AIX)
{CONFIG_MAXDESCRIPTORS_ATTRIBUTE, config_set_maxdescriptors,
NULL, 0,
(void**)&global_slapdFrontendConfig.maxdescriptors,
CONFIG_INT, NULL, DEFAULT_MAXDESCRIPTORS},
-#endif
{CONFIG_CONNTABLESIZE_ATTRIBUTE, config_set_conntablesize,
NULL, 0,
(void**)&global_slapdFrontendConfig.conntablesize,
@@ -3667,7 +3663,6 @@ int config_set_storagescheme() {
}
-#ifndef _WIN32
int
config_set_localuser( const char *attrname, char *value, char *errorbuf, int apply ) {
int retVal = LDAP_SUCCESS;
@@ -3697,7 +3692,6 @@ config_set_localuser( const char *attrname, char *value, char *errorbuf, int app
return retVal;
}
-#endif /* _WIN32 */
int
config_set_workingdir( const char *attrname, char *value, char *errorbuf, int apply ) {
@@ -3809,7 +3803,6 @@ config_set_maxthreadsperconn( const char *attrname, char *value, char *errorbuf,
return retVal;
}
-#if !defined(_WIN32) && !defined(AIX)
#include <sys/resource.h>
int
config_set_maxdescriptors( const char *attrname, char *value, char *errorbuf, int apply ) {
@@ -3852,7 +3845,6 @@ config_set_maxdescriptors( const char *attrname, char *value, char *errorbuf, in
return retVal;
}
-#endif /* !_WIN32 && !AIX */
int
config_set_conntablesize( const char *attrname, char *value, char *errorbuf, int apply ) {
@@ -3860,25 +3852,19 @@ config_set_conntablesize( const char *attrname, char *value, char *errorbuf, int
long nValue = 0;
int maxVal = 65535;
char *endp = NULL;
-#ifndef _WIN32
struct rlimit rlp;
-#endif
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
return LDAP_OPERATIONS_ERROR;
}
-#ifndef _WIN32
if ( 0 == getrlimit( RLIMIT_NOFILE, &rlp ) ) {
maxVal = (int)rlp.rlim_max;
}
-#endif
errno = 0;
nValue = strtol(value, &endp, 0);
-
-#if !defined(AIX)
if ( *endp != '\0' || errno == ERANGE || nValue < 1 || nValue > maxVal ) {
PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", connection table "
@@ -3891,7 +3877,6 @@ config_set_conntablesize( const char *attrname, char *value, char *errorbuf, int
retVal = LDAP_OPERATIONS_ERROR;
}
}
-#endif
if (apply) {
CFG_LOCK_WRITE(slapdFrontendConfig);
@@ -3968,15 +3953,6 @@ config_set_ioblocktimeout( const char *attrname, char *value, char *errorbuf, in
return retVal;
}
-#if defined(IRIX)
- /* on IRIX poll can only handle timeouts up to
- 2147483 without failing, cap it at 30 minutes */
-
- if ( nValue > SLAPD_DEFAULT_IOBLOCK_TIMEOUT ) {
- nValue = SLAPD_DEFAULT_IOBLOCK_TIMEOUT;
- }
-#endif /* IRIX */
-
if ( apply ) {
#ifdef ATOMIC_GETSET_IOBLOCKTIMEOUT
PR_AtomicSet(&slapdFrontendConfig->ioblocktimeout, (PRInt32)nValue);
@@ -5345,8 +5321,6 @@ config_get_rootpwstoragescheme() {
return retVal;
}
-#ifndef _WIN32
-
char *
config_get_localuser() {
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
@@ -5359,7 +5333,6 @@ config_get_localuser() {
return retVal;
}
-#endif /* _WIN32 */
/* alias of encryption key and certificate files is now retrieved through */
/* calls to psetFullCreate() and psetGetAttrSingleValue(). See ssl.c, */
/* where this function is still used to set the global variable */
@@ -5401,7 +5374,6 @@ config_get_maxthreadsperconn(){
return retVal;
}
-#if !defined(_WIN32) && !defined(AIX)
int
config_get_maxdescriptors() {
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
@@ -5413,8 +5385,6 @@ config_get_maxdescriptors() {
return retVal;
}
-#endif /* !_WIN32 && !AIX */
-
int
config_get_reservedescriptors(){
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
diff --git a/ldap/servers/slapd/libmakefile b/ldap/servers/slapd/libmakefile
index 659165e..7e7e04f 100644
--- a/ldap/servers/slapd/libmakefile
+++ b/ldap/servers/slapd/libmakefile
@@ -80,46 +80,13 @@ LIBSLAPD_OBJS=plugin_role.o getfilelist.o libglobs.o log.o ch_malloc.o entry.o p
dse.o errormap.o computed.o match.o fileio.o \
generation.o localhost.o ssl.o factory.o auditlog.o \
lenstr.o eventq.o uuid.o uniqueid.o uniqueidgen.o \
- csngen.o utf8compare.o ntuserpin.o entrywsi.o valueset.o \
+ csngen.o utf8compare.o entrywsi.o valueset.o \
attrsyntax.o opshared.o add.o modify.o modrdn.o delete.o dl.o\
plugin_acl.o counters.o subentry.o object.o objset.o apibroker.o \
csn.o csnset.o slapd_plhash.o attrlist.o vattr.o bitset.o rdn.o \
mapping_tree.o backend_manager.o task.o resourcelimit.o \
bulk_import.o security_wrappers.o index_subsystem.o sasl_map.o
-ifeq ($(ARCH), AIX)
-ifeq ($(DEBUG), optimize)
-TEMP_CFLAGS = $(subst -O,,$(CFLAGS))
-$(OBJDEST)/vattr.o: vattr.c
- $(CC) -o $(OBJDEST)/vattr.o -c $(TEMP_CFLAGS) $(MCC_INCLUDE) vattr.c
-endif
-endif
-ifeq ($(ARCH), WINNT)
-#find out why this isn't needed on UNIX
-DLL_LDFLAGS += $(NSPRLINK) /IMPLIB:$(LIBSLAPD)
-DLL_LDFLAGS += -def:"libslapd.def"
-LIBSLAPD_DEF = $(LDAP_SRC)/servers/slapd/libslapd.def
-SUBSYSTEM=windows
-
-LDAP_COMMON_EXTRALIBSLIST = libsi18n
-LDAP_COMMON_EXTRALIBS = $(addsuffix .$(LIB_SUFFIX), \
- $(addprefix $(LDAP_LIBDIR)/, $(LDAP_COMMON_EXTRALIBSLIST)))
-LDAP_COMMON_LINK += libbase.$(LIB_SUFFIX)
-
-EXTRA_LIBS_DEP = $(SECURITY_DEP) $(NSPR_DEP) \
- $(LDAP_COMMON_LIBS_DEP) $(LDAPSDK_DEP) \
- $(LDAP_SDK_LIBSSLDAP_LIB_DEP) $(LIBLDAPU_DEP) $(_ldap_db_depend) \
- $(SVRCORE_DEP) \
- $(LDAP_COMMON_EXTRALIBS)
-
-EXTRA_LIBS += $(LDAPLINK) $(LIBSVRCORE) $(LIBSECURITY) $(LIBNSPR) \
- $(LDAP_COMMON_LINK) \
- $(LIBLDAPU) \
- $(LDAP_COMMON_EXTRALIBS)
-
-# JCM - Warnings as Errors!
-CFLAGS += /WX
-else
LDFLAGS = $(SSLLIBFLAG)
EXTRA_LIBS_DEP = $(SECURITY_DEP) \
$(NSPR_DEP) $(LDAPSDK_DEP) $(SVRCORE_DEP) \
@@ -129,16 +96,6 @@ EXTRA_LIBS = $(LDAP_LIBLITEKEY) -lavl -lldif \
$(SVRCORELINK) $(LDAPLINK) \
$(SECURITYLINK) $(NSPRLINK) \
$(ALIBS) $(DYNALIBS) $(THREADSLIB)
-endif
-ifeq ($(ARCH), AIX)
-LD=ld
-EXTRA_LIBS = $(LDAPLINK) $(SVRCORELINK) $(SECURITYLINK) $(NSPRLINK) \
- $(LDAP_COMMON_LINK) \
- $(LIBLDAPU) \
- $(DYNALIBS) $(THREADSLIB) \
- $(DLL_EXTRA_LIBS) \
- $(LDAP_LIBLITEKEY)
-endif
# Comment for the following comment:
# Updating LDAP C SDK to V6.0 has introduced a new dependent library
@@ -164,11 +121,6 @@ LD=CC
endif
endif
-#ifeq ($(ARCH), OSF1)
-#DLL_LDFLAGS=-shared -all -error_unresolved -taso -ySVRCORE_RegisterPinObj
-#EXTRA_LIBS += -lc
-#endif
-
OBJS = $(addprefix $(OBJDEST)/, $(LIBSLAPD_OBJS))
ERRORMAP.O = $(addprefix $(OBJDEST)/, errormap.o)
@@ -196,15 +148,7 @@ clean:
$(ERRORMAP.O): $(DIRVERDIR)/dberrstrs.h
$(DIRVERDIR)/dberrstrs.h: $(DB_INCLUDE)/db.h
-ifeq ($(ARCH), WINNT)
- $(PERL) mkDBErrStrs.pl -nt -i $(DB_INCLUDE) -o $(DIRVERDIR)
-else
- $(PERL) mkDBErrStrs.pl -i $(DB_INCLUDE) -o $(DIRVERDIR)
-endif
-
-ifeq ($(ARCH), WINNT)
-$(OBJS): $(OBJDEST)/%.o : %.c
-endif
+$(PERL) mkDBErrStrs.pl -i $(DB_INCLUDE) -o $(DIRVERDIR)
# Target to push the built binary to an installed server
LIBSLAPD_PUSH = $(addprefix $(INSTDIR)/, bin/slapd/server/libslapd.dll)
diff --git a/ldap/servers/slapd/localhost.c b/ldap/servers/slapd/localhost.c
index 38edb2f..e5bb64b 100644
--- a/ldap/servers/slapd/localhost.c
+++ b/ldap/servers/slapd/localhost.c
@@ -64,10 +64,6 @@
#define _PATH_RESCONF "/etc/resolv.conf"
#endif
-#if !defined(NO_DOMAINNAME) && defined(_WINDOWS)
-#define NO_DOMAINNAME 1
-#endif
-
#if defined (__hpux)
#if (MAXHOSTNAMELEN < 256)
# undef MAXHOSTNAMELEN
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 28f6908..16de252 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -49,11 +49,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-#if !defined(aix)
#include <sys/fcntl.h>
-#else
-#include <fcntl.h>
-#endif
#include <time.h>
#include <stdarg.h>
#include <signal.h>
@@ -64,7 +60,7 @@
#include <arpa/inet.h>
#include <netdb.h>
#include <pwd.h> /* getpwnam */
-#if !defined(IRIX) && !defined(LINUX)
+#if !defined(LINUX)
union semun {
int val;
struct semid_ds *buf;
@@ -335,10 +331,8 @@ static int main_setuid(char *username)
/* set good defaults for front-end config in referral mode */
static void referral_set_defaults(void)
{
-#if !defined(AIX)
char errorbuf[SLAPI_DSE_RETURNTEXT_SIZE];
config_set_maxdescriptors( CONFIG_MAXDESCRIPTORS_ATTRIBUTE, "1024", errorbuf, 1);
-#endif
}
static int
@@ -996,7 +990,6 @@ main( int argc, char **argv)
goto cleanup;
}
-
/*
* Now it is safe to log our first startup message. If we were to
* log anything earlier than now it would appear on the admin startup
@@ -1161,7 +1154,7 @@ cleanup:
ndn_cache_destroy();
NSS_Shutdown();
PR_Cleanup();
-#if ( defined( hpux ) || defined( irix ) || defined( aix ) || defined( OSF1 ))
+#if defined( hpux )
exit( return_value );
#else
return return_value;
@@ -1169,7 +1162,7 @@ cleanup:
}
-#if ( defined( hpux ) || defined( irix ))
+#if defined( hpux )
void
signal2sigaction( int s, void *a )
{
@@ -1182,7 +1175,7 @@ signal2sigaction( int s, void *a )
(void)sigaddset( &act.sa_mask, s );
(void)sigaction( s, &act, NULL );
}
-#endif /* hpux || irix */
+#endif /* hpux */
static void
register_objects()
@@ -1481,16 +1474,6 @@ process_command_line(int argc, char **argv, char *myname,
case 'D': /* config dir */
configdir = rel2abspath( optarg_ext );
-#if defined( XP_WIN32 )
- pszServerName = slapi_ch_malloc( MAX_SERVICE_NAME );
- if( !SlapdGetServerNameFromCmdline(pszServerName, configdir, 1) )
- {
- MessageBox(GetDesktopWindow(), "Failed to get the Directory"
- " Server name from the command-line argument.",
- " ", MB_ICONEXCLAMATION | MB_OK);
- exit( 1 );
- }
-#endif
if ( config_set_configdir( "configdir (-D)",
configdir, errorbuf, 1) != LDAP_SUCCESS ) {
fprintf( stderr, "%s: aborting now\n", errorbuf );
diff --git a/ldap/servers/slapd/ntuserpin.c b/ldap/servers/slapd/ntuserpin.c
deleted file mode 100644
index fa9320d..0000000
--- a/ldap/servers/slapd/ntuserpin.c
+++ /dev/null
@@ -1,214 +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
-
-/******************************************************
- *
- * ntuserpin.c - Prompts for the key
- * database passphrase.
- *
- ******************************************************/
-
-#if defined( _WIN32 )
-
-#include <windows.h>
-#include "ntwatchdog.h"
-#include "slapi-plugin.h"
-#include "fe.h"
-
-#undef Debug
-#undef OFF
-#undef LITTLE_ENDIAN
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include "slap.h"
-#include "fe.h"
-
-static int i=0;
-static int cbRemotePassword = 0;
-
-extern char* NT_PromptForPin(const char *tokenName);
-
-static const char nt_retryWarning[] =
-"Warning: You entered an incorrect PIN. Incorrect PIN may result in disabling the token";
-
-struct SVRCORENTUserPinObj
-{
- SVRCOREPinObj base;
-};
-static const struct SVRCOREPinMethods vtable;
-
-/* ------------------------------------------------------------ */
-SVRCOREError
-SVRCORE_CreateNTUserPinObj(SVRCORENTUserPinObj **out)
-{
- SVRCOREError err = 0;
- SVRCORENTUserPinObj *obj = 0;
-
- do {
- obj = (SVRCORENTUserPinObj*)malloc(sizeof (SVRCORENTUserPinObj));
- if (!obj) { err = 1; break; }
-
- obj->base.methods = &vtable;
-
- } while(0);
-
- if (err)
- {
- SVRCORE_DestroyNTUserPinObj(obj);
- obj = 0;
- }
-
- *out = obj;
- return err;
-}
-
-void
-SVRCORE_DestroyNTUserPinObj(SVRCORENTUserPinObj *obj)
-{
- if (obj) free(obj);
-}
-
-static void destroyObject(SVRCOREPinObj *obj)
-{
- SVRCORE_DestroyNTUserPinObj((SVRCORENTUserPinObj*)obj);
-}
-
-/* First try to retrieve the password from the watchdog,
- if this is not available, prompt for the passphrase. */
-
-static char *getPin(SVRCOREPinObj *obj, const char *tokenName, PRBool retry)
-{
- HWND hwndRemote;
- char *szRemotePassword = NULL;
- HANDLE hRemoteProcess;
- DWORD dwNumberOfBytesRead=0;
- DWORD dwNumberOfBytesWritten=0;
- PK11_PIN *buf= NULL;
- char *password = NULL;
- char pin[MAX_PASSWORD];
- BOOL ret;
- DWORD err = 0;
-
- // Find Watchdog application window
- if( pszServerName && (hwndRemote = FindWindow("slapd", pszServerName)) &&
- (hRemoteProcess = (HANDLE)GetWindowLong( hwndRemote,
- GWL_PROCESS_HANDLE)))
- {
- cbRemotePassword = GetWindowLong(hwndRemote, GWL_PASSWORD_LENGTH);
- szRemotePassword = (HANDLE)GetWindowLong(hwndRemote, GWL_PASSWORD_ADDR);
-
- // if retry, don't get the pin from watchdog
- if (retry)
- {
- MessageBox(GetDesktopWindow(), nt_retryWarning,
- CAPBRAND " Server", MB_ICONEXCLAMATION | MB_OK);
- } else {
- if((cbRemotePassword != 0) && (szRemotePassword != 0))
- {
- buf = (PK11_PIN *)slapi_ch_malloc(sizeof
- (PK11_PIN)*cbRemotePassword);
- if(ReadProcessMemory(hRemoteProcess, szRemotePassword,
- (LPVOID)buf,sizeof(PK11_PIN)*cbRemotePassword ,
- &dwNumberOfBytesRead))
- {
-
- for (i=0; i < cbRemotePassword; i++) {
- if (strncmp (tokenName, buf[i].TokenName,
- buf[i].TokenLength)==0)
- {
- memset(pin, '\0', MAX_PASSWORD);
- PL_strncpyz (pin, buf[i].Password, sizeof(pin));
- slapi_ch_free ((void **) &buf);
- return slapi_ch_strdup(pin);
- }
- }
- }
- }
- }
- }
-
- /* Didn't get the password from Watchdog, or this is a retry,
- prompt the user. */
-
- password = NT_PromptForPin(tokenName);
-
- /* Store the password back to nt watchdog */
- if (password != NULL && hwndRemote && hRemoteProcess)
- {
- slapi_ch_free ((void **) &buf);
- buf = (PK11_PIN *)slapi_ch_malloc(sizeof(PK11_PIN));
- PL_strncpyz (buf[0].TokenName, tokenName, sizeof(buf[0].TokenName));
- buf[0].TokenLength=strlen(buf[0].TokenName);
- PL_strncpyz (buf[0].Password, password, sizeof(buf[0].Password));
- buf[0].PasswordLength=strlen(buf[0].Password);
- if (i== cbRemotePassword)
- {
- /* Add a new token and password to the end of the table.*/
-
- SetWindowLong(hwndRemote, GWL_PASSWORD_LENGTH,
- (LONG)cbRemotePassword+1);
- ret = WriteProcessMemory(hRemoteProcess,
- szRemotePassword+cbRemotePassword*sizeof(PK11_PIN),
- (LPVOID)buf, sizeof(PK11_PIN), &dwNumberOfBytesWritten);
- if( !ret )
- err = GetLastError();
- } else {
- /* This is a retry due to a wrong password stored in watchdog. */
- ret = WriteProcessMemory(hRemoteProcess,
- szRemotePassword+i*sizeof(PK11_PIN),(LPVOID)buf,
- sizeof(PK11_PIN), &dwNumberOfBytesWritten);
- if( !ret )
- err = GetLastError();
- }
- }
- slapi_ch_free ((void **) &buf);
- return (password);
-}
-
-/*
- * VTable
- */
-static const SVRCOREPinMethods vtable =
-{ 0, 0, destroyObject, getPin };
-#endif /* defined( _WIN32 ) */
diff --git a/ldap/servers/slapd/passwd_extop.c b/ldap/servers/slapd/passwd_extop.c
index 9b76e6d..3c8852e 100644
--- a/ldap/servers/slapd/passwd_extop.c
+++ b/ldap/servers/slapd/passwd_extop.c
@@ -54,12 +54,10 @@
#include <stdio.h>
#include <string.h>
#include <private/pprio.h>
-
-
#include <prio.h>
#include <plbase64.h>
-
#include <ssl.h>
+#include <pk11pub.h>
#include "slap.h"
#include "slapi-plugin.h"
#include "fe.h"
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index dd01999..486f589 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -414,11 +414,7 @@ int config_set_malloc_mxfast(const char *attrname, char *value, char *errorbuf,
int config_set_malloc_trim_threshold(const char *attrname, char *value, char *errorbuf, int apply);
int config_set_malloc_mmap_threshold(const char *attrname, char *value, char *errorbuf, int apply);
#endif
-
-#if !defined(AIX)
int config_set_maxdescriptors( const char *attrname, char *value, char *errorbuf, int apply );
-#endif /* !AIX */
-
int config_set_localuser( const char *attrname, char *value, char *errorbuf, int apply );
#ifdef MEMPOOL_EXPERIMENTAL
@@ -490,16 +486,12 @@ int config_get_schema_ignore_trailing_spaces();
char *config_get_rootdn();
char *config_get_rootpw();
char *config_get_rootpwstoragescheme();
-#ifndef _WIN32
char *config_get_localuser();
-#endif /* _WIN32 */
char *config_get_workingdir();
char *config_get_encryptionalias();
int config_get_threadnumber();
int config_get_maxthreadsperconn();
-#if !defined(_WIN32) && !defined(AIX)
int config_get_maxdescriptors();
-#endif /* !_WIN32 && !AIX */
int config_get_reservedescriptors();
int config_get_ioblocktimeout();
int config_get_idletimeout();
@@ -653,9 +645,7 @@ void do_delete( Slapi_PBlock *pb );
*/
int detach( int slapd_exemode, int importexport_encrypt,
int s_port, daemon_ports_t *ports_info );
-#ifndef _WIN32
void close_all_files( void );
-#endif
void raise_process_limits( void );
@@ -830,9 +820,7 @@ void log__delete_rotated_logs();
*/
void slapd_nasty(char* str, int c, int err);
int strarray2str( char **a, char *buf, size_t buflen, int include_quotes );
-#ifndef _WIN32
int slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid);
-#endif
int slapd_comp_path(char *p0, char *p1);
@@ -1470,7 +1458,7 @@ void ns_connection_post_io_or_closing(Connection *conn);
/*
* main.c
*/
-#if ( defined( hpux ) || defined( irix ))
+#if defined( hpux )
void signal2sigaction( int s, void *a );
#endif
int slapd_do_all_nss_ssl_init(int slapd_exemode, int importexport_encrypt,
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 1ab8122..88b0082 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -200,7 +200,7 @@ typedef void (*VFPV)(); /* takes undefined arguments */
/*
* call the appropriate signal() function.
*/
-#if ( defined( hpux ) || defined ( irix ))
+#if defined( hpux )
/*
* we should not mix POSIX signal library function (sigaction)
* with SYSV's (sigset) on IRIX. nspr uses POSIX internally.
@@ -234,23 +234,13 @@ typedef void (*VFPV)(); /* takes undefined arguments */
#define LDAP_UNDEFINED (-1)
#ifndef SLAPD_INVALID_SOCKET
-#ifdef _WIN32
#define SLAPD_INVALID_SOCKET 0
-#else
-#define SLAPD_INVALID_SOCKET 0
-#endif
#endif
#define SLAPD_INVALID_SOCKET_INDEX (-1)
-#ifdef _WIN32
-#define SLAPD_DEFAULT_FILE_MODE S_IREAD | S_IWRITE
-#define SLAPD_DEFAULT_DIR_MODE 0
-#else /* _WIN32 */
#define SLAPD_DEFAULT_FILE_MODE S_IRUSR | S_IWUSR
#define SLAPD_DEFAULT_DIR_MODE S_IRWXU
-#endif
-
#define SLAPD_DEFAULT_ERRORLOG_LEVEL 16384
#define SLAPD_DEFAULT_IDLE_TIMEOUT 0 /* seconds - 0 == never */
#define SLAPD_DEFAULT_SIZELIMIT 2000 /* use -1 for no limit */
@@ -2000,9 +1990,7 @@ typedef struct _slapdEntryPoints {
#define CONFIG_MINSSF_ATTRIBUTE "nsslapd-minssf"
#define CONFIG_MINSSF_EXCLUDE_ROOTDSE "nsslapd-minssf-exclude-rootdse"
#define CONFIG_VALIDATE_CERT_ATTRIBUTE "nsslapd-validate-cert"
-#ifndef _WIN32
#define CONFIG_LOCALUSER_ATTRIBUTE "nsslapd-localuser"
-#endif /* !_WIN32 */
#define CONFIG_LOCALHOST_ATTRIBUTE "nsslapd-localhost"
#define CONFIG_PORT_ATTRIBUTE "nsslapd-port"
#define CONFIG_WORKINGDIR_ATTRIBUTE "nsslapd-workingdir"
@@ -2027,9 +2015,7 @@ typedef struct _slapdEntryPoints {
#define CONFIG_SECURELISTENHOST_ATTRIBUTE "nsslapd-securelistenhost"
#define CONFIG_THREADNUMBER_ATTRIBUTE "nsslapd-threadnumber"
#define CONFIG_MAXTHREADSPERCONN_ATTRIBUTE "nsslapd-maxthreadsperconn"
-#if !defined(_WIN32) && !defined(AIX)
#define CONFIG_MAXDESCRIPTORS_ATTRIBUTE "nsslapd-maxdescriptors"
-#endif /* !_WIN32 && ! AIX */
#define CONFIG_CONNTABLESIZE_ATTRIBUTE "nsslapd-conntablesize"
#define CONFIG_RESERVEDESCRIPTORS_ATTRIBUTE "nsslapd-reservedescriptors"
#define CONFIG_IDLETIMEOUT_ATTRIBUTE "nsslapd-idletimeout"
@@ -2199,9 +2185,7 @@ typedef struct _slapdFrontendConfig {
int idletimeout;
slapi_int_t ioblocktimeout;
slapi_onoff_t lastmod;
-#if !defined(_WIN32) && !defined(AIX)
int maxdescriptors;
-#endif /* !_WIN32 && !AIX */
int conntablesize;
slapi_int_t maxthreadsperconn;
int outbound_ldap_io_timeout;
@@ -2235,9 +2219,7 @@ typedef struct _slapdFrontendConfig {
char *errorlog;
char *listenhost;
int snmp_index;
-#ifndef _WIN32
char *localuser;
-#endif /* _WIN32 */
char *localhost;
char *rootdn;
char *rootpw;
@@ -2459,13 +2441,9 @@ slapdFrontendConfig_t *getFrontendConfig();
int slapd_bind_local_user(Connection *conn);
/* LP: NO_TIME cannot be -1, it generates wrong GeneralizedTime
- * And causes some errors on AIX also
+ * And causes some errors on AIX also
*/
-/* #if defined( XP_WIN32 ) */
#define NO_TIME (time_t)0 /* cannot be -1, NT's localtime( -1 ) returns NULL */
-/* #else */
-/* #define NO_TIME (time_t)-1 / * a value that time() does not return */
-/* #endif */
#define NOT_FIRST_TIME (time_t)1 /* not the first logon */
#define SLAPD_END_TIME (time_t)2147483647 /* (2^31)-1, in 2038 */
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index f003af3..3149cf3 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -718,24 +718,15 @@ typedef struct passwordpolicyarray Slapi_PWPolicy;
typedef void (*TaskCallbackFn)(Slapi_Task *task);
/*
- * The default thread stacksize for nspr21 is 64k (except on IRIX! It's 32k!).
+ * The default thread stacksize for nspr21 is 64k).
* For OSF, we require a larger stacksize as actual storage allocation is
* higher i.e pointers are allocated 8 bytes but lower 4 bytes are used.
* The value 0 means use the default stacksize.
*
- * larger stacksize (256KB) is needed on IRIX due to its 4KB BUFSIZ.
- * (@ pthread IRIX porting -- 01/11/99)
- *
* HP-UX on PA-RISC uses 64KB default stack size. Just set to 256K for all
* HP-UX.
*/
-#if ( defined( irix ))
-#define SLAPD_DEFAULT_THREAD_STACKSIZE 262144L
-#elif ( defined ( OSF1 ))
-#define SLAPD_DEFAULT_THREAD_STACKSIZE 262144L
-#elif ( defined ( AIX ))
-#define SLAPD_DEFAULT_THREAD_STACKSIZE 262144L
-#elif ( defined ( hpux ))
+#if ( defined ( hpux ))
#define SLAPD_DEFAULT_THREAD_STACKSIZE 262144L
#else
/* All other platforms use the default stack size */
diff --git a/ldap/servers/slapd/snmp_collator.c b/ldap/servers/slapd/snmp_collator.c
index 05a3afc..9bebfdd 100644
--- a/ldap/servers/slapd/snmp_collator.c
+++ b/ldap/servers/slapd/snmp_collator.c
@@ -98,17 +98,8 @@ static int hdl;
/* collator stuff */
static char *tmpstatsfile = AGT_STATS_FILE;
-#ifdef _WIN32
-static TCHAR szStatsFile[_MAX_PATH];
-static TCHAR szTempDir[_MAX_PATH];
-static HANDLE hParentProcess = NULL;
-static HANDLE hStatSlot = NULL;
-static HANDLE hLogFile = INVALID_HANDLE_VALUE;
-static TCHAR szSpoolRootDir[_MAX_PATH];
-#else
static char szStatsFile[_MAX_PATH];
static char stats_sem_name[_MAX_PATH];
-#endif /* _WIN32*/
static Slapi_Eq_Context snmp_eq_ctx;
static int snmp_collator_stopped = 0;
diff --git a/ldap/servers/slapd/ssl.c b/ldap/servers/slapd/ssl.c
index 233622a..b8fd084 100644
--- a/ldap/servers/slapd/ssl.c
+++ b/ldap/servers/slapd/ssl.c
@@ -1074,16 +1074,13 @@ slapd_nss_init(int init_ssl, int config_available)
is writable */
if (PR_SUCCESS != PR_Access(certdir, PR_ACCESS_WRITE_OK)) {
char *serveruser = "unknown";
-#ifndef _WIN32
+
serveruser = config_get_localuser();
-#endif
slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization",
"Warning: The key/cert database directory [%s] is not writable by "
"the server uid [%s]: initialization likely to fail.\n",
certdir, serveruser);
-#ifndef _WIN32
slapi_ch_free_string(&serveruser);
-#endif
}
}
@@ -1155,58 +1152,20 @@ svrcore_setup()
{
PRErrorCode errorCode;
int rv = 0;
-#ifndef _WIN32
SVRCOREStdPinObj *StdPinObj;
-#else
- SVRCOREFilePinObj *FilePinObj;
- SVRCOREAltPinObj *AltPinObj;
- SVRCORENTUserPinObj *NTUserPinObj;
-#endif
-#ifndef _WIN32
+
StdPinObj = (SVRCOREStdPinObj *)SVRCORE_GetRegisteredPinObj();
if (StdPinObj) {
- return 0; /* already registered */
+ return 0; /* already registered */
}
- if ( SVRCORE_CreateStdPinObj(&StdPinObj, dongle_file_name, PR_TRUE) !=
- SVRCORE_Success) {
+ if ( SVRCORE_CreateStdPinObj(&StdPinObj, dongle_file_name, PR_TRUE) != SVRCORE_Success) {
errorCode = PR_GetError();
slapd_SSL_warn("Security Initialization: Unable to create PinObj ("
SLAPI_COMPONENT_NAME_NSPR " error %d - %s)",
errorCode, slapd_pr_strerror(errorCode));
- return -1;
- }
- SVRCORE_RegisterPinObj((SVRCOREPinObj *)StdPinObj);
-#else
- AltPinObj = (SVRCOREAltPinObj *)SVRCORE_GetRegisteredPinObj();
- if (AltPinObj) {
- return 0; /* already registered */
- }
- if (SVRCORE_CreateFilePinObj(&FilePinObj, dongle_file_name) !=
- SVRCORE_Success) {
- errorCode = PR_GetError();
- slapd_SSL_warn("Security Initialization: Unable to create FilePinObj ("
- SLAPI_COMPONENT_NAME_NSPR " error %d - %s)",
- errorCode, slapd_pr_strerror(errorCode));
- return -1;
- }
- if (SVRCORE_CreateNTUserPinObj(&NTUserPinObj) != SVRCORE_Success){
- errorCode = PR_GetError();
- slapd_SSL_warn("Security Initialization: Unable to create NTUserPinObj ("
- SLAPI_COMPONENT_NAME_NSPR " error %d - %s)",
- errorCode, slapd_pr_strerror(errorCode));
return -1;
}
- if (SVRCORE_CreateAltPinObj(&AltPinObj, (SVRCOREPinObj *)FilePinObj,
- (SVRCOREPinObj *)NTUserPinObj) != SVRCORE_Success) {
- errorCode = PR_GetError();
- slapd_SSL_warn("Security Initialization: Unable to create AltPinObj ("
- SLAPI_COMPONENT_NAME_NSPR " error %d - %s)",
- errorCode, slapd_pr_strerror(errorCode));
- return -1;
- }
- SVRCORE_RegisterPinObj((SVRCOREPinObj *)AltPinObj);
-
-#endif /* _WIN32 */
+ SVRCORE_RegisterPinObj((SVRCOREPinObj *)StdPinObj);
return rv;
}
@@ -1562,7 +1521,6 @@ slapd_ssl_init2(PRFileDesc **fd, int startTLS)
int allowweakcipher = CIPHER_SET_DEFAULTWEAKCIPHER;
/* turn off the PKCS11 pin interactive mode */
-#ifndef _WIN32
SVRCOREStdPinObj *StdPinObj;
if (svrcore_setup()) {
@@ -1571,8 +1529,6 @@ slapd_ssl_init2(PRFileDesc **fd, int startTLS)
StdPinObj = (SVRCOREStdPinObj *)SVRCORE_GetRegisteredPinObj();
SVRCORE_SetStdPinInteractive(StdPinObj, PR_FALSE);
-#endif
-
errorbuf[0] = '\0';
/*
diff --git a/ldap/servers/slapd/time.c b/ldap/servers/slapd/time.c
index 33a9e32..621847c 100644
--- a/ldap/servers/slapd/time.c
+++ b/ldap/servers/slapd/time.c
@@ -44,11 +44,7 @@
#include <stdio.h>
#include <sys/types.h>
-#ifdef AIX
-#include <time.h>
-#else
#include <sys/time.h>
-#endif
#include "slap.h"
#include "fe.h"
diff --git a/ldap/servers/slapd/tools/ldaptool.h b/ldap/servers/slapd/tools/ldaptool.h
index 1aaf0ed..40d1975 100644
--- a/ldap/servers/slapd/tools/ldaptool.h
+++ b/ldap/servers/slapd/tools/ldaptool.h
@@ -44,39 +44,17 @@
/* should not cause problems in the future even if */
/* we forget to take it out :-) */
-#ifdef OSF1V4D
-#ifndef __STDC__
-# define __STDC__
-#endif /* __STDC__ */
-#endif /* OSF1V4D */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#ifdef AIX
-#include <strings.h>
-#endif
-
-#ifdef SCOOS
-#include <sys/types.h>
-#endif
-
-#ifdef _WINDOWS
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-extern int getopt (int argc, char *const *argv, const char *optstring);
-#include <io.h> /* for _mktemp() */
-#define LDAPTOOL_MKTEMP( p ) _mktemp( p )
-#else
#include <sys/file.h>
#include <sys/stat.h>
#include <unistd.h>
#define LDAPTOOL_MKTEMP( p ) mktemp( p )
-#endif
#ifdef LINUX
#include <getopt.h> /* not always included from unistd.h */
@@ -84,9 +62,7 @@ extern int getopt (int argc, char *const *argv, const char *optstring);
#include <ctype.h>
-#ifndef SCOOS
#include <sys/types.h>
-#endif
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/ldap/servers/slapd/tools/ldclt/data.c b/ldap/servers/slapd/tools/ldclt/data.c
index 2a7a651..e672a93 100644
--- a/ldap/servers/slapd/tools/ldclt/data.c
+++ b/ldap/servers/slapd/tools/ldclt/data.c
@@ -53,27 +53,6 @@
are manipulated by ldclt.
It is targeted to contain all the functions needed for
the images, etc...
- LOCAL : None.
- HISTORY :
----------+--------------+------------------------------------------------------
-dd/mm/yy | Author | Comments
----------+--------------+------------------------------------------------------
-11/01/99 | JL Schwing | Creation
----------+--------------+------------------------------------------------------
-06/03/00 | JL Schwing | 1.2 : Test malloc() return value.
----------+--------------+------------------------------------------------------
-28/11/00 | JL Schwing | 1.3 : Port on NT 4.
----------+--------------+------------------------------------------------------
-30/11/00 | JL Schwing | 1.4 : Implement loadImages for NT.
----------+--------------+------------------------------------------------------
-30/11/00 | JL Schwing | 1.5 : Port on OSF1.
----------+--------------+------------------------------------------------------
-01/12/00 | JL Schwing | 1.6 : Port on Linux.
----------+--------------+------------------------------------------------------
-06/03/01 | JL Schwing | 1.7 : Better error messages if images not found.
----------+--------------+------------------------------------------------------
-23/03/01 | JL Schwing | 1.8 : Implements data file list support in variants.
----------+--------------+------------------------------------------------------
*/
#include <stdio.h> /* printf(), etc... */
diff --git a/ldap/servers/slapd/tools/ldclt/ldapfct.c b/ldap/servers/slapd/tools/ldclt/ldapfct.c
index 69a8d62..18e0df1 100644
--- a/ldap/servers/slapd/tools/ldclt/ldapfct.c
+++ b/ldap/servers/slapd/tools/ldclt/ldapfct.c
@@ -50,189 +50,6 @@
DATE : 04 December 1998
DESCRIPTION :
This file contains the ldap part of this tool.
- LOCAL : None.
- HISTORY :
----------+--------------+------------------------------------------------------
-dd/mm/yy | Author | Comments
----------+--------------+------------------------------------------------------
-04/12/98 | JL Schwing | Creation
----------+--------------+------------------------------------------------------
-09/12/98 | JL Schwing | 1.2 : Forget to free ldap returned data.
----------+--------------+------------------------------------------------------
-10/12/98 | JL Schwing | 1.3 : Add nb of errors statistics.
----------+--------------+------------------------------------------------------
-10/12/98 | JL Schwing | 1.4 : Implement asynchronous mode.
----------+--------------+------------------------------------------------------
-11/12/98 | JL Schwing | 1.5 : fflush(stdout) after each printf.
----------+--------------+------------------------------------------------------
-14/12/98 | JL Schwing | 1.6 : Implement "-e close".
- | New function my_ldap_err2string() to prevent crashes.
----------+--------------+------------------------------------------------------
-16/12/98 | JL Schwing | 1.7 : Implement "-e add" and "-e delete".
- | Create separate functions for connection operations.
----------+--------------+------------------------------------------------------
-23/12/98 | JL Schwing | 1.8 : Factorise the doXxxx() functions.
- | Fix SIGSEGV in ldap_parse_result().
- | Implement result decoding in doAddEntry().
----------+--------------+------------------------------------------------------
-24/12/98 | JL Schwing | 1.9 : Bug fix - should support no message in async.
- | Bug fix - forget to check mctx.asyncMax !!!
- | Modify the getPending() algorythm to empty the queue
- | (if possible).
----------+--------------+------------------------------------------------------
-29/12/98 | JL Schwing | 1.10: Implement -Q.
- | Bug fix mode -q when asynchronous.
----------+--------------+------------------------------------------------------
-11/01/99 | JL Schwing | 1.11: Implement "-e emailPerson".
- | Bug fix - bad building of rdn in buildNewEntry().
----------+--------------+------------------------------------------------------
-13/01/99 | JL Schwing | 1.12: Implement "-e string".
----------+--------------+------------------------------------------------------
-14/01/99 | JL Schwing | 1.13: Implement "-s <scope>".
----------+--------------+------------------------------------------------------
-15/01/99 | JL Schwing | 1.14: Create automatically the missing nodes.
----------+--------------+------------------------------------------------------
-18/01/99 | JL Schwing | 1.15: Implements "-e randombase".
----------+--------------+------------------------------------------------------
-18/01/99 | JL Schwing | 1.16: Implements "-e v2".
----------+--------------+------------------------------------------------------
-20/01/99 | JL Schwing | 1.17: Bug fix - should'nt fail in createMissingNodes()
- | if error 68 (Already exists).
- | Increment counter for intermediate node(s) too.
----------+--------------+------------------------------------------------------
-23/01/99 | JL Schwing | 1.18: Improve traces.
- | Bug fix - remove leading spaces from rdn.
----------+--------------+------------------------------------------------------
-26/01/99 | JL Schwing | 1.19: Implement "-e noloop".
----------+--------------+------------------------------------------------------
-01/02/99 | JL Schwing | 1.20: Create *all* the nodes in createMissingNodes()
----------+--------------+------------------------------------------------------
-03/02/99 | JL Schwing | 1.21: Create the leaf entry after createMissingNodes()
----------+--------------+------------------------------------------------------
-26/02/99 | JL Schwing | 1.22: Detect "\," in createMissingNodes().
----------+--------------+------------------------------------------------------
-04/05/99 | JL Schwing | 1.23: Add call to opAdd().
----------+--------------+------------------------------------------------------
-04/05/99 | JL Schwing | 1.24: Forget some calls to opAdd().
----------+--------------+------------------------------------------------------
-04/05/99 | JL Schwing | 1.25: Too many calls to opAdd() !!!
----------+--------------+------------------------------------------------------
-19/05/99 | JL Schwing | 1.27: Implements doRename().
- | Do not print messages about intermediate nodes created
- | in quiet mode.
- | MOdify getPending()to support rename operations.
----------+--------------+------------------------------------------------------
-06/03/00 | JL Schwing | 1.28: Test malloc() return value.
----------+--------------+------------------------------------------------------
-06/03/00 | A. Hornik | 1.29: Bug fix - SEGV if no passwd provided.
----------+--------------+------------------------------------------------------
-03/08/00 | JL Schwing | 1.30: Improve errors decoding. This improvement
- | is to retrieve the additional error string that
- | is returned by the server. This is implemented for
- | the asynchronous operations and for the synchronous
- | search only, because for the other synchronous ops
- | we should use ldap_get_lderrno() that is not
- | implement in Solaris's libldap.
- | Add new function printErrorFromLdap().
----------+--------------+------------------------------------------------------
-03/08/00 | JL Schwing | 1.31: Fix SIGSEGV in printErrorFromLdap().
----------+--------------+------------------------------------------------------
-11/08/00 | JL Schwing | 1.32: Improve error decoding.
----------+--------------+------------------------------------------------------
-18/08/00 | JL Schwing | 1.33: Print begin and end dates.
----------+--------------+------------------------------------------------------
-25/08/00 | JL Schwing | 1.34: Implement consistent exit status...
----------+--------------+------------------------------------------------------
-11/10/00 | B Kolics | 1.35: Added SSL connection initialization to
- | | connectToServer, createMissingNodes
----------+--------------+------------------------------------------------------
-26/10/00 | B Kolics | 1.36: Moved SSL client initialization to basicInit
--------------------------------------------------------------------------------
-07/11/00 | JL Schwing | 1.37: Implements dynamic load of ssl-related
- | functions.
----------+--------------+------------------------------------------------------
-07/11/00 | JL Schwing | 1.38: Implement "-e inetOrgPerson".
- | Add new error message in createMissingNodes().
----------+--------------+------------------------------------------------------
-13/11/00 | JL Schwing | 1.39: Add new options "-e randombaselow and ...high"
----------+--------------+------------------------------------------------------
-14/11/00 | JL Schwing | 1.40: Will now use utils.c functions.
----------+--------------+------------------------------------------------------
-14/11/00 | JL Schwing | 1.41 : Port on AIX.
----------+--------------+------------------------------------------------------
-21/11/00 | JL Schwing | 1.42: Implement "-e attreplace=name:mask"
- | Add new function buildNewModAttrib().
----------+--------------+------------------------------------------------------
-24/11/00 | B Kolics | 1.43: Added SSL client authentication
----------+--------------+------------------------------------------------------
-29/11/00 | JL Schwing | 1.44: Port on NT 4.
----------+--------------+------------------------------------------------------
-01/12/00 | JL Schwing | 1.45: Port on Linux.
----------+--------------+------------------------------------------------------
-14/12/00 | JL Schwing | 1.46: Add more trace in VERY_VERBOSE mode.
- | Fix some trace messages.
- | Add new function dnFromMessage().
----------+--------------+------------------------------------------------------
-15/12/00 | JL Schwing | 1.47: Implement "-e counteach".
- | Implement "-e withnewparent" - cf bug Scopus 526148
----------+--------------+------------------------------------------------------
-18/12/00 | JL Schwing | 1.48: Add new exit status EXIT_RESSOURCE.
----------+--------------+------------------------------------------------------
-18/12/00 | JL Schwing | 1.49: Bug fix when -e rename,counteach
----------+--------------+------------------------------------------------------
-18/12/00 | JL Schwing | 1.50: Bug fix - support errors the user wants to
- | ignore in connectToServer().
- | Also a bug fix in tttctx->exitStatus management.
----------+--------------+------------------------------------------------------
-03/01/01 | JL Schwing | 1.51: Implement "-e attrsonly=value".
----------+--------------+------------------------------------------------------
-05/01/01 | JL Schwing | 1.52: Implement "-e randombinddn" and associated
- | "-e randombinddnlow/high"
- | Add new function buildNewBindDN().
----------+--------------+------------------------------------------------------
-05/03/01 | JL Schwing | 1.53: Fix the "anonymous" mode.
----------+--------------+------------------------------------------------------
-08/03/01 | JL Schwing | 1.54: Change referrals handling.
- | Add new functions refRebindProc() and referralSetup().
----------+--------------+------------------------------------------------------
-14/03/01 | JL Schwing | 1.55: Implement "-e commoncounter"
----------+--------------+------------------------------------------------------
-14/03/01 | JL Schwing | 1.56: Lint cleanup.
- | Port on _WIN32.
----------+--------------+------------------------------------------------------
-15/03/01 | JL Schwing | 1.57: Implement "-e attrlist=name:name:name"
- | Implement "-e randomattrlist=name:name:name"
----------+--------------+------------------------------------------------------
-19/03/01 | JL Schwing | 1.58: Implement "-e object=filename".
- | Implement "-e genldif=filename".
- | Add new functions buildVersatileObject() doGenldif()
----------+--------------+------------------------------------------------------
-21/03/01 | JL Schwing | 1.59: Implements variables in "-e object=filename"
----------+--------------+------------------------------------------------------
-23/03/01 | JL Schwing | 1.60: Implements data file list support in variants.
- | Implements "-e rdn=value".
----------+--------------+------------------------------------------------------
-28/03/01 | JL Schwing | 1.61: Fix traces.
----------+--------------+------------------------------------------------------
-28/03/01 | JL Schwing | 1.62: Support -e commoncounter with -e rdn/object
- | Increment counters in doGenldif().
- | Perfs tunning in doGenldif().
----------+--------------+------------------------------------------------------
-02/04/01 | JL Schwing | 1.63: Bug fix : large files support for -e genldif.
- | Add new function ldclt_write_genldif().
----------+--------------+------------------------------------------------------
-11/04/01 | JL Schwing | 1.64: Implement [INCRFROMFILE<NOLOOP>(myfile)]
----------+--------------+------------------------------------------------------
-11/04/01 | JL Schwing | 1.65: Bug fix - should not crash if variable not set.
----------+--------------+------------------------------------------------------
-03/05/01 | JL Schwing | 1.66: Implement -e randombinddnfromfile=filename.
- | Add new function getBindAndPasswdFromFile().
----------+--------------+------------------------------------------------------
-04/05/01 | JL Schwing | 1.67: Implement -e bindonly.
- | Add new function doBindOnly().
----------+--------------+------------------------------------------------------
-04/05/01 | JL Schwing | 1.68: Lint cleanup.
----------+--------------+------------------------------------------------------
*/
diff --git a/ldap/servers/slapd/tools/ldclt/ldclt.c b/ldap/servers/slapd/tools/ldclt/ldclt.c
index aab798b..595b93a 100644
--- a/ldap/servers/slapd/tools/ldclt/ldclt.c
+++ b/ldap/servers/slapd/tools/ldclt/ldclt.c
@@ -57,219 +57,6 @@
functionnality aspect of the product, but rather on the
stress and long-term operation.
LOCAL : None.
- HISTORY :
----------+--------------+------------------------------------------------------
-dd/mm/yy | Author | Comments
----------+--------------+------------------------------------------------------
-03/12/98 | JL Schwing | Creation
----------+--------------+------------------------------------------------------
-10/12/98 | JL Schwing | 1.2 : Add statistics report when exiting.
----------+--------------+------------------------------------------------------
-10/12/98 | JL Schwing | 1.3 : Trap SIGQUIL to issue statistics without exit.
- | Bug fix - call ldap_err2string() to decode ldap errs.
----------+--------------+------------------------------------------------------
-11/12/98 | JL Schwing | 1.4 : Implement max errors threshold.
- | fflush(stdout) after each printf.
- | Will exit(0) on SIGINT
----------+--------------+------------------------------------------------------
-14/12/98 | JL Schwing | 1.5 : Implement "-e close".
- | Ensure thread not dead prior to issue "no activity"
- | Add statts for the number of dead threads.
----------+--------------+------------------------------------------------------
-16/12/98 | JL Schwing | 1.6 : Implement "-e add" and "-e delete".
- | Improve printout of options.
----------+--------------+------------------------------------------------------
-24/12/98 | JL Schwing | 1.7 : Fix memory problem.
----------+--------------+------------------------------------------------------
-28/12/98 | JL Schwing | 1.8 : Add more statistics.
----------+--------------+------------------------------------------------------
-29/12/98 | JL Schwing | 1.9 : Implement -Q.
----------+--------------+------------------------------------------------------
-29/12/98 | JL Schwing | 1.10: Don't print pending stats if not asynchronous.
----------+--------------+------------------------------------------------------
-29/12/98 | JL Schwing | 1.11: Fix typo.
----------+--------------+------------------------------------------------------
-30/12/98 | JL Schwing | 1.12: Protect messages "no activity for %d seconds"
- | by SUPER_QUIET mode.
----------+--------------+------------------------------------------------------
-11/01/99 | JL Schwing | 1.13: Implement "-e emailPerson".
----------+--------------+------------------------------------------------------
-13/01/99 | JL Schwing | 1.14: Implement "-e string".
----------+--------------+------------------------------------------------------
-14/01/99 | JL Schwing | 1.15: Implement "-s <scope>".
----------+--------------+------------------------------------------------------
-18/01/99 | JL Schwing | 1.16: Implement "-e randombase".
----------+--------------+------------------------------------------------------
-18/01/99 | JL Schwing | 1.17: Implement "-e v2".
----------+--------------+------------------------------------------------------
-21/01/99 | JL Schwing | 1.18: Implement "-e ascii".
----------+--------------+------------------------------------------------------
-26/01/99 | JL Schwing | 1.19: Implement "-e noloop".
----------+--------------+------------------------------------------------------
-28/01/99 | JL Schwing | 1.20: Implement "-T <total>".
----------+--------------+------------------------------------------------------
-04/05/99 | JL Schwing | 1.21: Implement operations list.
----------+--------------+------------------------------------------------------
-06/05/99 | JL Schwing | 1.25: Add proper shutdwon (wait for check threads).
- | Implement "-P <master port>".
----------+--------------+------------------------------------------------------
-06/05/99 | JL Schwing | 1.26: Implement "-e modrdn".
----------+--------------+------------------------------------------------------
-06/05/99 | F. Pistolesi | 1.27: Some fixes.
----------+--------------+------------------------------------------------------
-07/05/99 | JL Schwing | 1.28: Some fixes.
----------+--------------+------------------------------------------------------
-19/05/99 | JL Schwing | 1.30: Implement "-e rename".
- | Set the threads status to DEAD when nb of opers done.
- | Lint-cleanup.
----------+--------------+------------------------------------------------------
-21/05/99 | JL Schwing | 1.31: Fix Unitialized Memory Read for head's mutex.
----------+--------------+------------------------------------------------------
-27/05/99 | JL Schwing | 1.32 : Add statistics to check threads.
----------+--------------+------------------------------------------------------
-28/05/99 | JL Schwing | 1.33 : Add new option -W (wait).
----------+--------------+------------------------------------------------------
-02/06/99 | JL Schwing | 1.34 : Add flag in main ctx to know if slave was
- | connected or not.
- | Add counter of operations received in check threads.
----------+--------------+------------------------------------------------------
-06/03/00 | JL Schwing | 1.35: Test malloc() and strdup() return value.
----------+--------------+------------------------------------------------------
-04/08/00 | JL Schwing | 1.36: Add stats on nb inactivity per thread.
----------+--------------+------------------------------------------------------
-08/08/00 | JL Schwing | 1.37: Print global statistics every 1000 loops.
----------+--------------+------------------------------------------------------
-18/08/00 | JL Schwing | 1.38: Print global statistics every 90 loops.
- | Bug fix in this new feature.
- | Print ldclt version.
- | Print date of begin and of end.
- | Add new function ldcltExit().
----------+--------------+------------------------------------------------------
-25/08/00 | JL Schwing | 1.39: Implement consistent exit status...
----------+--------------+------------------------------------------------------
-25/08/00 | JL Schwing | 1.40: Will only load images if -e emailPerson
----------+--------------+------------------------------------------------------
-11/10/00 | B Kolics | 1.41: Implement "-Z certfile".
----------+--------------+------------------------------------------------------
-26/10/00 | B Kolics | 1.42: Move SSL client initialization to basicInit()
--------------------------------------------------------------------------------
-07/11/00 | JL Schwing | 1.43: Add handlers for dynamic load of ssl-related
- | functions.
- | Add new function sslDynLoadInit().
------------------------------------------------------------------------------
-07/11/00 | JL Schwing | 1.44: Implement "-e inetOrgPerson".
----------+--------------+------------------------------------------------------
-08/11/00 | JL Schwing | 1.45: Improve error message when initiating ssl.
----------+--------------+------------------------------------------------------
-13/11/00 | JL Schwing | 1.46: Add new options "-e randombaselow and ...high"
- | Made use of exit (EXIT_PARAMS) in main().
----------+--------------+------------------------------------------------------
-14/11/00 | JL Schwing | 1.47: Port on AIX.
----------+--------------+------------------------------------------------------
-16/11/00 | JL Schwing | 1.48: Implement "-e imagesdir=path".
----------+--------------+------------------------------------------------------
-17/11/00 | JL Schwing | 1.49: Implement "-e smoothshutdown".
- | Forget to add mode decoding.
- | Add new function shutdownThreads().
----------+--------------+------------------------------------------------------
-21/11/00 | JL Schwing | 1.50: Implement "-e attreplace=name:mask"
- | Add new function parseFilter().
----------+--------------+------------------------------------------------------
-22/11/00 | JL Schwing | 1.51: Will now use LD_LIBRARY_PATH to load libssl.
----------+--------------+------------------------------------------------------
-24/11/00 | B Kolics | 1.52: Added SSL client authentication
----------+--------------+------------------------------------------------------
-29/11/00 | JL Schwing | 1.53: Port on NT 4.
----------+--------------+------------------------------------------------------
-30/11/00 | JL Schwing | 1.54: Bug fix - bad error message if -eimagesdir=path
----------+--------------+------------------------------------------------------
-01/12/00 | JL Schwing | 1.55: Port on Linux.
----------+--------------+------------------------------------------------------
-01/12/00 | JL Schwing | 1.56: Port on HP-UX.
----------+--------------+------------------------------------------------------
-07/12/00 | JL Schwing | 1.57: Bug fix - crash SIGBUS in main:1840 if no
- | filter is provided to the tool.
- | Build the argv list before parsing.
----------+--------------+------------------------------------------------------
-15/12/00 | JL Schwing | 1.58: Implement "-e counteach".
- | Implement "-e withnewparent".
----------+--------------+------------------------------------------------------
-18/12/00 | JL Schwing | 1.59: Fix an exit status problem.
----------+--------------+------------------------------------------------------
-18/12/00 | JL Schwing | 1.60: Minor fix/improvement in -I management.
----------+--------------+------------------------------------------------------
-19/12/00 | JL Schwing | 1.61: Implement "-e noglobalstats".
----------+--------------+------------------------------------------------------
-19/12/00 | JL Schwing | 1.62: Add comments.
----------+--------------+------------------------------------------------------
-03/01/01 | JL Schwing | 1.63: Implement "-e attrsonly=value".
----------+--------------+------------------------------------------------------
-05/01/01 | JL Schwing | 1.64: Implement "-e randombinddn" and associated
- | "-e randombinddnlow/high"
----------+--------------+------------------------------------------------------
-08/01/01 | JL Schwing | 1.65: Implement "-e scalab01".
- | Replace all exit() by ldcltExit()
----------+--------------+------------------------------------------------------
-12/01/01 | JL Schwing | 1.66: Second set of options for -e scalab01
- | Sanity check in decodeExecParams().
----------+--------------+------------------------------------------------------
-26/02/01 | JL Schwing | 1.67: Use ldclt_sleep() not sleep() (NT issue).
----------+--------------+------------------------------------------------------
-08/03/01 | JL Schwing | 1.68: Change referrals handling.
- | Use a static char[] to store ldclt version.
- | Add new function decodeReferralParams().
----------+--------------+------------------------------------------------------
-14/03/01 | JL Schwing | 1.69: Implement "-e commoncounter"
- | Add a control for referral mode.
----------+--------------+------------------------------------------------------
-14/03/01 | JL Schwing | 1.70: Implement "-e dontsleeponserverdown".
----------+--------------+------------------------------------------------------
-14/03/01 | JL Schwing | 1.71: Misc fixes for HP-UX compilation.
----------+--------------+------------------------------------------------------
-15/03/01 | JL Schwing | 1.72: Implement "-e attrlist=name:name:name"
- | Implement "-e randomattrlist=name:name:name"
----------+--------------+------------------------------------------------------
-19/03/01 | JL Schwing | 1.73: Implement "-e object=filename"
- | Bug fix - understand EXIT_INIT in ldcltExit().
- | Implement "-e genldif=filename"
- | Add new function tttctxInit().
----------+--------------+------------------------------------------------------
-21/03/01 | JL Schwing | 1.74: Implements variables in "-e object=filename"
- | Add new function copyVersObject().
----------+--------------+------------------------------------------------------
-23/03/01 | JL Schwing | 1.75: Implements data file list support in variants.
- | Implements "-e rdn=value".
- | Add new functions copyVersAttribute() decodeRdnParam()
----------+--------------+------------------------------------------------------
-28/03/01 | JL Schwing | 1.76: Update options checking for "-e rdn=value".
----------+--------------+------------------------------------------------------
-28/03/01 | JL Schwing | 1.77: Support -e commoncounter with -e rdn/object
- | Remove MAX_ATTRLIST - use MAX_ATTRIBS.
- | Bug fix - forget to initiate some fields in -e rdn=
----------+--------------+------------------------------------------------------
-02/04/01 | JL Schwing | 1.78: Bug fix : large files support for -e genldif.
----------+--------------+------------------------------------------------------
-03/04/01 | JL Schwing | 1.79: Port on _WIN32 and OSF1.
----------+--------------+------------------------------------------------------
-05/04/01 | JL Schwing | 1.80: Bug fix - forget to print genldif file name.
----------+--------------+------------------------------------------------------
-05/04/01 | JL Schwing | 1.81: Implement -e append.
----------+--------------+------------------------------------------------------
-11/04/01 | JL Schwing | 1.82: Bug fix in -e append.
----------+--------------+------------------------------------------------------
-23/04/01 | JL Schwing | 1.83: Improved arguments print at startup.
- | Add new function buildArgListString().
----------+--------------+------------------------------------------------------
-23/04/01 | JL Schwing | 1.84: Exit on error 2 if extra arguments provided.
----------+--------------+------------------------------------------------------
-03/05/01 | JL Schwing | 1.85: Implement -e randombinddnfromfile=filename.
----------+--------------+------------------------------------------------------
-04/05/01 | JL Schwing | 1.86: Implement -e bindonly.
----------+--------------+------------------------------------------------------
-04/05/01 | JL Schwing | 1.87: Fix options check.
----------+--------------+------------------------------------------------------
-16/06/01 | JL Schwing | 1.89: Allow SSL for HP-UX.
----------+--------------+------------------------------------------------------
*/
#include <stdlib.h> /* exit(), etc... */
@@ -1086,7 +873,6 @@ trapVector (
int
initMainThread (void)
{
-#ifndef _WIN32 /*JLS 29-11-00*/
struct sigaction act;
/*
@@ -1130,7 +916,6 @@ initMainThread (void)
fflush (stderr);
return (-1);
}
-#endif /* _WIN32 */ /*JLS 29-11-00*/
return (0);
}
@@ -1259,7 +1044,7 @@ basicInit (void)
oflags = O_APPEND|O_WRONLY|O_CREAT; /*JLS 05-04-01*/
else /*JLS 05-04-01*/
oflags = O_EXCL|O_WRONLY|O_CREAT; /*JLS 05-04-01*/
-#if !defined(OSF1) && !defined(__LP64__) && !defined(_LP64) /*JLS 05-04-01*/
+#if !defined(__LP64__) && !defined(_LP64) /*JLS 05-04-01*/
oflags |= O_LARGEFILE; /*JLS 05-04-01*/
#endif /*JLS 03-04-01*/
mctx.genldifFile = open (mctx.genldifName, oflags, 0666); /*JLS 05-04-01*/
diff --git a/ldap/servers/slapd/tools/ldclt/opCheck.c b/ldap/servers/slapd/tools/ldclt/opCheck.c
index aa7f780..6f8505d 100644
--- a/ldap/servers/slapd/tools/ldclt/opCheck.c
+++ b/ldap/servers/slapd/tools/ldclt/opCheck.c
@@ -54,49 +54,6 @@
server to the attributes memorized for one operation,
etc...
LOCAL : None.
- HISTORY :
----------+--------------+------------------------------------------------------
-dd/mm/yy | Author | Comments
----------+--------------+------------------------------------------------------
-04/05/99 | JL Schwing | Creation
----------+--------------+------------------------------------------------------
-05/05/99 | F. Pistolesi | 1.8 : Add communication with remote host.
- | Implement operations check.
----------+--------------+------------------------------------------------------
-06/05/99 | JL Schwing | 1.10: Implements opDecOper().
- | Add more traces in VERY_VERBOSE
----------+--------------+------------------------------------------------------
-20/05/99 | JL Schwing | 1.18: Add params (newRdn and newParent) to opAdd()
- | Decode operations in Cnnn messages.
- | No more exit on EINTR in accept()
- | Fix memory leak in thOperFree()
----------+--------------+------------------------------------------------------
-21/05/99 | JL Schwing | 1.19: Minor fixes in messages.
- | Purify cleanup - Free memory read in opCheckLoop()
- | Fix thOperFree() - pb when head of list to delete
- | Fix memory leak in opNext().
----------+--------------+------------------------------------------------------
-26/05/99 | JL Schwing | 1.21: Bug fix - return(-1) bad place in opNext().
- | Minor fixes in messages.
----------+--------------+------------------------------------------------------
-27/05/99 | JL Schwing | 1.22 : Add statistics to check threads.
----------+--------------+------------------------------------------------------
-27/05/99 | F. Pistolesi | 1.23 : Fix statistics and other algorythms.
----------+--------------+------------------------------------------------------
-31/05/99 | JL Schwing | 1.25 : Bug fix - should test opRead() returned pointer
----------+--------------+------------------------------------------------------
-02/06/99 | JL Schwing | 1.26 : Add flag in main ctx to know if slave was
- | connected or not.
- | Add counter of operations received in check threads.
----------+--------------+------------------------------------------------------
-06/03/00 | JL Schwing | 1.27: Test malloc() return value.
----------+--------------+------------------------------------------------------
-18/08/00 | JL Schwing | 1.28: Print begin and end dates.
----------+--------------+------------------------------------------------------
-17/11/00 | JL Schwing | 1.29: Implement "-e smoothshutdown".
----------+--------------+------------------------------------------------------
-29/11/00 | JL Schwing | 1.30: Port on NT 4.
----------+--------------+------------------------------------------------------
*/
#include <pthread.h> /* Posix threads */
@@ -124,10 +81,6 @@ dd/mm/yy | Author | Comments
enum {SINGLE=0,FIRST,MIDDLE,LAST};
-
-
-
-
/* ****************************************************************************
FUNCTION : opDecOper
PURPOSE : This function decodes an LDAP operation and return a
@@ -151,12 +104,6 @@ opDecOper (
}
}
-
-
-
-
-
-
/* ****************************************************************************
FUNCTION : LDAPMod2attributes
PURPOSE : Convert a LDAPMod-like array of attributes to the
@@ -230,14 +177,6 @@ LDAPMod2attributes (
return (0);
}
-
-
-
-
-
-
-
-
/* ****************************************************************************
FUNCTION : freeAttributesArray
PURPOSE : This function is targeted to free an array of
@@ -263,14 +202,6 @@ freeAttributesArray (
return (0);
}
-
-
-
-
-
-
-
-
/* ****************************************************************************
FUNCTION : opAdd
PURPOSE : Add a new operation to the list.
@@ -387,12 +318,6 @@ opAdd (
return (0);
}
-
-
-
-
-
-
/* ****************************************************************************
FUNCTION : opNext
PURPOSE : Return the next available operation. May return NULL
@@ -481,14 +406,6 @@ opNext (
return (0);
}
-
-
-
-
-
-
-
-
/* ****************************************************************************
FUNCTION : opRead
PURPOSE : Read the n'th operation from the head.
@@ -522,11 +439,6 @@ opRead (
return (0);
}
-
-
-
-
-
/* ****************************************************************************
FUNCTION : thOperAdd
PURPOSE : This function copies an operation to the late
@@ -590,11 +502,6 @@ thOperAdd ( thoper *head, oper *elem, int f)
return head;
}
-
-
-
-
-
/* ****************************************************************************
FUNCTION : thOperFree
PURPOSE : This function frees memory for a late operation
@@ -626,11 +533,6 @@ thOperFree (thoper *head, thoper *elem)
return head;
}
-
-
-
-
-
/* ****************************************************************************
FUNCTION : opCheckLoop
PURPOSE : This function is the per slave check function
@@ -858,11 +760,6 @@ opCheckLoop ( void* arg)
pthread_exit(NULL);
}
-
-
-
-
-
/* ****************************************************************************
FUNCTION : opCheckMain
PURPOSE : This function is the main function of the check
@@ -881,9 +778,6 @@ opCheckMain (
#ifdef LINUX
struct hostent *stupidlinux=NULL;
#endif
-#ifdef AIX
- struct hostent_data stupidaix;
-#endif
struct linger lopt;
uint32_t ipaddr;
int newfd,sockfd,ncctx,i,err;
@@ -923,11 +817,7 @@ opCheckMain (
retry = 1;
while (retry)
{
-#ifdef AIX
- if ((newfd=accept(sockfd,(struct sockaddr *)&claddr,(unsigned long *)&i))>=0)
-#else
if ((newfd=accept(sockfd,(struct sockaddr *)&claddr,&i))>=0)
-#endif
retry = 0;
else
if (errno != EINTR)
@@ -941,10 +831,6 @@ opCheckMain (
*/
ipaddr=ntohl(claddr.sin_addr.s_addr);
-#ifdef AIX
- gethostbyaddr_r((char*)&ipaddr,sizeof(ipaddr),AF_INET,&cltaddr,
- &stupidaix);
-#else
#ifdef LINUX
gethostbyaddr_r((char*)&ipaddr,sizeof(ipaddr),AF_INET,&cltaddr,
buffer,128, &stupidlinux, &err);
@@ -956,7 +842,6 @@ opCheckMain (
buffer,128,&err);
#endif
#endif
-#endif
i=1;
if(setsockopt(newfd,IPPROTO_TCP, TCP_NODELAY,(void *)&i,sizeof(int))!=0)
@@ -1009,9 +894,3 @@ opCheckMain (
close(sockfd);
}
-
-
-
-
-
-/* End of file */
diff --git a/ldap/servers/slapd/tools/ldclt/port.h b/ldap/servers/slapd/tools/ldclt/port.h
index cacbf91..b63eff9 100644
--- a/ldap/servers/slapd/tools/ldclt/port.h
+++ b/ldap/servers/slapd/tools/ldclt/port.h
@@ -51,27 +51,11 @@
DESCRIPTION :
This file contains the include (interface) definitions
of port.c
- LOCAL : None.
- HISTORY :
----------+--------------+------------------------------------------------------
-dd/mm/yy | Author | Comments
----------+--------------+------------------------------------------------------
-28/11/00 | JL Schwing | Creation
----------+--------------+------------------------------------------------------
-01/12/00 | JL Schwing | 1.2 : Port on Linux.
----------+--------------+------------------------------------------------------
-01/12/00 | JL Schwing | 1.3 : Port on HP-UX.
----------+--------------+------------------------------------------------------
-03/04/01 | JL Schwing | 1.4 : Linux large file issue...
----------+--------------+------------------------------------------------------
*/
/*
* Tuning of the code
*/
-#ifdef AIX /*JLS 01-12-00*/
-#define LDCLT_CAST_SIGACTION 1 /*JLS 01-12-00*/
-#endif /*JLS 01-12-00*/
#ifdef HPUX /*JLS 01-12-00*/
#define LDCLT_CAST_SIGACTION 1 /*JLS 01-12-00*/
diff --git a/ldap/servers/slapd/tools/ldclt/remote.h b/ldap/servers/slapd/tools/ldclt/remote.h
index d10dcaa..accb99b 100644
--- a/ldap/servers/slapd/tools/ldclt/remote.h
+++ b/ldap/servers/slapd/tools/ldclt/remote.h
@@ -49,17 +49,6 @@
DESCRIPTION :
This file contains the definitions used by the remote
control module of ldclt.
- LOCAL : None.
- HISTORY :
----------+--------------+------------------------------------------------------
-dd/mm/yy | Author | Comments
----------+--------------+------------------------------------------------------
-04/05/99 | JL Schwing | Creation
----------+--------------+------------------------------------------------------
-05/05/99 | F. Pistolesi | 1.3 : Implements communication with remote part.
----------+--------------+------------------------------------------------------
-06/05/99 | JL Schwing | 1.4 : Port on Solaris 2.5.1
----------+--------------+------------------------------------------------------
*/
/*
@@ -69,14 +58,7 @@ dd/mm/yy | Author | Comments
#include <sys/types.h>
#include <fcntl.h>
#include <sys/stat.h>
-#ifdef OSF1
-#ifndef _UINT32_T
-#define _UINT32_T
-typedef unsigned long uint32_t;
-#endif /* _UINT32_T */
-#else /* OS_RELEASE */
#include <inttypes.h>
-#endif /* OS_RELEASE */
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
diff --git a/ldap/servers/slapd/tools/ldclt/utils.c b/ldap/servers/slapd/tools/ldclt/utils.c
index 80a429c..c3a0dce 100644
--- a/ldap/servers/slapd/tools/ldclt/utils.c
+++ b/ldap/servers/slapd/tools/ldclt/utils.c
@@ -57,18 +57,6 @@
framework and data structures, and thus to provide a
kind of library suitable for any command.
LOCAL : None.
- HISTORY :
----------+--------------+------------------------------------------------------
-dd/mm/yy | Author | Comments
----------+--------------+------------------------------------------------------
-14/11/00 | JL Schwing | Creation
----------+--------------+------------------------------------------------------
-14/11/00 | JL Schwing | 1.2 : Port on AIX.
----------+--------------+------------------------------------------------------
-16/11/00 | JL Schwing | 1.3 : lint cleanup.
----------+--------------+------------------------------------------------------
-11/01/01 | JL Schwing | 1.4 : Add new function rndlim().
----------+--------------+------------------------------------------------------
*/
#include "utils.h" /* Basic definitions for this file */
@@ -81,50 +69,8 @@ dd/mm/yy | Author | Comments
/*
* Some global variables...
*/
-#ifdef AIX
-pthread_mutex_t ldcltrand48_mutex; /* ldcltrand48() */ /*JLS 14-11-00*/
-#endif
-
-
-#ifdef AIX /* New */ /*JLS 14-11-00*/
-/* ****************************************************************************
- FUNCTION : ldcltrand48
- PURPOSE : Implement a thread-save version of lrand48()
- INPUT : None.
- OUTPUT : None.
- RETURN : A random value.
- DESCRIPTION :
- *****************************************************************************/
-long int
-ldcltrand48 (void)
-{
- long int val;
- int ret;
-
- if ((ret = pthread_mutex_lock (&ldcltrand48_mutex)) != 0)
- {
- fprintf (stderr,
- "Cannot pthread_mutex_lock(ldcltrand48_mutex), error=%d (%s)\n",
- ret, strerror (ret));
- fflush (stderr);
- ldcltExit (99);
- }
- val = lrand48();
- if ((ret = pthread_mutex_unlock (&ldcltrand48_mutex)) != 0)
- {
- fprintf (stderr,
- "Cannot pthread_mutex_unlock(ldcltrand48_mutex), error=%d (%s)\n",
- ret, strerror (ret));
- fflush (stderr);
- ldcltExit (99);
- }
-
- return (val);
-}
-
-#else /* AIX */
#define ldcltrand48() lrand48()
-#endif /* AIX */
+
/* ****************************************************************************
@@ -138,21 +84,6 @@ ldcltrand48 (void)
int
utilsInit (void)
{
-#ifdef AIX /*JLS 14-11-00*/
- int ret; /*JLS 14-11-00*/
-
- /*
- * Initiate the mutex that protect ldcltrand48()
- */
- if ((ret = pthread_mutex_init(&ldcltrand48_mutex, NULL)) != 0)/*JLS 14-11-00*/
- { /*JLS 14-11-00*/
- fprintf (stderr, "ldclt: %s\n", strerror (ret)); /*JLS 14-11-00*/
- fprintf (stderr, /*JLS 14-11-00*/
- "Error: cannot initiate ldcltrand48_mutex\n"); /*JLS 14-11-00*/
- fflush (stderr); /*JLS 14-11-00*/
- return (-1); /*JLS 14-11-00*/
- } /*JLS 14-11-00*/
-#endif /*JLS 14-11-00*/
/*
* No error
@@ -160,14 +91,6 @@ utilsInit (void)
return (0);
}
-
-
-
-
-
-
-
-
/* ****************************************************************************
FUNCTION : rndlim
PURPOSE : Returns a random number between the given limits.
@@ -185,14 +108,6 @@ rndlim (
return (low + ldcltrand48() % (high-low+1));
}
-
-
-
-
-
-
-
-
/* ****************************************************************************
FUNCTION : rnd
PURPOSE : Creates a random number string between the given
@@ -217,11 +132,6 @@ rnd (
(int)(low + (ldcltrand48() % (high-low+1)))); /*JLS 14-11-00*/
}
-
-
-
-
-
/* ****************************************************************************
FUNCTION : rndstr
PURPOSE : Return a random string, of length ndigits. The string
@@ -334,6 +244,3 @@ incr_and_wrap(int val, int min, int max, int incr)
return (((val + incr) - min) % range) + min;
}
-
-
-/* End of file */
diff --git a/ldap/servers/slapd/tools/migratecred.c b/ldap/servers/slapd/tools/migratecred.c
index 3c876f0..86e6fb2 100644
--- a/ldap/servers/slapd/tools/migratecred.c
+++ b/ldap/servers/slapd/tools/migratecred.c
@@ -150,15 +150,7 @@ main( int argc, char **argv)
shared_lib = ".sl";
#endif
#else
-#ifdef AIX
-#if OSVERSION >= 4200
shared_lib = ".so";
-#else
- shared_lib = "_shr.a";
-#endif
-#else
- shared_lib = ".so";
-#endif
#endif
if (!pluginpath) {
diff --git a/ldap/servers/slapd/tools/mkdep.c b/ldap/servers/slapd/tools/mkdep.c
index e5f49e0..7c79ee6 100644
--- a/ldap/servers/slapd/tools/mkdep.c
+++ b/ldap/servers/slapd/tools/mkdep.c
@@ -55,18 +55,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-#ifdef WINNT
-#include <windows.h>
-#include <winbase.h>
-#include <io.h>
-#else
#include <unistd.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
-#endif
char __depname[512] = "\n\t at touch ";
@@ -80,12 +73,7 @@ struct path_struct {
char buffer[256-sizeof(int)];
} path = { 0, "" };
-
-#ifdef WINNT
-#define EXISTS(_fn) _access(_fn, 00)
-#else
#define EXISTS(_fn) access(_fn, F_OK)
-#endif
/*
* Handle an #include line.
@@ -233,65 +221,6 @@ pound_include_dquote:
}
}
-
-#ifdef WINNT
-
-/*
- * Alternate implementation of do_depend() for NT
- * (NT has its own wacky versions of open/mmap/close)
- */
-void do_depend(const char *filename, const char *command)
-{
- HANDLE fd, mapfd;
- BY_HANDLE_FILE_INFORMATION st;
- char *map;
-
- fd = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
- OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
- if (fd == INVALID_HANDLE_VALUE) {
- fprintf(stderr, "NT error opening '%s'\n", filename);
- return;
- }
- if (! GetFileInformationByHandle(fd, &st)) {
- fprintf(stderr, "NT error getting stat on '%s'\n", filename);
- CloseHandle(fd);
- return;
- }
- if (st.nFileSizeLow == 0) {
- fprintf(stderr, "%s is empty\n", filename);
- CloseHandle(fd);
- return;
- }
-
- mapfd = CreateFileMapping(fd, NULL, PAGE_READONLY, st.nFileSizeHigh,
- st.nFileSizeLow, NULL);
- if (mapfd == NULL) {
- fprintf(stderr, "NT error creating file mapping of '%s'\n",
- filename);
- CloseHandle(fd);
- return;
- }
- map = MapViewOfFile(mapfd, FILE_MAP_READ, 0, 0, 0);
- if (map == NULL) {
- fprintf(stderr, "NT error creating mapped view of '%s'\n",
- filename);
- CloseHandle(mapfd);
- CloseHandle(fd);
- return;
- }
-
- hasdep = 0;
- state_machine(map, map+st.nFileSizeLow);
- if (hasdep)
- puts(command);
-
- UnmapViewOfFile(map);
- CloseHandle(mapfd);
- CloseHandle(fd);
-}
-
-#else
-
/*
* Generate dependencies for one file.
*/
@@ -339,9 +268,6 @@ void do_depend(const char * filename, const char * command)
close(fd);
}
-#endif
-
-
/*
* Generate dependencies for all files.
*/
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index 271f342..958ee6f 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -1051,9 +1051,6 @@ Description:
In UNIX this is accomplished by using select()
which should be supported across all UNIX platforms.
- In WIN32 we simply use the Sleep() function which yields
- for the number of milliseconds specified.
-
************************************************************************/
void
DS_Sleep(PRIntervalTime ticks)
diff --git a/ldap/systools/idsktune.c b/ldap/systools/idsktune.c
index f36b780..1a28045 100644
--- a/ldap/systools/idsktune.c
+++ b/ldap/systools/idsktune.c
@@ -46,26 +46,17 @@
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
static char *build_date = "23-FEBRUARY-2012";
-#if defined(__FreeBSD__) || defined(__bsdi)
-#define IDDS_BSD_INCLUDE 1
-#define IDDS_BSD_SYSCTL 1
-#endif
-
#if defined(linux) || defined(__linux) || defined(__linux__)
#define IDDS_LINUX_INCLUDE 1
#define IDDS_LINUX_SYSCTL 1
#endif
-#if defined(__sun) || defined(__sun__) || defined(_AIX) || defined(__hpux) || defined(_nec_ews_svr4) || defined(__osf__) || defined(__sgi) || defined(sgi)
+#if defined(__sun) || defined(__sun__)|| defined(__hpux)
#define IDDS_SYSV_INCLUDE 1
#endif
#include <sys/types.h>
-#if defined(IDDS_BSD_INCLUDE)
-#include <sys/time.h>
-#endif
-
#if !defined(__VMS)
#include <sys/resource.h>
#include <unistd.h>
@@ -74,7 +65,7 @@ static char *build_date = "23-FEBRUARY-2012";
#include <string.h>
#include <errno.h>
#include <ctype.h>
-#if !defined(_WIN32) && !defined(__VMS) && !defined(IDDS_LINUX_INCLUDE) && !defined(IDDS_BSD_INCLUDE)
+#if !defined(__VMS) && !defined(IDDS_LINUX_INCLUDE)
#if defined(__hpux) && defined(f_type)
#undef f_type
#endif
@@ -88,7 +79,7 @@ static char *build_date = "23-FEBRUARY-2012";
#include <sys/param.h>
#endif
-#if defined(__sun) || defined(__sun__) || defined(__osf__) || defined(_nec_ews_svr4) || defined(__sgi) || defined(sgi)
+#if defined(__sun) || defined(__sun__)
/* not available on HP-UX or AIX */
#include <sys/systeminfo.h>
#endif
@@ -128,52 +119,6 @@ static char *build_date = "23-FEBRUARY-2012";
#define IDDS_MNTENT_MNTTAB "/etc/mnttab"
#endif
-#if defined(_AIX)
-#include <pthread.h>
-#include <signal.h>
-#include <sys/inttypes.h>
-#include <odmi.h>
-#include <fstab.h>
-
-struct CuAt {
- __long32_t _id;
- __long32_t _reserved;
- __long32_t _scratch;
- char name[16];
- char attribute[16];
- char value[256];
- char type[8];
- char generic[8];
- char rep[8];
- short nls_index;
-};
-#define CuAt_Descs 7
-
-struct fix {
- __long32_t _id;
- __long32_t _reserved;
- __long32_t _scratch;
- char name[16];
- char abstract[60];
- char type[2];
- char *filesets;
- char *symptom;
- };
-
-#define fix_Descs 5
-
-struct Class CuAt_CLASS[];
-extern struct Class fix_CLASS[];
-
-static void idds_aix_odm_get_cuat (char *query,char *buf);
-
-#define IDDS_MNTENT fstab
-#define IDDS_MNTENT_DIRNAME fs_file
-/* AIX does not have /etc/mnttab */
-/* #define IDDS_MNTENT_OPTIONS */
-
-#endif
-
#if defined(__VMS)
#error "This program is not available for VMS"
#endif
@@ -248,11 +193,7 @@ int mem_rec = 1024;
#define NAME_TCP_KEEPALIVE_INTERVAL "net.ipv4.tcp_keepalive_time"
#endif
-#if defined(IDDS_BSD_SYSCTL)
-#define NAME_TCP_SMALLEST_ANON_PORT "net.inet.ip.portrange.hifirst"
-#endif
-
-#if defined(__sun) || defined(__hpux) || defined(IDDS_BSD_SYSCTL) || defined(IDDS_LINUX_SYSCTL)
+#if defined(__sun) || defined(__hpux) || defined(IDDS_LINUX_SYSCTL)
long ndd_tcp_conn_req_max_q = 0;
long ndd_tcp_conn_req_max_q0 = 0;
@@ -326,251 +267,6 @@ struct iii_pinfo_hp {
static void hp_check_qpk(void);
#endif
-#if defined(_AIX)
-
-static struct ClassElem CuAt_ClassElem[] = {
- { "name",ODM_CHAR, 12,16, NULL,NULL,0,NULL ,-1,0},
- { "attribute",ODM_CHAR, 28,16, NULL,NULL,0,NULL ,-1,0},
- { "value",ODM_CHAR, 44,256, NULL,NULL,0,NULL ,-1,0},
- { "type",ODM_CHAR, 300,8, NULL,NULL,0,NULL ,-1,0},
- { "generic",ODM_CHAR, 308,8, NULL,NULL,0,NULL ,-1,0},
- { "rep",ODM_CHAR, 316,8, NULL,NULL,0,NULL ,-1,0},
- { "nls_index",ODM_SHORT, 324, 2, NULL,NULL,0,NULL ,-1,0},
-};
-
-static struct ClassElem fix_ClassElem[] = {
- { "name",ODM_CHAR, 12,16, NULL,NULL,0,NULL ,-1,0},
- { "abstract",ODM_CHAR, 28,60, NULL,NULL,0,NULL ,-1,0},
- { "type",ODM_CHAR, 88,2, NULL,NULL,0,NULL ,-1,0},
- { "filesets",ODM_VCHAR, 92,64, NULL,NULL,0,NULL ,-1,0},
- { "symptom",ODM_VCHAR, 96,64, NULL,NULL,0,NULL ,-1,0},
- };
-struct StringClxn fix_STRINGS[] = {
- "fix.vc", 0,NULL,NULL,0,0,0
- };
-
-#ifdef __64BIT__
-struct Class CuAt_CLASS[] = {
- ODMI_MAGIC, "CuAt", 328, CuAt_Descs, CuAt_ClassElem, NULL,FALSE,NULL,NULL,0,0,NULL,0,"", 0,-ODMI_MAGIC
-};
-struct Class fix_CLASS[] = {
- ODMI_MAGIC, "fix", 100, fix_Descs, fix_ClassElem, fix_STRINGS,FALSE,NULL,NULL,0,0,NULL,0,"", 0,-ODMI_MAGIC
- };
-
-#else
-struct Class CuAt_CLASS[] = {
- ODMI_MAGIC, "CuAt", sizeof(struct CuAt), CuAt_Descs, CuAt_ClassElem, NULL,FALSE,NULL,NULL,0,0,NULL,0,"", 0,-ODMI_MAGIC
-};
-struct Class fix_CLASS[] = {
- ODMI_MAGIC, "fix", sizeof(struct fix), fix_Descs, fix_ClassElem, fix_STRINGS,FALSE,NULL,NULL,0,0,NULL,0,"", 0,-ODMI_MAGIC
- };
-
-#endif
-
-void idds_aix_odm_get_cuat (char *query,char *buf)
-{
- struct CuAt cuat,*cp;
-
- cp = odm_get_first(CuAt_CLASS,query,&cuat);
-
- if (cp == NULL || cp == (struct CuAt *)-1) {
- if (flag_debug) {
- printf("DEBUG : query of %s failed, error %d\n",query,odmerrno);
- }
- *buf = '\0';
- return;
- } else {
- if (flag_debug) {
- printf("DEBUG : query of %s resulted in %s\n",query,cuat.value);
- }
- }
- strcpy(buf,cuat.value);
-}
-
-int idds_aix_odm_get_fix (char *query)
-{
- struct fix fix,*cp;
-
- cp = odm_get_first(fix_CLASS,query,&fix);
-
- if (cp == NULL || cp == (struct fix *)-1) {
- if (flag_debug) {
- printf("DEBUG : query of %s failed, error %d\n",query,odmerrno);
- }
- return 0;
- } else {
- if (flag_debug) {
- printf("DEBUG : query of %s resulted in data\n",query);
- }
- }
- return 1;
-}
-
-#define AIX_CHECK_PATCH_CMD "/usr/bin/lslpp -c -L bos.rte.libpthreads bos.rte.libc"
-
-
-/* called once for each patch
- * a is always "bos"
- * b is "bos.rte.libpthreads:4.3.3.25: : :C:F:libpthreads Library"
- */
-
-/* We assume the patch is in 4.3.3.1 and later. We don't check for AIX 5.0 */
-/* Since the next major release after 4.3.3 is 5.0, we assume there won't be a
- * 4.10 or a 4.4.10.
- */
-
-int aix_check_patch_bos(char *a,char *b)
-{
- char *c;
- char *d;
- char *e;
- int d3;
- int d4;
-
- c = strchr(b,':');
- if (c == NULL) return 0;
- *c = '\0';
- c++;
-
- d = strchr(c,':');
- if (d != NULL) *d = '\0';
-
- if (c[0] >= '5') {
- /* AIX 5.x */
- if (flag_debug) printf("DEBUG : %s is version 5 or later (%s)\n",
- b,c);
- return 0;
- } else if (c[0] != '4') {
- /* AIX 3.x or earlier */
- printf("ERROR : Incorrect version of %s: %s\n\n",
- b,c);
- flag_os_bad = 1;
- return 0;
- } else if (c[2] >= '4') {
- /* AIX 4.4 and later */
- if (flag_debug) printf("DEBUG : %s is version 4.4 or later (%s)\n",
- b,c);
- return 0;
- } else if (c[2] != '3') {
- /* AIX 4.2 and earlier */
- printf("ERROR : Incorrect version of %s: %s\n\n",
- b,c);
- flag_os_bad = 1;
- return 0;
- }
-
- /* It's 4.3.x.x */
-
- e = strchr(c+4,'.');
- if (e != NULL) {
- *e = '\0';
- e++;
- d4 = atoi(e);
- } else {
- d4 = 0;
- }
-
- d3 = atoi(c+4);
-
- if (d3 > 4) {
- if (flag_debug) printf("DEBUG : %s is version 4.3.4 or later (%s)\n",
- b,c);
- return 0;
- } else if (d3 < 3) {
- printf("ERROR : Incorrect version of %s: %s.%d; must be 4.3.3.1 or later\n\n",
- b,c,d4);
- flag_os_bad = 1;
- return 0;
- }
- if (d4 >= 27) {
- if (flag_debug) printf("DEBUG : %s is version 4.3.3.27 or later (%s.%d)\n",
- b,c,d4);
- } else if (d4 > 0) {
- if (flag_debug) printf("ERROR : Incorrect version of %s: %s.%d; must be 4.3.3.27 or later\n\n",
- b,c,d4);
- } else { /* d4 = 0 */
- printf("ERROR : Incorrect version of %s: %s.%d; must be 4.3.3.1 or later\n\n",
- b,c,d4);
- flag_os_bad = 1;
- }
-
- return 0;
-}
-
-struct iii_pio_parsetab ptb_aixpatch[] = {
- {"bos", aix_check_patch_bos}
-};
-
-static void aix_check_patches(void)
-{
- if (flag_debug) printf("DEBUG : %s\n",AIX_CHECK_PATCH_CMD);
-
- if (iii_pio_procparse(AIX_CHECK_PATCH_CMD,
- III_PIO_SZ(ptb_aixpatch),
- ptb_aixpatch) == -1) {
- perror(AIX_CHECK_PATCH_CMD);
- }
-
- if (flag_os_bad) {
- printf("NOTICE : AIX APARs and fixes can be obtained from\n"
- " http://service.software.ibm.com/cgi-bin/support/rs6000.support/downloads or \n");
- printf(" http://techsupport.services.ibm.com/rs6k/ml.fixes.html\n\n");
- }
-}
-
-static void idds_aix_pio_get_oslevel(char *osl)
-{
- FILE *fp;
- char *rp;
- char rls[128];
- int i;
- int rm = 0;
-
- osl[0] = '\0';
-
- fp = popen("/usr/bin/oslevel","r");
-
- if (fp == NULL) {
- perror("/usr/bin/oslevel");
- return;
- }
-
- if (fgets(osl,128,fp) == NULL) {
- pclose(fp);
- return;
- }
- pclose(fp);
-
- rp = strchr(osl,'\n');
- if (rp) *rp = '\0';
-
- i = 0;
- for (rp = osl;*rp;rp++) {
- if (*rp != '.') {
- rls[i] = *rp;
- i++;
- }
- }
- rls[i] = '\0';
- /* rls now contains a value such as 4330 */
-
- for (i = 1;i<99;i++) {
- char rmtest[128];
- char ifout[BUFSIZ];
-
- sprintf(rmtest,"name=%s-%02d_AIX_ML",rls,i);
-
- if (idds_aix_odm_get_fix(rmtest) == 0) break;
- rm = i;
- }
-
- rp = osl + strlen(osl);
- sprintf(rp,".%02d",rm);
-
-}
-
-#endif
-
#if defined(__sun)
static void ids_get_platform_solaris(char *buf)
@@ -857,35 +553,6 @@ void sun_check_mu(void)
}
switch(solaris_version) {
- case 26:
- if (strcmp(solaris_release_string,"s297s_smccServer_37cshwp") == 0) {
- printf("NOTICE : This machine appears to be running Solaris 2.6 FCS. Solaris 2.6\nMaintenance Update 2 has been released subsequent to this.\n\n");
- } else if (strcmp(solaris_release_string,"s297s_hw2smccDesktop_09") == 0) {
- printf("NOTICE : This machine appears to be running Solaris 2.6 3/98. Solaris 2.6\nMaintenance Update 2 has been released subsequent to this.\n\n");
- } else if (strcmp(solaris_release_string,"s297s_hw3smccDesktop_09") == 0) {
- if (flag_debug) printf("DEBUG : Solaris 2.6 5/98\n");
- } else if (strcmp(solaris_release_string,"s297s_smccServer_37cshwp") == 0) {
- if (flag_debug) printf("DEBUG : Solaris 2.6 MU2\n");
- } else {
- if (flag_debug) printf("DEBUG : Solaris 2.6 Unrecognized\n");
- }
- break;
- case 27:
- if (strcmp(solaris_release_string,"s998s_SunServer_21al2b") == 0) {
- /* FCS */
- printf("NOTICE : This machine appears to be running Solaris 7 FCS. Solaris 7 11/99\nhas been released subsequent to this.\n\n");
- } else if (strcmp(solaris_release_string,"s998s_u1SunServer_10") == 0) {
- printf("NOTICE : This machine appears to be running Solaris 7 3/99. Solaris 7 11/99\nhas been released subsequent to this.\n\n");
- } else if (strcmp(solaris_release_string,"s998s_u2SunServer_09") == 0) {
- printf("NOTICE : This machine appears to be running Solaris 7 5/99. Solaris 7 11/99\nhas been released subsequent to this.\n\n");
- } else if (strcmp(solaris_release_string,"s998s_u3SunServer_11") == 0) {
- printf("NOTICE : This machine appears to be running Solaris 7 8/99. Solaris 7 11/99\nhas been released subsequent to this.\n\n");
- } else if (strcmp(solaris_release_string,"s998s_u4SunServer_10") == 0) {
- if (flag_debug) printf("DEBUG : 11/99\n");
- } else {
- if (flag_debug) printf("DEBUG : Solaris 7 Unrecognized\n");
- }
- break;
case 28:
if (strcmp(solaris_release_string,"s28_27b") == 0) {
printf("ERROR : This machine appears to be running Solaris 8 Beta.\n\n");
@@ -1163,129 +830,9 @@ done:
#endif /* IDDS_LINUX_INCLUDE */
-
-#if defined(__osf__)
-
-#ifndef SLS_BUFSIZ
-#define SLS_BUFSIZ 8192
-#endif
-
-static void ids_get_platform_tru64(char *buf)
-{
- struct utsname u;
- int r,start = 0;
- unsigned long pt;
- struct cpu_info cpu_info;
- char platname[SLS_BUFSIZ];
- char *sp;
-
- r = getsysinfo(GSI_CPU_INFO,(caddr_t)&cpu_info,sizeof(struct cpu_info),&start,NULL);
-
- start = 0;
-
- r = getsysinfo(GSI_PLATFORM_NAME,(caddr_t)&platname[0],SLS_BUFSIZ,&start,NULL);
-
- start = 0;
-
- r = getsysinfo(GSI_PROC_TYPE,(caddr_t)&pt,sizeof(long),&start,NULL);
-
- switch(pt & 0xff) {
- default:
- sprintf(buf,"alpha-");
- break;
- case EV4_CPU:
- sprintf(buf,"alpha_ev4_21064_%dMhz-",cpu_info.mhz);
- break;
- case EV45_CPU:
- sprintf(buf,"alpha_ev4.5_21064_%dMhz-",cpu_info.mhz);
- break;
- case EV5_CPU:
- sprintf(buf,"alpha_ev5_21164_%dMHz-",cpu_info.mhz);
- break;
- case EV56_CPU:
- sprintf(buf,"alpha_ev5.6_21164A_%dMHz-",cpu_info.mhz);
- break;
- case EV6_CPU:
- sprintf(buf,"alpha_ev6_21264_%dMHz-",cpu_info.mhz);
- break;
- }
-
- sp = buf+strlen(buf);
-
- for (r = 0; platname[r] != '\0';r++) {
- if (platname[r] == ' ' || platname[r] == '-') {
- *sp = '_';
- sp++;
- } else {
- *sp = platname[r];
- sp++;
- }
- }
-
- sprintf(sp,"-tru64_");
-
- if (uname(&u) == 0) {
- strcat(buf,u.release);
- strcat(buf,"_");
- strcat(buf,u.version);
- }
-
- /* XXX GSI_LMF see sys/lmf.h and sys/lmfklic.h */
-}
-
-/* returns number of k in swap area */
-static int idds_osf_get_swapk (void)
-{
- int src,i;
- struct swaptable *swtab;
- int res = 0;
-
- src = swapctl(SC_GETNSWP,NULL);
- if (src < 1) {
- return 0;
- }
-
- swtab = calloc(1,sizeof(int) + ((src+1) * sizeof(struct swapent)));
- swtab->swt_n = src;
- for (i = 0; i < src; i++) {
- swtab->swt_ent[i].ste_path = calloc(1024,sizeof(char));
- }
-
- if (swapctl(SC_LIST,swtab) < 0) {
- res = 0;
- } else {
- for (i = 0; i< src; i++) {
- if (swtab->swt_ent[i].ste_flags & ST_INDEL) continue;
- res += (swtab->swt_ent[i].ste_length / 2);
- }
- }
-
- for (i = 0; i < src; i++) {
- free(swtab->swt_ent[i].ste_path);
- }
- free(swtab);
- return res;
-}
-
-
-int idds_osf_get_memk(void)
-{
- int start = 0, physmem = 0,r;
- r = getsysinfo(GSI_PHYSMEM,(caddr_t)&physmem,sizeof(physmem),&start,NULL);
- if (r == -1) {
- return 0;
- }
- return physmem;
-}
-
-#endif
-
static void gen_tests (void)
{
-#ifndef _WIN32
uid_t uid;
-#endif
-
if (flag_html) printf("<P>\n");
@@ -1380,10 +927,6 @@ static void gen_tests (void)
linux_check_release();
#endif
-#if defined(_AIX)
- aix_check_patches();
-#endif
-
if (access("/usr/sbin/prtconf",X_OK) == 0) {
if (flag_debug) printf("DEBUG : /usr/sbin/prtconf\n");
@@ -1394,37 +937,6 @@ if (access("/usr/sbin/prtconf",X_OK) == 0) {
}
-#if defined(__osf__)
- phys_mb = (idds_osf_get_memk())/1024;
-#else
-#if defined(_AIX)
- if (1) {
- char buf[BUFSIZ];
- unsigned long l;
-
- idds_aix_odm_get_cuat("attribute=realmem",buf);
-
- if (buf) {
- phys_mb = atoi(buf);
- phys_mb = (phys_mb /1024) * (PAGESIZE / 1024);
- }
-
- l = psdanger(0);
- swap_mb = PAGESIZE/1024;
- swap_mb = swap_mb * (l / 1024);
- }
-#else
-#if defined(_SC_PHYS_PAGES)
- if (1) {
- int pk,l;
-
- pk = sysconf(_SC_PAGESIZE);
- pk /= 1024;
- l = sysconf(_SC_PHYS_PAGES);
- if (l < 0) l = 0;
- phys_mb = (l * pk) / 1024;
- }
-#else
#if defined(__hpux)
hp_check_qpk();
if (pstat_getdynamic(&pst_dyn,sizeof(pst_dyn),1,0) == -1 ||
@@ -1460,9 +972,6 @@ if (access("/usr/sbin/prtconf",X_OK) == 0) {
/* swap_mb from vm.stats.vm.v_page_count * v_page_size / 1048576 */
#endif
#endif
-#endif
-#endif
-#endif
if (flag_html) printf("<P>\n");
@@ -1481,7 +990,6 @@ if (access("/usr/sbin/prtconf",X_OK) == 0) {
if (flag_html) printf("</P>\n");
-#if !defined(_WIN32)
if (access("/usr/sbin/swap",X_OK) == 0) {
if (flag_debug) printf("DEBUG : /usr/sbin/swap -s\n");
if (iii_pio_procparse("/usr/sbin/swap -s",
@@ -1490,11 +998,7 @@ if (access("/usr/sbin/prtconf",X_OK) == 0) {
perror("/usr/sbin/swap -s");
}
}
-#endif
-#if defined(__osf__)
- swap_mb = (idds_osf_get_swapk()) / 1024;
-#else
#if defined(IDDS_LINUX_INCLUDE)
if (1) {
struct sysinfo linux_si;
@@ -1504,7 +1008,6 @@ if (access("/usr/sbin/prtconf",X_OK) == 0) {
}
}
#endif
-#endif
if (client == 0 && swap_mb < 0) {
if (flag_html) printf("<P>\n");
@@ -1513,7 +1016,7 @@ if (access("/usr/sbin/prtconf",X_OK) == 0) {
if (flag_html) printf("</P>\n");
} else if (client == 0 && swap_mb && swap_mb < phys_mb) {
-#if defined(_AIX) || defined(__hpux) || defined(__sun)
+#if defined(__hpux) || defined(__sun)
#else
if (flag_html) printf("<P>\n");
printf("%s: There is %dMB of physical memory but only %dMB of swap space.\n\n",
@@ -1565,7 +1068,7 @@ if (access("/usr/sbin/prtconf",X_OK) == 0) {
-#if defined(__sun) || defined(__hpux) || defined(IDDS_BSD_SYSCTL) || defined(IDDS_LINUX_SYSCTL)
+#if defined(__sun) || defined(__hpux) || defined(IDDS_LINUX_SYSCTL)
static int ndd_get_tcp (char *a,long *vPtr)
{
@@ -1577,7 +1080,7 @@ static int ndd_get_tcp (char *a,long *vPtr)
#if defined(__hpux)
sprintf(buf,"/usr/bin/ndd /dev/tcp %s",a);
#else
-#if defined(IDDS_BSD_SYSCTL) || defined(IDDS_LINUX_SYSCTL)
+#if defined(IDDS_LINUX_SYSCTL)
sprintf(buf,"/sbin/sysctl -n %s",a);
#else
sprintf(buf,"ndd /dev/tcp %s",a);
@@ -1620,203 +1123,6 @@ static int patch_get_ver(int n)
}
#endif
-#if defined(__osf__)
-
-int tru64_check_tcbhashsize(char *a,char *b)
-{
- int i;
-
- if (strcmp(b,"unknown attribute") == 0) {
- printf("WARNING: TCP tuning parameters are missing.\n\n");
- flag_warnings++;
- return 0;
- }
- i = atoi(b);
-
- if (i < 32) {
- printf("WARNING: The inet tuning parameter tcbhashsize is set too low (%d),\nand should be raised to between 512 and 1024.\n\n",i);
- flag_tru64_tuning_needed = 1;
- flag_warnings++;
- } else if (i < 512) {
- printf("NOTICE : The inet tuning parameter tcbhashsize is set too low (%d),\nand should be raised to between 512 and 1024.\n\n",i);
- flag_tru64_tuning_needed = 1;
- } else {
- if (flag_debug) printf("DEBUG : tcbhashsize %d\n",i);
- }
-
- return 0;
-}
-
-int tru64_check_present_smp(char *a,char *b)
-{
- if (strcmp(b,"unknown attribute") == 0) {
- printf("WARNING: If this is a multiprocessor system, additional tuning patches need\nto be installed, as sysconfig -q inet tuning parameter %s is missing.\n",
- a);
- printf("NOTICE : If this is a uniprocessor system, the above warning can be ignored.\n\n");
- flag_warnings++;
- } else {
- if (flag_debug) printf("DEBUG : %s %s\n", a, b);
- }
-
- return 0;
-}
-
-int tru64_check_msl(char *a,char *b)
-{
- int i;
-
- if (strcmp(b,"unknown attribute") == 0) {
- printf("WARNING: TCP tuning parameters are missing.\n\n");
- flag_warnings++;
- return 0;
- }
- i = atoi(b);
-
- if (i >= 60) {
- printf("NOTICE : If running in a LAN or private network, the inet tcp_msl value can be\nreduced from %d (%d seconds) to increase performance.\n\n",
- i, i/2);
- flag_tru64_tuning_needed = 1;
- }
-
- return 0;
-}
-
-int tru64_check_present_client(char *a,char *b)
-{
- if (strcmp(b,"unknown attribute") == 0) {
- printf("ERROR : This system is lacking necessary tuning patches. Upgrade to 4.0E\nor later is required.\n\n");
- flag_os_bad = 1;
- } else {
- if (flag_debug) {
- printf("DEBUG : %s %s\n",a,b);
- }
- }
-
- return 0;
-}
-
-int tru64_check_conn(char *a,char *b)
-{
- int i;
-
- i = atoi(b);
-
- if (strcmp(a,"somaxconn") == 0 && i && i < 32767) {
- printf("NOTICE : Increasing the socket tuning parameter somaxconn from %d to 65500\n is recommended.\n\n",i);
- flag_tru64_tuning_needed = 1;
- }
-
- if (flag_debug) printf("DEBUG : %s %s\n",a,b);
-
- return 0;
-}
-
-int tru64_check_threads(char *a,char *b)
-{
- int i;
-
- i = atoi(b);
-
- if (i < 512) {
- printf("WARNING: The proc tuning parameter max-threads-per-user should be raised from\n%d to at least 512.\n\n",i);
- flag_tru64_tuning_needed = 1;
- flag_warnings++;
- } else {
- if (flag_debug) printf("DEBUG : %s %s\n",a,b);
- }
-
- return 0;
-}
-
-struct iii_pio_parsetab ptb_sysconfig_inet[] = {
- {"tcbhashsize ",tru64_check_tcbhashsize},
- {"tcbhashnum ",tru64_check_present_smp},
- {"ipqs ",tru64_check_present_smp},
- {"tcp_msl ",tru64_check_msl},
- {"ipport_userreserved_min ",tru64_check_present_client}
-};
-
-struct iii_pio_parsetab ptb_sysconfig_socket[] = {
- {"sominconn ",tru64_check_conn},
- {"somaxconn ",tru64_check_conn}
-};
-
-struct iii_pio_parsetab ptb_sysconfig_proc[] = {
- {"max-threads-per-user ",tru64_check_threads}
-};
-
-static void sysconfig_tests (void)
-{
- struct utsname u;
-
- if (uname(&u) == 0) {
- if ((u.release[0] == 'T' || u.release[0] == 'V') && u.release[1] == '5') {
- if (flag_debug) printf("DEBUG : Tru64 UNIX %s %s\n",
- u.release,u.version);
- } else if (strcmp(u.release,"V4.0") == 0) {
- int iv;
-
- /* Digital UNIX 4.x */
- iv = atoi(u.version);
-
- if (iv < 564) {
- printf("ERROR : Digital UNIX versions prior to 4.0D are not supported as they lack\nnecessary kernel tuning parameters. Upgrade to 4.0E or later.\n\n");
- flag_tru64_40b = 1;
- flag_os_bad = 1;
- } else if (iv < 878) {
- printf("WARNING: Tru64 UNIX versions prior to 4.0D require a patch to provide \noptimal Internet performance.\n\n");
- flag_tru64_40b = 1;
- flag_warnings++;
- } else {
- if (flag_debug) printf("DEBUG : Digital UNIX %s %s\n",
- u.release,u.version);
- }
-
- } else if (u.release[0] == 'V' && u.release[1] == '3') {
- printf("ERROR : Digital UNIX versions prior to 4.0D are not supported as they lack\nnecessary kernel tuning parameters. Upgrade to 4.0E or later.\n\n");
- flag_os_bad = 1;
-
- } else {
- printf("%s: Tru64 UNIX release %s is not recognized.\n",
- "NOTICE ", u.release);
- }
- }
-
- /* inet subsystem raise tcbhashsize from 32/512 to 1024 */
- /* inet subsystem raise tcbhashnum to 16 if multiprocessor, also ipqs
- * not on 4.0D */
- /* inet subsystem lower tcp_msl from 60 (30 secs) if on LAN */
- /* client: inet subsystem raise ipport_userreserved_min from 5000 to 65000
- * requires E or later */
- if (iii_pio_procparse("/sbin/sysconfig -q inet",
- III_PIO_SZ(ptb_sysconfig_inet),
- ptb_sysconfig_inet) == -1) {
- perror("/sbin/sysconfig");
- }
-
- /* socket raise sominconn to 65535 */
- /* socket subsystem raise somaxconn from 1024 to 32767 */
- if (iii_pio_procparse("/sbin/sysconfig -q socket",
- III_PIO_SZ(ptb_sysconfig_socket),
- ptb_sysconfig_socket) == -1) {
- perror("/sbin/sysconfig");
- }
-
-
- /* proc max-threads-per-user from 256 to 512 or 4096 */
- if (iii_pio_procparse("/sbin/sysconfig -q proc",
- III_PIO_SZ(ptb_sysconfig_proc),
- ptb_sysconfig_proc) == -1) {
- perror("/sbin/sysconfig");
- }
-
- if (1) {
- printf("NOTICE : More information on tuning is available on the web from Compaq at\nhttp://www.unix.digital.com/internet/tuning.htm\n\n");
- printf("NOTICE : Additional performance recommendations can be obtained from the\nsys_check kit from Compaq, located at the following web site:\nftp://ftp.digital.com/pub/DEC/IAS/sys_check/sys_check.html\n\n");
- }
-}
-#endif
-
#if defined(__hpux)
#include <dirent.h>
@@ -2076,7 +1382,7 @@ static void sun_check_network_device(void)
}
#endif
-#if defined(__sun) || defined(__hpux) || defined(IDDS_BSD_SYSCTL) || defined(IDDS_LINUX_SYSCTL)
+#if defined(__sun) || defined(__hpux)|| defined(IDDS_LINUX_SYSCTL)
static void ndd_tests (void)
{
@@ -2621,10 +1927,6 @@ static int get_disk_avail(char *dir)
if (statfs(dir,&sfs) == 0) {
return ((sfs.f_bfree * (sfs.f_bsize / 1024)) / 1024);
}
-#else
-#if defined(_WIN32)
- /* could use GetDiskFreeSpaceEx */
-#endif
#endif
#endif
#endif
@@ -2847,15 +2149,11 @@ static void disk_tests(void)
}
if (install_dir[0] == '\0') {
-#if defined(_WIN32)
- /* TBD */
-#else
if (access("/usr/" VENDOR,X_OK) == 0) {
sprintf(install_dir,"/usr/" VENDOR);
} else {
sprintf(install_dir,"/opt");
}
-#endif
}
if (check_fs_options(install_dir,mntbuf) == 0) {
@@ -3042,10 +2340,10 @@ static void limits_tests(void)
static void ids_get_platform(char *buf)
{
-#if defined(IDDS_LINUX_INCLUDE) || defined(__osf__) || defined(_AIX) || defined(__hpux) || defined(IDDS_BSD_INCLUDE)
+#if defined(IDDS_LINUX_INCLUDE) || defined(__osf__) || defined(__hpux) || defined(IDDS_BSD_INCLUDE)
struct utsname u;
#endif
-#if defined(__hpux) || defined(_AIX)
+#if defined(__hpux)
char model[128];
char procstr[128];
char oslevel[128];
@@ -3067,42 +2365,11 @@ static void ids_get_platform(char *buf)
#else
#if defined(__sun)
ids_get_platform_solaris(buf);
-#else
-#if defined(_AIX)
-
- if (getenv("ODMPATH") == NULL) {
- putenv("ODMPATH=/usr/lib/objrepos:/etc/objrepos");
- }
-
- /* i386, powerpc, rs6000 */
- idds_aix_odm_get_cuat("name=proc0",procstr);
- idds_aix_odm_get_cuat("attribute=modelname",model);
- oslevel[0] = '\0';
- idds_aix_pio_get_oslevel(oslevel);
-
- if (uname(&u) == 0) {
- if (oslevel[0]) {
- sprintf(buf,"%s-%s-%s%s",
- procstr[0] ? procstr : "unknown" ,
- model[0] ? model : "ibm",
- u.sysname,oslevel);
-
- } else {
- sprintf(buf,"%s-%s-%s%s.%s",
- procstr[0] ? procstr : "unknown" ,
- model[0] ? model : "ibm",
- u.sysname,u.version,u.release);
- }
- } else {
- sprintf(buf,"%s-unknown-aix", procstr[0] ? procstr : "unknown");
- }
-#else
-#if defined(IDDS_BSD_INCLUDE)
+#elif defined(IDDS_BSD_INCLUDE)
uname(&u);
sprintf(buf,"%s-unknown-%s%s",
u.machine,u.sysname,u.release);
-#else
-#if defined(__hpux)
+#elif defined(__hpux)
uname(&u);
confstr(_CS_MACHINE_MODEL,model,128);
cpuvers = sysconf(_SC_CPU_VERSION);
@@ -3179,40 +2446,14 @@ static void ids_get_platform(char *buf)
#endif /* VMS */
#endif /* HPUX */
#endif /* FREEBSD */
-#endif /* AIX */
-#endif /* SUN */
-#endif /* LINUX */
}
static int count_processors(void)
{
int nproc = 0;
-#if defined(_SC_NPROCESSORS_ONLN) && !defined(__osf__)
nproc = sysconf(_SC_NPROCESSORS_ONLN);
-#endif
-
-#if defined(_WIN32)
- SYSTEM_INFO sysinfo;
- GetSystemInfo(&sysinfo);
- nproc = sysinfo.dwNumberOfProcessors;
-#endif
-
-#if defined(IDDS_BSD_SYSCTL) && defined(__FreeBSD__)
- int fblen = sizeof(int);
- int tmp;
- sysctlbyname("hw.ncpu",&nproc,&fblen,NULL,0);
-#endif
-
-#if defined(__osf__)
- struct cpu_info cpu_info;
- int start = 0;
-
- cpu_info.cpus_in_box = 0;
- getsysinfo(GSI_CPU_INFO,(caddr_t)&cpu_info,sizeof(struct cpu_info),&start,NULL);
- nproc = cpu_info.cpus_in_box;
-#endif
return nproc;
}
@@ -3268,15 +2509,6 @@ int main(int argc,char *argv[])
}
}
-#if defined(_AIX)
- if (1) {
- char *s = getenv("ODMPATH");
- if (s == NULL) {
- putenv("ODMPATH=/usr/lib/objrepos:/etc/objrepos");
- }
- }
-#endif
-
if (flag_quick == 0) {
char sysbuf[BUFSIZ];
int nproc;
@@ -3296,7 +2528,7 @@ int main(int argc,char *argv[])
gen_tests();
-#if defined(__sun) || defined(__hpux) || defined(IDDS_BSD_SYSCTL) || defined(IDDS_LINUX_SYSCTL)
+#if defined(__sun) || defined(__hpux) || defined(IDDS_LINUX_SYSCTL)
ndd_tests();
#endif
@@ -3304,10 +2536,6 @@ int main(int argc,char *argv[])
hp_pthreads_tests();
#endif
-#if defined(__osf__)
- sysconfig_tests();
-#endif
-
limits_tests();
disk_tests();
diff --git a/ldap/systools/viewcore.c b/ldap/systools/viewcore.c
index 45e4cce..6764a94 100644
--- a/ldap/systools/viewcore.c
+++ b/ldap/systools/viewcore.c
@@ -50,11 +50,9 @@
#if defined(__osf__)
#include <elf_abi.h>
#else
-#ifndef _AIX
#include <libelf.h>
#endif
#endif
-#endif
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
@@ -62,7 +60,7 @@
#if defined(sparc) || defined(__sparc)
#include <sys/elf_SPARC.h>
#else
-#if !defined(linux) && !defined(_AIX) && !defined(__osf__)
+#if !defined(linux) && !defined(__osf__)
#include <sys/elf_386.h>
#endif
#endif
@@ -245,7 +243,7 @@ int seek_debug(char *erf,int start, int mx)
return 0;
}
-#if !defined(_AIX) && !defined(__osf__)
+#if !defined(__osf__)
void add_segment(Elf32_Phdr *phdr,char *base,int which)
{
int i;
@@ -353,7 +351,7 @@ void try_adb(char *pf,char *cf)
void
main(int argc, char ** argv)
{
-#if !defined(_AIX) && !defined(__osf__)
+#if !defined(__osf__)
Elf32_Ehdr * ehdr;
Elf32_Phdr * phdr;
Elf * elf;
diff --git a/lib/base/dnsdmain.cpp b/lib/base/dnsdmain.cpp
index 7430077..9d184c5 100644
--- a/lib/base/dnsdmain.cpp
+++ b/lib/base/dnsdmain.cpp
@@ -69,13 +69,11 @@ extern int getdomainname(char *, size_t);
#else
extern int getdomainname(char *, int);
#endif /* Linux */
-#if defined(HPUX) || defined (UnixWare) || defined(Linux) || defined(IRIX6_5) || defined(SOLARIS_GCC)
+#if defined(HPUX) || defined(Linux) || defined(SOLARIS_GCC)
extern int gethostname (char *name, size_t namelen);
#else
-#ifndef AIX
extern int gethostname (char *name, int namelen);
#endif
-#endif
NSPR_END_EXTERN_C
diff --git a/lib/base/file.cpp b/lib/base/file.cpp
index b3f7234..62a8a06 100644
--- a/lib/base/file.cpp
+++ b/lib/base/file.cpp
@@ -140,12 +140,7 @@ NSAPI_PUBLIC int system_nocoredumps(void)
rl.rlim_max = 0;
return setrlimit(RLIMIT_CORE, &rl);
#else
-#if defined(SNI)
-/* C++ compiler seems to find more that one overloaded instance of exit() ?! */
-#define EXITFUNC ::exit
-#else
#define EXITFUNC exit
-#endif
signal(SIGQUIT, EXITFUNC);
signal(SIGILL, EXITFUNC);
signal(SIGTRAP, EXITFUNC);
@@ -248,9 +243,9 @@ NSAPI_PUBLIC int file_notfound(void)
return (errno == ENOENT);
}
-#if !defined(SNI) && !defined(LINUX)
+#if !defined(LINUX)
extern char *sys_errlist[];
-#endif /* SNI */
+#endif
#define ERRMSG_SIZE 35
#ifdef THREAD_ANY
@@ -303,14 +298,6 @@ NSAPI_PUBLIC int system_errmsg_fn(char **buff, size_t maxlen)
lmsg = static_error;
}
} else {
-/* replaced
-#if defined(SNI) || defined(LINUX)
- / C++ platform has no definition for sys_errlist /
- lmsg = strerror(errno);
-#else
- lmsg = sys_errlist[errno];
-#endif
-with lmsg =strerror(errno);*/
lmsg=strerror(errno);
errno = 0;
}
diff --git a/lib/base/systhr.cpp b/lib/base/systhr.cpp
index 6bf64bd..10e1caa 100644
--- a/lib/base/systhr.cpp
+++ b/lib/base/systhr.cpp
@@ -86,13 +86,9 @@ void systhread_set_default_stacksize(unsigned long size)
NSPR_BEGIN_EXTERN_C
NSAPI_PUBLIC SYS_THREAD
-#ifdef UnixWare /* for ANSI C++ standard, see base/systrh.h */
-systhread_start(int prio, int stksz, ArgFn_systhread_start fn, void *arg)
-#else
systhread_start(int prio, int stksz, void (*fn)(void *), void *arg)
-#endif
{
-#if (defined(Linux) || defined(SNI) || defined(UnixWare)) && !defined(USE_PTHREADS)
+#if defined(Linux) && !defined(USE_PTHREADS)
prio /= 8; /* quick and dirty fix for user thread priority scale problem */
if (prio > 3) prio = 3;
#endif
diff --git a/lib/ldaputil/examples/Certmap.mak b/lib/ldaputil/examples/Certmap.mak
deleted file mode 100644
index 03139cc..0000000
--- a/lib/ldaputil/examples/Certmap.mak
+++ /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
-#
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-!IF "$(CFG)" == ""
-CFG=Certmap - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Certmap - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "Certmap - Win32 Release" && "$(CFG)" !=\
- "Certmap - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Certmap.mak" CFG="Certmap - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Certmap - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Certmap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "Certmap - Win32 Debug"
-CPP=cl.exe
-RSC=rc.exe
-MTL=mktyplib.exe
-
-!IF "$(CFG)" == "Certmap - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : "$(OUTDIR)\Certmap.dll"
-
-CLEAN :
- - at erase "$(INTDIR)\init.obj"
- - at erase "$(INTDIR)\plugin.obj"
- - at erase "$(OUTDIR)\Certmap.dll"
- - at erase "$(OUTDIR)\Certmap.exp"
- - at erase "$(OUTDIR)\Certmap.lib"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\$(VENDOR)\servers\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "c:\$(VENDOR)\servers\include" /D "WIN32"\
- /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX /Fo"$(INTDIR)/" /c
-CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/Certmap.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)/Certmap.pdb" /machine:I386 /out:"$(OUTDIR)/Certmap.dll"\
- /implib:"$(OUTDIR)/Certmap.lib"
-LINK32_OBJS= \
- "$(INTDIR)\init.obj" \
- "$(INTDIR)\plugin.obj" \
- "C:\$(VENDOR)\servers\lib\nsldap32v10.lib"
-
-"$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "Certmap - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-ALL : "$(OUTDIR)\Certmap.dll"
-
-CLEAN :
- - at erase "$(INTDIR)\init.obj"
- - at erase "$(INTDIR)\plugin.obj"
- - at erase "$(INTDIR)\vc40.idb"
- - at erase "$(INTDIR)\vc40.pdb"
- - at erase "$(OUTDIR)\Certmap.dll"
- - at erase "$(OUTDIR)\Certmap.exp"
- - at erase "$(OUTDIR)\Certmap.ilk"
- - at erase "$(OUTDIR)\Certmap.lib"
- - at erase "$(OUTDIR)\Certmap.pdb"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\$(VENDOR)\servers\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\$(VENDOR)\servers\include" /D\
- "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX\
- /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/Certmap.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes\
- /pdb:"$(OUTDIR)/Certmap.pdb" /debug /machine:I386 /out:"$(OUTDIR)/Certmap.dll"\
- /implib:"$(OUTDIR)/Certmap.lib"
-LINK32_OBJS= \
- "$(INTDIR)\init.obj" \
- "$(INTDIR)\plugin.obj" \
- "C:\$(VENDOR)\servers\lib\nsldap32v10.lib"
-
-"$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-.c{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
-
-.cpp{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
-
-.cxx{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
-
-.c{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
-
-.cpp{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
-
-.cxx{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
-
-################################################################################
-# Begin Target
-
-# Name "Certmap - Win32 Release"
-# Name "Certmap - Win32 Debug"
-
-!IF "$(CFG)" == "Certmap - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Certmap - Win32 Debug"
-
-!ENDIF
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\plugin.c
-DEP_CPP_PLUGI=\
- ".\plugin.h"\
- "c:\$(VENDOR)\servers\include\certmap.h"\
- "c:\$(VENDOR)\servers\include\lber.h"\
- "c:\$(VENDOR)\servers\include\ldap.h"\
- {$(INCLUDE)}"\sys\types.h"\
-
-
-"$(INTDIR)\plugin.obj" : $(SOURCE) $(DEP_CPP_PLUGI) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\init.c
-DEP_CPP_INIT_=\
- ".\plugin.h"\
- "c:\$(VENDOR)\servers\include\certmap.h"\
- "c:\$(VENDOR)\servers\include\lber.h"\
- "c:\$(VENDOR)\servers\include\ldap.h"\
- {$(INCLUDE)}"\sys\types.h"\
-
-
-"$(INTDIR)\init.obj" : $(SOURCE) $(DEP_CPP_INIT_) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=C:\$(VENDOR)\servers\lib\nsldap32v10.lib
-
-!IF "$(CFG)" == "Certmap - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Certmap - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
-################################################################################
diff --git a/lib/ldaputil/examples/Makefile b/lib/ldaputil/examples/Makefile
index 7cb7d21..64b327c 100644
--- a/lib/ldaputil/examples/Makefile
+++ b/lib/ldaputil/examples/Makefile
@@ -75,11 +75,6 @@ CC_CMD = cc -DSOLARIS -D_REENTRANT
LD_SHAREDCMD = ld -G
endif
-ifeq ($(ARCH), IRIX)
-CC_CMD = cc
-LD_SHAREDCMD = ld -32 -shared
-endif
-
ifeq ($(ARCH), HPUX)
BIN = certmap.sl
else
diff --git a/lib/ldaputil/examples/init.c b/lib/ldaputil/examples/init.c
index d58c70a..10e99aa 100644
--- a/lib/ldaputil/examples/init.c
+++ b/lib/ldaputil/examples/init.c
@@ -44,7 +44,6 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-
#include "certmap.h" /* Public Certmap API */
#include "plugin.h" /* must define extern "C" functions */
@@ -57,11 +56,7 @@ NSAPI_PUBLIC int plugin_init_fn (void *certmap_info, const char *issuerName,
/* Make sure CertmapDLLInit is initialized only once */
if (!initialized) {
-#ifdef WIN32
- CertmapDLLInit(rv, libname);
-
- if (rv != LDAPU_SUCCESS) return rv;
-#endif
+
initialized = 1;
}
diff --git a/lib/ldaputil/examples/plugin.c b/lib/ldaputil/examples/plugin.c
index 21ea9d1..9646bdd 100644
--- a/lib/ldaputil/examples/plugin.c
+++ b/lib/ldaputil/examples/plugin.c
@@ -44,13 +44,9 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-
#include "certmap.h" /* Public Certmap API */
#include "plugin.h" /* must define extern "C" functions */
-#ifdef WIN32
-CertmapDLLInitFnTbl /* Initialize Certmap Function Table */
-#endif
CertSearchFn_t default_searchfn = 0;
diff --git a/lib/libaccess/symbols.cpp b/lib/libaccess/symbols.cpp
index a1cba9d..d98d596 100644
--- a/lib/libaccess/symbols.cpp
+++ b/lib/libaccess/symbols.cpp
@@ -249,11 +249,7 @@ void symTableRemoveSym(void * table, Symbol_t * sym)
*/
void symTableEnumerate(void * table, void * argp,
-#ifdef UnixWare /* Fix bug in UnixWare compiler for name mangeling - nedh at sco.com */
- ArgFn_symTableEnum func)
-#else
int (*func)(Symbol_t * sym, void * parg))
-#endif
{
SymTable_t * st = (SymTable_t *)table;
SymTableEnum_t ste; /* enumeration arguments */
More information about the 389-commits
mailing list