Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / include / ac / socket.h

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 3fb1363ccbc946e7ed392803282ec8483466a128..0f4ea6fc397154ef7970c0600b965494e12a89b7 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,6 +23,8 @@
 
 #ifdef HAVE_POLL_H
 #include <poll.h>
+#elif defined(HAVE_SYS_POLL_H)
+#include <sys/poll.h>
 #endif
 
 #ifdef HAVE_SYS_SOCKET_H
@@ -60,6 +62,7 @@
 
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #elif HAVE_WINSOCK
 #include <winsock.h>
 #endif
@@ -80,13 +83,14 @@
 #undef sock_errstr
 #define sock_errno()   errno
 #define sock_errstr(e) STRERROR(e)
+#define sock_errset(e) ((void) (errno = (e)))
 
 #ifdef HAVE_WINSOCK
 #      define tcp_read( s, buf, len )  recv( s, buf, len, 0 )
 #      define tcp_write( s, buf, len ) send( s, buf, len, 0 )
 #      define ioctl( s, c, a )         ioctlsocket( (s), (c), (a) )
 #      define ioctl_t                          u_long
-#      define AC_SOCKET_INVALID        ((unsigned int) ~0)
+#      define AC_SOCKET_INVALID        ((unsigned int) -1)
 
 #      ifdef SD_BOTH
 #              define tcp_close( s )   (shutdown( s, SD_BOTH ), closesocket( s ))
@@ -100,8 +104,10 @@
 
 #undef sock_errno
 #undef sock_errstr
+#undef sock_errset
 #define        sock_errno()    WSAGetLastError()
 #define        sock_errstr(e)  ber_pvt_wsa_err2string(e)
+#define        sock_errset(e)  WSASetLastError(e)
 
 LBER_F( char * ) ber_pvt_wsa_err2string LDAP_P((int));
 
@@ -122,7 +128,7 @@ LBER_F( char * ) ber_pvt_wsa_err2string LDAP_P((int));
 #              define tcp_write( s, buf, len ) netwrite( s, buf, len )
 #      endif /* NCSA */
 
-#elif HAVE_CLOSESOCKET
+#elif defined(HAVE_CLOSESOCKET)
 #      define tcp_close( s )           closesocket( s )
 
 #      ifdef __BEOS__
@@ -208,8 +214,24 @@ LDAP_F (int) ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
 #      endif
 #endif
 
-#ifndef HAVE_GETPEEREID
-LDAP_LUTIL_F( int ) getpeereid( int s, uid_t *, gid_t * );
+#if defined(LDAP_PF_LOCAL) && \
+       !defined(HAVE_GETPEEREID) && \
+       !defined(HAVE_GETPEERUCRED) && \
+       !defined(SO_PEERCRED) && !defined(LOCAL_PEERCRED) && \
+       defined(HAVE_SENDMSG) && (defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN) || \
+       defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL))
+#      define LDAP_PF_LOCAL_SENDMSG 1
+#endif
+
+#ifdef HAVE_GETPEEREID
+#define        LUTIL_GETPEEREID( s, uid, gid, bv )     getpeereid( s, uid, gid )
+#elif defined(LDAP_PF_LOCAL_SENDMSG)
+struct berval;
+LDAP_LUTIL_F( int ) lutil_getpeereid( int s, uid_t *, gid_t *, struct berval *bv );
+#define        LUTIL_GETPEEREID( s, uid, gid, bv )     lutil_getpeereid( s, uid, gid, bv )
+#else
+LDAP_LUTIL_F( int ) lutil_getpeereid( int s, uid_t *, gid_t * );
+#define        LUTIL_GETPEEREID( s, uid, gid, bv )     lutil_getpeereid( s, uid, gid )
 #endif
 
 /* DNS RFC defines max host name as 255. New systems seem to use 1024 */
@@ -217,10 +239,16 @@ LDAP_LUTIL_F( int ) getpeereid( int s, uid_t *, gid_t * );
 #define        NI_MAXHOST      256
 #endif
 
-#ifdef HAVE_POLL_H
+#ifdef HAVE_POLL
 # ifndef INFTIM
 #  define INFTIM (-1)
 # endif
+#undef POLL_OTHER
+#define POLL_OTHER   (POLLERR|POLLHUP)
+#undef POLL_READ
+#define POLL_READ    (POLLIN|POLLPRI|POLL_OTHER)
+#undef POLL_WRITE              
+#define POLL_WRITE   (POLLOUT|POLL_OTHER)
 #endif
 
 #endif /* _AC_SOCKET_H_ */