X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fos-local.c;h=4e3a19e5a29c20fa0fe19f1f73195f1996890230;hb=de01a6e3d791d3458549d2ceeccf4d7e0477ff78;hp=ecc7a2459a98eb47654d56ee2f351ac27cfb46ec;hpb=3c598e89fb34a892d369a138daa8c3314294493c;p=openldap diff --git a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c index ecc7a2459a..4e3a19e5a2 100644 --- a/libraries/libldap/os-local.c +++ b/libraries/libldap/os-local.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2007 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,8 +51,6 @@ #include "ldap-int.h" #include "ldap_defaults.h" -/* int ldap_int_tblsize = 0; */ - #ifdef LDAP_DEBUG #define oslocal_debug(ld,fmt,arg1,arg2,arg3) \ @@ -103,11 +101,12 @@ ldap_pvt_close_socket(LDAP *ld, int s) #undef TRACE #define TRACE do { \ + char ebuf[128]; \ oslocal_debug(ld, \ "ldap_is_socket_ready: errror on socket %d: errno: %d (%s)\n", \ s, \ errno, \ - STRERROR(errno) ); \ + AC_STRERROR_R(errno, ebuf, sizeof ebuf)); \ } while( 0 ) /* @@ -156,8 +155,10 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s) #undef TRACE #if !defined(HAVE_GETPEEREID) && \ + !defined(HAVE_GETPEERUCRED) && \ !defined(SO_PEERCRED) && !defined(LOCAL_PEERCRED) && \ - defined(HAVE_SENDMSG) && defined(HAVE_MSGHDR_MSG_ACCRIGHTS) + defined(HAVE_SENDMSG) && (defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN) || \ + defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)) #define DO_SENDMSG static const char abandonPDU[] = {LDAP_TAG_MESSAGE, 6, LDAP_TAG_MSGID, 1, 0, LDAP_REQ_ABANDON, 1, 0}; @@ -167,26 +168,23 @@ static int ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sa, int async) { int rc; - struct timeval tv, *opt_tv=NULL; - fd_set wfds, *z=NULL; + struct timeval tv, *opt_tv = NULL; - if ( (opt_tv = ld->ld_options.ldo_tm_net) != NULL ) { - tv.tv_usec = opt_tv->tv_usec; - tv.tv_sec = opt_tv->tv_sec; + if ( ld->ld_options.ldo_tm_net.tv_sec >= 0 ) { + tv = ld->ld_options.ldo_tm_net; + opt_tv = &tv; } oslocal_debug(ld, "ldap_connect_timeout: fd: %d tm: %ld async: %d\n", - s, opt_tv ? tv.tv_sec : -1L, async); + s, opt_tv ? tv.tv_sec : -1L, async); - if ( ldap_pvt_ndelay_on(ld, s) == -1 ) - return ( -1 ); + if ( ldap_pvt_ndelay_on(ld, s) == -1 ) return -1; if ( connect(s, (struct sockaddr *) sa, sizeof(struct sockaddr_un)) != AC_SOCKET_ERROR ) { - if ( ldap_pvt_ndelay_off(ld, s) == -1 ) { - return ( -1 ); - } + if ( ldap_pvt_ndelay_off(ld, s) == -1 ) return -1; + #ifdef DO_SENDMSG /* Send a dummy message with access rights. Remote side will * obtain our uid/gid by fstat'ing this descriptor. @@ -198,50 +196,116 @@ sendcred: /* Abandon, noop, has no reply */ struct iovec iov; struct msghdr msg = {0}; +# ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL +# ifndef CMSG_SPACE +# define CMSG_SPACE(len) (_CMSG_ALIGN( sizeof(struct cmsghdr)) + _CMSG_ALIGN(len) ) +# endif +# ifndef CMSG_LEN +# define CMSG_LEN(len) (_CMSG_ALIGN( sizeof(struct cmsghdr)) + (len) ) +# endif + union { + struct cmsghdr cm; + unsigned char control[CMSG_SPACE(sizeof(int))]; + } control_un; + struct cmsghdr *cmsg; +# endif /* HAVE_STRUCT_MSGHDR_MSG_CONTROL */ + msg.msg_name = NULL; + msg.msg_namelen = 0; iov.iov_base = (char *) abandonPDU; iov.iov_len = sizeof abandonPDU; msg.msg_iov = &iov; msg.msg_iovlen = 1; +# ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL + msg.msg_control = control_un.control; + msg.msg_controllen = sizeof( control_un.control ); + msg.msg_flags = 0; + + cmsg = CMSG_FIRSTHDR( &msg ); + cmsg->cmsg_len = CMSG_LEN( sizeof(int) ); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + + *((int *)CMSG_DATA(cmsg)) = fds[0]; +# else msg.msg_accrights = (char *)fds; msg.msg_accrightslen = sizeof(int); +# endif /* HAVE_STRUCT_MSGHDR_MSG_CONTROL */ sendmsg( s, &msg, 0 ); close(fds[0]); close(fds[1]); } } #endif - return ( 0 ); + return 0; } - if ( errno != EINPROGRESS && errno != EWOULDBLOCK ) { - return ( -1 ); - } + if ( errno != EINPROGRESS && errno != EWOULDBLOCK ) return -1; #ifdef notyet - if ( async ) return ( -2 ); + if ( async ) return -2; #endif - FD_ZERO(&wfds); - FD_SET(s, &wfds ); +#ifdef HAVE_POLL + { + struct pollfd fd; + int timeout = INFTIM; + + if( opt_tv != NULL ) timeout = TV2MILLISEC( &tv ); + + fd.fd = s; + fd.events = POLL_WRITE; - do { - rc = select(ldap_int_tblsize, z, &wfds, z, opt_tv ? &tv : NULL); - } while( rc == AC_SOCKET_ERROR && errno == EINTR && - LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART )); + do { + fd.revents = 0; + rc = poll( &fd, 1, timeout ); + } while( rc == AC_SOCKET_ERROR && errno == EINTR && + LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART )); - if( rc == AC_SOCKET_ERROR ) return rc; + if( rc == AC_SOCKET_ERROR ) return rc; - if ( FD_ISSET(s, &wfds) ) { - if ( ldap_pvt_is_socket_ready(ld, s) == -1 ) - return ( -1 ); - if ( ldap_pvt_ndelay_off(ld, s) == -1 ) - return ( -1 ); + if( fd.revents & POLL_WRITE ) { + if ( ldap_pvt_is_socket_ready(ld, s) == -1 ) return -1; + if ( ldap_pvt_ndelay_off(ld, s) == -1 ) return -1; #ifdef DO_SENDMSG - goto sendcred; + goto sendcred; #else - return ( 0 ); + return ( 0 ); #endif + } } +#else + { + fd_set wfds, *z=NULL; + +#ifdef FD_SETSIZE + if ( s >= FD_SETSIZE ) { + rc = AC_SOCKET_ERROR; + tcp_close( s ); + ldap_pvt_set_errno( EMFILE ); + return rc; + } +#endif + do { + FD_ZERO(&wfds); + FD_SET(s, &wfds ); + rc = select( ldap_int_tblsize, z, &wfds, z, opt_tv ? &tv : NULL ); + } while( rc == AC_SOCKET_ERROR && errno == EINTR && + LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART )); + + if( rc == AC_SOCKET_ERROR ) return rc; + + if ( FD_ISSET(s, &wfds) ) { + if ( ldap_pvt_is_socket_ready(ld, s) == -1 ) return -1; + if ( ldap_pvt_ndelay_off(ld, s) == -1 ) return -1; +#ifdef DO_SENDMSG + goto sendcred; +#else + return ( 0 ); +#endif + } + } +#endif + oslocal_debug(ld, "ldap_connect_timeout: timed out\n",0,0,0); ldap_pvt_set_errno( ETIMEDOUT ); return ( -1 );