diff --git a/src/include/os/Linux/osiSock.h b/src/include/os/Linux/osiSock.h
index 538d25346..55b25d804 100644
--- a/src/include/os/Linux/osiSock.h
+++ b/src/include/os/Linux/osiSock.h
@@ -66,6 +66,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/include/os/WIN32/osiSock.h b/src/include/os/WIN32/osiSock.h
index da4ca1fbd..1645ea32f 100644
--- a/src/include/os/WIN32/osiSock.h
+++ b/src/include/os/WIN32/osiSock.h
@@ -35,6 +35,7 @@ typedef u_long FAR osiSockIoctl_t;
 #define SOCK_EINVAL WSAEINVAL
 #define SOCK_EINTR WSAEINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE WSAEMFILE
 
 /*
  *	Under WIN32, FD_SETSIZE is the max. number of sockets,
diff --git a/src/include/os/alpha/osiSock.h b/src/include/os/alpha/osiSock.h
index 46d79f82f..ed0c16b35 100644
--- a/src/include/os/alpha/osiSock.h
+++ b/src/include/os/alpha/osiSock.h
@@ -60,6 +60,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/include/os/cygwin32/osiSock.h b/src/include/os/cygwin32/osiSock.h
index a6e7b4a85..7f8957e47 100644
--- a/src/include/os/cygwin32/osiSock.h
+++ b/src/include/os/cygwin32/osiSock.h
@@ -78,6 +78,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/include/os/hp700/osiSock.h b/src/include/os/hp700/osiSock.h
index 214a1847e..a9b971d80 100644
--- a/src/include/os/hp700/osiSock.h
+++ b/src/include/os/hp700/osiSock.h
@@ -62,6 +62,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/include/os/sgi/osiSock.h b/src/include/os/sgi/osiSock.h
index 2fa8445e1..431983210 100644
--- a/src/include/os/sgi/osiSock.h
+++ b/src/include/os/sgi/osiSock.h
@@ -59,6 +59,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/include/os/solaris/osiSock.h b/src/include/os/solaris/osiSock.h
index f756ded39..23e3c6252 100644
--- a/src/include/os/solaris/osiSock.h
+++ b/src/include/os/solaris/osiSock.h
@@ -59,6 +59,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/include/os/sun4/osiSock.h b/src/include/os/sun4/osiSock.h
index 0cbc11e70..27572c1cb 100644
--- a/src/include/os/sun4/osiSock.h
+++ b/src/include/os/sun4/osiSock.h
@@ -126,6 +126,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/include/os/vms/osiSock.h b/src/include/os/vms/osiSock.h
index 24964e88d..2811690ca 100644
--- a/src/include/os/vms/osiSock.h
+++ b/src/include/os/vms/osiSock.h
@@ -125,6 +125,9 @@ typedef int osiSockIoctl_t;
 #	define SOCKERRNO errno /* UCX and others? */
 #endif
 
+/*
+ * This appears to work even on Multinet
+ */
 #define SOCKERRSTR(ERRNO_IN) (strerror(ERRNO_IN))
     
 #define MAXHOSTNAMELEN 75
@@ -142,6 +145,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 /*
  * Under MULTINET FD_SETSIZE does not apply
diff --git a/src/include/os/vxWorks/osiSock.h b/src/include/os/vxWorks/osiSock.h
index 1f91219d5..da1212bbb 100644
--- a/src/include/os/vxWorks/osiSock.h
+++ b/src/include/os/vxWorks/osiSock.h
@@ -53,6 +53,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #ifndef INADDR_LOOPBACK
 #define INADDR_LOOPBACK 0x7F000001
diff --git a/src/libCom/osi/os/Linux/osdSock.h b/src/libCom/osi/os/Linux/osdSock.h
index 538d25346..55b25d804 100644
--- a/src/libCom/osi/os/Linux/osdSock.h
+++ b/src/libCom/osi/os/Linux/osdSock.h
@@ -66,6 +66,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/libCom/osi/os/LynxOS/osdSock.h b/src/libCom/osi/os/LynxOS/osdSock.h
index 95cdc749d..c91a0c6e2 100644
--- a/src/libCom/osi/os/LynxOS/osdSock.h
+++ b/src/libCom/osi/os/LynxOS/osdSock.h
@@ -63,6 +63,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #define INADDR_LOOPBACK 0x7F000001
 
diff --git a/src/libCom/osi/os/VMS/osiSock.h b/src/libCom/osi/os/VMS/osiSock.h
index 24964e88d..2811690ca 100644
--- a/src/libCom/osi/os/VMS/osiSock.h
+++ b/src/libCom/osi/os/VMS/osiSock.h
@@ -125,6 +125,9 @@ typedef int osiSockIoctl_t;
 #	define SOCKERRNO errno /* UCX and others? */
 #endif
 
+/*
+ * This appears to work even on Multinet
+ */
 #define SOCKERRSTR(ERRNO_IN) (strerror(ERRNO_IN))
     
 #define MAXHOSTNAMELEN 75
@@ -142,6 +145,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 /*
  * Under MULTINET FD_SETSIZE does not apply
diff --git a/src/libCom/osi/os/WIN32/osdSock.h b/src/libCom/osi/os/WIN32/osdSock.h
index da4ca1fbd..1645ea32f 100644
--- a/src/libCom/osi/os/WIN32/osdSock.h
+++ b/src/libCom/osi/os/WIN32/osdSock.h
@@ -35,6 +35,7 @@ typedef u_long FAR osiSockIoctl_t;
 #define SOCK_EINVAL WSAEINVAL
 #define SOCK_EINTR WSAEINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE WSAEMFILE
 
 /*
  *	Under WIN32, FD_SETSIZE is the max. number of sockets,
diff --git a/src/libCom/osi/os/alpha/osdSock.h b/src/libCom/osi/os/alpha/osdSock.h
index 46d79f82f..ed0c16b35 100644
--- a/src/libCom/osi/os/alpha/osdSock.h
+++ b/src/libCom/osi/os/alpha/osdSock.h
@@ -60,6 +60,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/libCom/osi/os/cygwin32/osdSock.h b/src/libCom/osi/os/cygwin32/osdSock.h
index a6e7b4a85..7f8957e47 100644
--- a/src/libCom/osi/os/cygwin32/osdSock.h
+++ b/src/libCom/osi/os/cygwin32/osdSock.h
@@ -78,6 +78,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/libCom/osi/os/hpux/osdSock.h b/src/libCom/osi/os/hpux/osdSock.h
index 214a1847e..a9b971d80 100644
--- a/src/libCom/osi/os/hpux/osdSock.h
+++ b/src/libCom/osi/os/hpux/osdSock.h
@@ -62,6 +62,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/libCom/osi/os/sgi/osdSock.h b/src/libCom/osi/os/sgi/osdSock.h
index 2fa8445e1..431983210 100644
--- a/src/libCom/osi/os/sgi/osdSock.h
+++ b/src/libCom/osi/os/sgi/osdSock.h
@@ -59,6 +59,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/libCom/osi/os/solaris/osdSock.h b/src/libCom/osi/os/solaris/osdSock.h
index f756ded39..23e3c6252 100644
--- a/src/libCom/osi/os/solaris/osdSock.h
+++ b/src/libCom/osi/os/solaris/osdSock.h
@@ -59,6 +59,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/libCom/osi/os/sun4/osdSock.h b/src/libCom/osi/os/sun4/osdSock.h
index 0cbc11e70..27572c1cb 100644
--- a/src/libCom/osi/os/sun4/osdSock.h
+++ b/src/libCom/osi/os/sun4/osdSock.h
@@ -126,6 +126,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #endif /*osiSockH*/
 
diff --git a/src/libCom/osi/os/vxWorks/osdSock.h b/src/libCom/osi/os/vxWorks/osdSock.h
index 1f91219d5..da1212bbb 100644
--- a/src/libCom/osi/os/vxWorks/osdSock.h
+++ b/src/libCom/osi/os/vxWorks/osdSock.h
@@ -53,6 +53,7 @@ typedef int osiSockIoctl_t;
 #define SOCK_EINVAL EINVAL
 #define SOCK_EINTR EINTR
 #define SOCK_EPIPE EPIPE
+#define SOCK_EMFILE EMFILE
 
 #ifndef INADDR_LOOPBACK
 #define INADDR_LOOPBACK 0x7F000001