Landed NSPRPUB_RELEASE_4_0_20000223 onto the main trunk.

26 files changed, 87 insertions, 2 deletions

diff --git a/pr/include/md/_aix.h b/pr/include/md/_aix.h
index a80ccb06..58f37d39 100644
--- a/pr/include/md/_aix.h
+++ b/pr/include/md/_aix.h
@@ -59,6 +59,7 @@
 #endif
 #define _PR_HAVE_SYSV_SEMAPHORES
 #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
+#define _PR_ACCEPT_INHERIT_NONBLOCK
 
 /* Timer operations */
 #if defined(AIX_TIMERS)
diff --git a/pr/include/md/_aix32.cfg b/pr/include/md/_aix32.cfg
index c1267e23..2fca5190 100644
--- a/pr/include/md/_aix32.cfg
+++ b/pr/include/md/_aix32.cfg
@@ -73,6 +73,8 @@
 #undef	HAVE_ALIGNED_DOUBLES
 #undef	HAVE_ALIGNED_LONGLONGS
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #ifndef NO_NSPR_10_SUPPORT
 
 #define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
diff --git a/pr/include/md/_aix32in6.cfg b/pr/include/md/_aix32in6.cfg
index bc9458c6..0385e86a 100644
--- a/pr/include/md/_aix32in6.cfg
+++ b/pr/include/md/_aix32in6.cfg
@@ -76,6 +76,7 @@
 #ifndef _PR_INET6
 #define _PR_INET6
 #endif
+#define PR_AF_INET6 24  /* same as AF_INET6 */
 
 #ifndef NO_NSPR_10_SUPPORT
 
diff --git a/pr/include/md/_aix64.cfg b/pr/include/md/_aix64.cfg
index b8e3e884..59bb1a79 100644
--- a/pr/include/md/_aix64.cfg
+++ b/pr/include/md/_aix64.cfg
@@ -77,6 +77,7 @@
 #ifndef _PR_INET6
 #define _PR_INET6
 #endif
+#define PR_AF_INET6 24  /* same as AF_INET6 */
 
 #ifndef NO_NSPR_10_SUPPORT
 
diff --git a/pr/include/md/_beos.h b/pr/include/md/_beos.h
index e98e8f36..8b56dec3 100644
--- a/pr/include/md/_beos.h
+++ b/pr/include/md/_beos.h
@@ -285,6 +285,7 @@ struct protoent* getprotobynumber(int number);
 #define _MD_CLOSE_DIR _MD_close_dir
 #define _MD_MAKE_NONBLOCK _MD_make_nonblock
 #define _MD_OPEN _MD_open
+#define _MD_OPEN_FILE _MD_open
 #define _MD_CLOSE_FILE _MD_close_file
 #define _MD_READ _MD_read
 #define _MD_WRITE _MD_write
@@ -301,6 +302,7 @@ struct protoent* getprotobynumber(int number);
 #define _MD_ACCESS _MD_access
 #define _MD_STAT stat
 #define _MD_MKDIR _MD_mkdir
+#define _MD_MAKE_DIR _MD_mkdir
 #define _MD_RMDIR _MD_rmdir
 #define _MD_PR_POLL _MD_pr_poll
 
diff --git a/pr/include/md/_hpux.h b/pr/include/md/_hpux.h
index 0d45f6c3..22c38c44 100644
--- a/pr/include/md/_hpux.h
+++ b/pr/include/md/_hpux.h
@@ -48,6 +48,7 @@
 #define _PR_STAT_HAS_ONLY_ST_ATIME
 #define _PR_HAVE_POSIX_SEMAPHORES
 #define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
+#define _PR_ACCEPT_INHERIT_NONBLOCK
 
 #undef _PR_HAVE_ATOMIC_OPS
 
diff --git a/pr/include/md/_hpux32.cfg b/pr/include/md/_hpux32.cfg
index 1afc14a4..85ff9476 100644
--- a/pr/include/md/_hpux32.cfg
+++ b/pr/include/md/_hpux32.cfg
@@ -30,6 +30,8 @@
 #undef  IS_LITTLE_ENDIAN
 #define IS_BIG_ENDIAN 1
 
+#define PR_AF_INET6 22  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_hpux64.cfg b/pr/include/md/_hpux64.cfg
index d2b626e2..3450f7fa 100644
--- a/pr/include/md/_hpux64.cfg
+++ b/pr/include/md/_hpux64.cfg
@@ -31,6 +31,8 @@
 #define IS_BIG_ENDIAN 1
 #define IS_64
 
+#define PR_AF_INET6 22  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_irix.h b/pr/include/md/_irix.h
index f5f20eb2..dea7f654 100644
--- a/pr/include/md/_irix.h
+++ b/pr/include/md/_irix.h
@@ -60,6 +60,7 @@
 #define HAVE_POINTER_LOCALTIME_R
 #define _PR_HAVE_POSIX_SEMAPHORES
 #define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
+#define _PR_ACCEPT_INHERIT_NONBLOCK
 
 /* Initialization entry points */
 NSPR_API(void) _MD_EarlyInit(void);
diff --git a/pr/include/md/_irix32.cfg b/pr/include/md/_irix32.cfg
index f791faf8..ee6fc686 100644
--- a/pr/include/md/_irix32.cfg
+++ b/pr/include/md/_irix32.cfg
@@ -34,6 +34,8 @@
 #undef  IS_LITTLE_ENDIAN
 #define IS_BIG_ENDIAN 1
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_irix64.cfg b/pr/include/md/_irix64.cfg
index 7e988172..ddc4305c 100644
--- a/pr/include/md/_irix64.cfg
+++ b/pr/include/md/_irix64.cfg
@@ -35,6 +35,8 @@
 #define IS_BIG_ENDIAN 1
 #define IS_64
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
index aa99901c..33fa2683 100644
--- a/pr/include/md/_linux.cfg
+++ b/pr/include/md/_linux.cfg
@@ -27,6 +27,8 @@
 #define LINUX
 #endif
 
+#define PR_AF_INET6 10  /* same as AF_INET6 */
+
 #ifdef __powerpc__
 
 #undef  IS_LITTLE_ENDIAN
diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
index 7980934c..11885b41 100644
--- a/pr/include/md/_linux.h
+++ b/pr/include/md/_linux.h
@@ -70,6 +70,10 @@
 #else
 #define _PR_NO_LARGE_FILES
 #endif
+#ifdef _PR_INET6
+#define _PR_HAVE_GETHOSTBYNAME2
+#define _PR_INET6_PROBE
+#endif
 #define _PR_HAVE_SYSV_SEMAPHORES
 #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
 
diff --git a/pr/include/md/_macos.h b/pr/include/md/_macos.h
index e6ecd016..cf38977f 100644
--- a/pr/include/md/_macos.h
+++ b/pr/include/md/_macos.h
@@ -318,6 +318,7 @@ typedef enum IOOperation {
 #define _MD_INIT_IO()
 
 #define _MD_OPEN 					_MD_Open
+#define _MD_OPEN_FILE 				_MD_Open
 #define _MD_CLOSE_FILE 				FSClose
 #define _MD_READ(fd,buf,amount) 	ReadWriteProc(fd,buf,amount,READ_ASYNC)
 #define _MD_WRITE(fd,buf,amount) 	ReadWriteProc(fd,buf,amount,WRITE_ASYNC)
@@ -368,6 +369,7 @@ extern char* _MD_ReadDir(struct _MDDir *md,PRIntn flags);
 #define	_MD_CLOSE_DIR 		_MD_CloseDir
 
 #define	_MD_MKDIR 			_MD_MkDir
+#define	_MD_MAKE_DIR		_MD_MkDir
 #define	_MD_RMDIR 			_MD_Delete
 
 /*
diff --git a/pr/include/md/_os2.h b/pr/include/md/_os2.h
index 9fb935c2..70e8d112 100644
--- a/pr/include/md/_os2.h
+++ b/pr/include/md/_os2.h
@@ -182,6 +182,7 @@ struct _MDProcess {
 /* --- IO stuff --- */
 
 #define _MD_OPEN                      (_PR_MD_OPEN)
+#define _MD_OPEN_FILE                 (_PR_MD_OPEN)
 #define _MD_READ                      (_PR_MD_READ)
 #define _MD_WRITE                     (_PR_MD_WRITE)
 #define _MD_WRITEV                    (_PR_MD_WRITEV)
@@ -198,6 +199,7 @@ extern PRInt32 _MD_CloseFile(PRInt32 osfd);
 #define _MD_ACCESS                    (_PR_MD_ACCESS)
 #define _MD_DELETE                    (_PR_MD_DELETE)
 #define _MD_MKDIR                     (_PR_MD_MKDIR)
+#define _MD_MAKE_DIR                  (_PR_MD_MKDIR)
 #define _MD_RMDIR                     (_PR_MD_RMDIR)
 #define _MD_LOCKFILE                  (_PR_MD_LOCKFILE)
 #define _MD_TLOCKFILE                 (_PR_MD_TLOCKFILE)
diff --git a/pr/include/md/_osf1.cfg b/pr/include/md/_osf1.cfg
index 576af82b..e01e9df5 100644
--- a/pr/include/md/_osf1.cfg
+++ b/pr/include/md/_osf1.cfg
@@ -36,6 +36,8 @@
 #define IS_64
 #endif
 
+#define PR_AF_INET6 26  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_osf1.h b/pr/include/md/_osf1.h
index 96a2fe22..c0b95cb5 100644
--- a/pr/include/md/_osf1.h
+++ b/pr/include/md/_osf1.h
@@ -46,9 +46,14 @@
 #define _PR_USE_POLL
 #define _PR_STAT_HAS_ONLY_ST_ATIME
 #define _PR_HAVE_LARGE_OFF_T
-#ifdef _PR_INET6
 #define _PR_HAVE_GETIPNODEBYNAME
 #define _PR_HAVE_GETIPNODEBYADDR
+#define _PR_INET6_PROBE
+#ifndef _PR_INET6
+#define AF_INET6 26
+#define AI_V4MAPPED 0x00000010
+#define AI_ALL      0x00000008
+#define AI_ADDRCONFIG 0x00000020
 #endif
 #define _PR_HAVE_POSIX_SEMAPHORES
 #define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
diff --git a/pr/include/md/_solaris.h b/pr/include/md/_solaris.h
index 535c520e..081636e0 100644
--- a/pr/include/md/_solaris.h
+++ b/pr/include/md/_solaris.h
@@ -73,6 +73,15 @@
 #define _PR_HAVE_POSIX_SEMAPHORES
 #define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
 #define _PR_HAVE_GETIPNODEBYNAME
+#define _PR_HAVE_GETIPNODEBYADDR
+#define _PR_INET6_PROBE
+#define _PR_ACCEPT_INHERIT_NONBLOCK
+#ifndef _PR_INET6
+#define AF_INET6 26
+#define AI_V4MAPPED 0x0001 
+#define AI_ALL      0x0002
+#define AI_ADDRCONFIG   0x0004
+#endif
 
 #include "prinrval.h"
 NSPR_API(PRIntervalTime) _MD_Solaris_GetInterval(void);
diff --git a/pr/include/md/_solaris32.cfg b/pr/include/md/_solaris32.cfg
index f6b988a1..e4c9a9fe 100644
--- a/pr/include/md/_solaris32.cfg
+++ b/pr/include/md/_solaris32.cfg
@@ -41,6 +41,8 @@
 #error unknown processor
 #endif
 
+#define PR_AF_INET6 26  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_solaris64.cfg b/pr/include/md/_solaris64.cfg
index 40832724..b302961b 100644
--- a/pr/include/md/_solaris64.cfg
+++ b/pr/include/md/_solaris64.cfg
@@ -42,6 +42,8 @@
 #endif
 #define IS_64
 
+#define PR_AF_INET6 26  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_unixos.h b/pr/include/md/_unixos.h
index e44ab7b8..7bd86872 100644
--- a/pr/include/md/_unixos.h
+++ b/pr/include/md/_unixos.h
@@ -334,7 +334,8 @@ extern PRStatus _MD_UnlockFile(PRInt32 osfd);
 #define _MD_OPEN_DIR(dir, name)		    _MD_open_dir(dir, name)
 #define _MD_CLOSE_DIR(dir)		        _MD_close_dir(dir)
 #define _MD_READ_DIR(dir, flags)	    _MD_read_dir(dir, flags)
-#define _MD_OPEN(name, osflags, mode    )	_MD_open(name, osflags, mode)
+#define _MD_OPEN(name, osflags, mode)	_MD_open(name, osflags, mode)
+#define _MD_OPEN_FILE(name, osflags, mode)	_MD_open(name, osflags, mode)
 extern PRInt32 _MD_read(PRFileDesc *fd, void *buf, PRInt32 amount);
 #define _MD_READ(fd,buf,amount)		    _MD_read(fd,buf,amount)
 extern PRInt32 _MD_write(PRFileDesc *fd, const void *buf, PRInt32 amount);
@@ -347,6 +348,7 @@ extern PRInt32 _MD_write(PRFileDesc *fd, const void *buf, PRInt32 amount);
 #define _MD_RENAME(from, to)		    _MD_rename(from, to)
 #define _MD_ACCESS(name, how)		    _MD_access(name, how)
 #define _MD_MKDIR(name, mode)		    _MD_mkdir(name, mode)
+#define _MD_MAKE_DIR(name, mode)		_MD_mkdir(name, mode)
 #define _MD_RMDIR(name)			        _MD_rmdir(name)
 #define _MD_ACCEPT_READ(sock, newSock, raddr, buf, amount)	_MD_accept_read(sock, newSock, raddr, buf, amount)
 
diff --git a/pr/include/md/_unixware7.cfg b/pr/include/md/_unixware7.cfg
index 3e50f662..855500c1 100644
--- a/pr/include/md/_unixware7.cfg
+++ b/pr/include/md/_unixware7.cfg
@@ -33,6 +33,8 @@
 #undef	HAVE_ALIGNED_DOUBLES
 #undef	HAVE_ALIGNED_LONGLONGS
 
+#define PR_AF_INET6 27  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_win95.cfg b/pr/include/md/_win95.cfg
index af9e0d11..318422f1 100644
--- a/pr/include/md/_win95.cfg
+++ b/pr/include/md/_win95.cfg
@@ -31,6 +31,8 @@
 #define WIN95
 #endif
 
+#define PR_AF_INET6 23  /* same as AF_INET6 */
+
 #if defined(_M_IX86) || defined(_X86_)
 
 #define IS_LITTLE_ENDIAN 1
diff --git a/pr/include/md/_win95.h b/pr/include/md/_win95.h
index 6878b152..4e8e37a7 100644
--- a/pr/include/md/_win95.h
+++ b/pr/include/md/_win95.h
@@ -158,9 +158,23 @@ struct _MDProcess {
 /* --- Misc stuff --- */
 #define _MD_GET_SP(thread)            (thread)->md.gcContext[6]
 
+/* --- NT security stuff --- */
+
+extern void _PR_NT_InitSids(void);
+extern void _PR_NT_FreeSids(void);
+extern PRStatus _PR_NT_MakeSecurityDescriptorACL(
+    PRIntn mode,
+    DWORD accessTable[],
+    PSECURITY_DESCRIPTOR *resultSD,
+    PACL *resultACL
+);
+extern void _PR_NT_FreeSecurityDescriptorACL(
+    PSECURITY_DESCRIPTOR pSD, PACL pACL);
+
 /* --- IO stuff --- */
 
 #define _MD_OPEN                      _PR_MD_OPEN
+#define _MD_OPEN_FILE                 _PR_MD_OPEN_FILE
 #define _MD_READ                      _PR_MD_READ
 #define _MD_WRITE                     _PR_MD_WRITE
 #define _MD_WRITEV                    _PR_MD_WRITEV
@@ -177,6 +191,7 @@ extern PRInt32 _MD_CloseFile(PRInt32 osfd);
 #define _MD_ACCESS                    _PR_MD_ACCESS     
 #define _MD_DELETE                    _PR_MD_DELETE     
 #define _MD_MKDIR                     _PR_MD_MKDIR      
+#define _MD_MAKE_DIR                  _PR_MD_MAKE_DIR
 #define _MD_RMDIR                     _PR_MD_RMDIR      
 #define _MD_LOCKFILE                  _PR_MD_LOCKFILE
 #define _MD_TLOCKFILE                 _PR_MD_TLOCKFILE
diff --git a/pr/include/md/_winnt.cfg b/pr/include/md/_winnt.cfg
index e3348445..76147e01 100644
--- a/pr/include/md/_winnt.cfg
+++ b/pr/include/md/_winnt.cfg
@@ -31,6 +31,8 @@
 #define WINNT
 #endif
 
+#define PR_AF_INET6 23  /* same as AF_INET6 */
+
 #if defined(_M_IX86) || defined(_X86_)
 
 #define IS_LITTLE_ENDIAN 1
diff --git a/pr/include/md/_winnt.h b/pr/include/md/_winnt.h
index 85ddd505..49756c2e 100644
--- a/pr/include/md/_winnt.h
+++ b/pr/include/md/_winnt.h
@@ -200,12 +200,26 @@ struct _MDProcess {
 /* --- Misc stuff --- */
 #define _MD_GET_SP(thread)            (thread)->md.gcContext[6]
 
+/* --- NT security stuff --- */
+
+extern void _PR_NT_InitSids(void);
+extern void _PR_NT_FreeSids(void);
+extern PRStatus _PR_NT_MakeSecurityDescriptorACL(
+    PRIntn mode,
+    DWORD accessTable[],
+    PSECURITY_DESCRIPTOR *resultSD,
+    PACL *resultACL
+);
+extern void _PR_NT_FreeSecurityDescriptorACL(
+    PSECURITY_DESCRIPTOR pSD, PACL pACL);
+
 /* --- IO stuff --- */
 
 extern PRInt32 _md_Associate(HANDLE);
 extern PRInt32 _PR_MD_CLOSE(PRInt32 osfd, PRBool socket);
 
 #define _MD_OPEN                      _PR_MD_OPEN
+#define _MD_OPEN_FILE                 _PR_MD_OPEN_FILE
 #define _MD_READ                      _PR_MD_READ
 #define _MD_WRITE                     _PR_MD_WRITE
 #define _MD_WRITEV                    _PR_MD_WRITEV
@@ -221,6 +235,7 @@ extern PRInt32 _PR_MD_CLOSE(PRInt32 osfd, PRBool socket);
 #define _MD_ACCESS                    _PR_MD_ACCESS     
 #define _MD_DELETE                    _PR_MD_DELETE     
 #define _MD_MKDIR                     _PR_MD_MKDIR      
+#define _MD_MAKE_DIR                  _PR_MD_MAKE_DIR
 #define _MD_RMDIR                     _PR_MD_RMDIR      
 #define _MD_LOCKFILE                  _PR_MD_LOCKFILE
 #define _MD_TLOCKFILE                 _PR_MD_TLOCKFILE