/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <ac/unistd.h>
#include "ldap_pvt.h"
+#include "ldap_pvt_thread.h"
#include "lutil.h"
#include "slap.h"
#ifdef LDAP_PF_LOCAL
#include <sys/stat.h>
+/* this should go in <ldap.h> as soon as it is accepted */
+#define LDAPI_MOD_URLEXT "x-mod"
#endif /* LDAP_PF_LOCAL */
/* globals */
time_t starttime;
ber_socket_t dtblsize;
-typedef union slap_sockaddr {
- struct sockaddr sa_addr;
- struct sockaddr_in sa_in_addr;
-#ifdef LDAP_PF_INET6
- struct sockaddr_in6 sa_in6_addr;
-#endif
-#ifdef LDAP_PF_LOCAL
- struct sockaddr_un sa_un_addr;
-#endif
-} Sockaddr;
-
-typedef struct slap_listener {
- char* sl_url;
- char* sl_name;
-#ifdef HAVE_TLS
- int sl_is_tls;
-#endif
- ber_socket_t sl_sd;
- Sockaddr sl_sa;
-#define sl_addr sl_sa.sa_in_addr
-} Listener;
-
Listener **slap_listeners = NULL;
#define SLAPD_LISTEN 10
do { if (w) tcp_write( wake_sds[1], "0", 1 ); } while(0)
#endif
-#ifdef HAVE_NT_SERVICE_MANAGER
-/* in nt_main.c */
-extern ldap_pvt_thread_cond_t started_event;
-extern int is_NT_Service;
-#endif
-
#ifndef HAVE_WINSOCK
static
#endif
*/
#include <slp.h>
-#define MAX_HOSTNAME_LEN 256
#define LDAP_SRVTYPE_PREFIX "service:ldap://"
-static char** slapd_srvurls = 0;
+#define LDAPS_SRVTYPE_PREFIX "service:ldaps://"
+static char** slapd_srvurls = NULL;
static SLPHandle slapd_hslp = 0;
void slapd_slp_init( const char* urls ) {
int i;
- struct hostent* he;
- char hn[MAX_HOSTNAME_LEN];
slapd_srvurls = str2charray( urls, " " );
- for( i=0; slapd_srvurls[i]!=NULL; i++ ) {
+ if( slapd_srvurls == NULL ) return;
+
+ /* find and expand INADDR_ANY URLs */
+ for( i=0; slapd_srvurls[i] != NULL; i++ ) {
if( strcmp( slapd_srvurls[i], "ldap:///" ) == 0) {
- /* INADDR_ANY urls should be marked up with host.domainname */
- if ( gethostname( hn, MAX_HOSTNAME_LEN ) == 0) {
- he = gethostbyname( hn );
- if( he ) {
- slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i],
- strlen( he->h_name ) +
- strlen( LDAP_SRVTYPE_PREFIX ) + 1);
- strcpy( slapd_srvurls[i], LDAP_SRVTYPE_PREFIX );
- strcat( slapd_srvurls[i], he->h_name );
- }
+ char *host = ldap_pvt_get_fqdn( NULL );
+ if ( host != NULL ) {
+ slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i],
+ strlen( host ) +
+ sizeof( LDAP_SRVTYPE_PREFIX ) );
+ strcpy( slap_strcopy(slapd_srvurls[i],
+ LDAP_SRVTYPE_PREFIX ), host );
+
+ ch_free( host );
+ }
+
+ } else if ( strcmp( slapd_srvurls[i], "ldaps:///" ) == 0) {
+ char *host = ldap_pvt_get_fqdn( NULL );
+ if ( host != NULL ) {
+ slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i],
+ strlen( host ) +
+ sizeof( LDAPS_SRVTYPE_PREFIX ) );
+ strcpy( slap_strcopy(slapd_srvurls[i],
+ LDAPS_SRVTYPE_PREFIX ), host );
+
+ ch_free( host );
}
}
}
/* open the SLP handle */
- SLPOpen("en", 0, &slapd_hslp);
+ SLPOpen( "en", 0, &slapd_hslp );
}
void slapd_slp_deinit() {
- if ( slapd_srvurls ) {
- charray_free( slapd_srvurls );
- }
+ if( slapd_srvurls == NULL ) return;
+
+ charray_free( slapd_srvurls );
+ slapd_srvurls = NULL;
/* close the SLP handle */
SLPClose( slapd_hslp );
int i;
for( i=0; slapd_srvurls[i] != NULL; i++ ) {
- SLPReg( slapd_hslp,
- slapd_srvurls[i],
- SLP_LIFETIME_MAXIMUM,
- "ldap",
- "",
- 1,
- slapd_slp_regreport,
- NULL );
+ if( strncmp( slapd_srvurls[i], LDAP_SRVTYPE_PREFIX,
+ sizeof( LDAP_SRVTYPE_PREFIX ) - 1 ) == 0 ||
+ strncmp( slapd_srvurls[i], LDAPS_SRVTYPE_PREFIX,
+ sizeof( LDAPS_SRVTYPE_PREFIX ) - 1 ) == 0 )
+ {
+ SLPReg( slapd_hslp,
+ slapd_srvurls[i],
+ SLP_LIFETIME_MAXIMUM,
+ "ldap",
+ "",
+ 1,
+ slapd_slp_regreport,
+ NULL );
+ }
}
}
ch_free(sal);
}
+#ifdef LDAP_PF_LOCAL
+static int get_url_perms(
+ char **exts,
+ mode_t *perms,
+ int *crit )
+{
+ int i;
+
+ assert( exts );
+ assert( perms );
+ assert( crit );
+
+ *crit = 0;
+ for ( i = 0; exts[ i ]; i++ ) {
+ char *type = exts[ i ];
+ int c = 0;
+
+ if ( type[ 0 ] == '!' ) {
+ c = 1;
+ type++;
+ }
+
+ if ( strncasecmp( type, LDAPI_MOD_URLEXT "=", sizeof(LDAPI_MOD_URLEXT "=") - 1 ) == 0 ) {
+ char *value = type + sizeof(LDAPI_MOD_URLEXT "=") - 1;
+ mode_t p = 0;
+
+#if 0
+ if ( strlen( value ) != 9 ) {
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 0 ] ) {
+ case 'r':
+ p |= S_IRUSR;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 1 ] ) {
+ case 'w':
+ p |= S_IWUSR;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 2 ] ) {
+ case 'x':
+ p |= S_IXUSR;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 3 ] ) {
+ case 'r':
+ p |= S_IRGRP;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 4 ] ) {
+ case 'w':
+ p |= S_IWGRP;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 5 ] ) {
+ case 'x':
+ p |= S_IXGRP;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 6 ] ) {
+ case 'r':
+ p |= S_IROTH;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 7 ] ) {
+ case 'w':
+ p |= S_IWOTH;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 8 ] ) {
+ case 'x':
+ p |= S_IXOTH;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+#else
+ if ( strlen(value) != 3 ) {
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 0 ] ) {
+ case 'w':
+ p |= S_IRWXU;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 1 ] ) {
+ case 'w':
+ p |= S_IRWXG;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+
+ switch ( value[ 2 ] ) {
+ case 'w':
+ p |= S_IRWXO;
+ break;
+ case '-':
+ break;
+ default:
+ return LDAP_OTHER;
+ }
+#endif
+
+ *crit = c;
+ *perms = p;
+
+ return LDAP_SUCCESS;
+ }
+ }
+}
+#endif /* LDAP_PF_LOCAL */
+
/* port = 0 indicates AF_LOCAL */
static int slap_get_listener_addresses(
const char *host,
struct sockaddr ***sal)
{
struct sockaddr **sap;
-#ifdef HAVE_GETADDRINFO
- struct addrinfo hints, *res, *sai;
- int n, err;
- memset( &hints, '\0', sizeof(hints) );
- hints.ai_flags = AI_PASSIVE;
- hints.ai_socktype = SOCK_STREAM;
-# ifdef LDAP_PF_LOCAL
+#ifdef LDAP_PF_LOCAL
if ( port == 0 ) {
- hints.ai_family = AF_LOCAL;
- /* host specifies a service in this case */
- if (err = getaddrinfo(NULL, host, &hints, &res)) {
+ *sal = ch_malloc(2 * sizeof(void *));
+ if (*sal == NULL) {
+ return -1;
+ }
+
+ sap = *sal;
+ *sap = ch_malloc(sizeof(struct sockaddr_un));
+ if (*sap == NULL)
+ goto errexit;
+ sap[1] = NULL;
+
+ if ( strlen(host) >
+ (sizeof(((struct sockaddr_un *)*sap)->sun_path) - 1) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "slap_get_listener_addresses: getaddrinfo failed: %s\n",
- AC_GAI_STRERROR(err) ));
+ "slap_get_listener_addresses: domain socket path (%s) too long in URL\n",
+ host ));
#else
- Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
- AC_GAI_STRERROR(err), 0, 0);
+ Debug( LDAP_DEBUG_ANY,
+ "daemon: domain socket path (%s) too long in URL",
+ host, 0, 0);
#endif
- return -1;
+ goto errexit;
}
+
+ (void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
+ (*sap)->sa_family = AF_LOCAL;
+ strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
} else
-# endif
+#endif
{
+#ifdef HAVE_GETADDRINFO
+ struct addrinfo hints, *res, *sai;
+ int n, err;
char serv[7];
- snprintf(serv, sizeof serv, "%d", port);
+ memset( &hints, '\0', sizeof(hints) );
+ hints.ai_flags = AI_PASSIVE;
+ hints.ai_socktype = SOCK_STREAM;
hints.ai_family = AF_UNSPEC;
- if (err = getaddrinfo(host, serv, &hints, &res)) {
+ snprintf(serv, sizeof serv, "%d", port);
+
+ if ( (err = getaddrinfo(host, serv, &hints, &res)) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_get_listener_addresses: getaddrinfo failed: %s\n",
#endif
return -1;
}
- }
- sai = res;
- for (n=2; (sai = sai->ai_next) != NULL; n++) {
- /* EMPTY */ ;
- }
- *sal = ch_malloc(n * sizeof(*sal));
- if (*sal == NULL) {
- return -1;
- }
+ sai = res;
+ for (n=2; (sai = sai->ai_next) != NULL; n++) {
+ /* EMPTY */ ;
+ }
+ *sal = ch_calloc(n, sizeof(void *));
+ if (*sal == NULL) {
+ return -1;
+ }
- sai = res;
- sap = *sal;
- do {
- switch (sai->ai_family) {
-# ifdef LDAP_PF_LOCAL
- case AF_LOCAL: {
- *sap = ch_malloc(sizeof(struct sockaddr_un));
- if (*sap == NULL) {
+ sap = *sal;
+ *sap = NULL;
+
+ for ( sai=res; sai; sai=sai->ai_next ) {
+ if( sai->ai_addr == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
+ "slap_get_listener_addresses: "
+ "getaddrinfo ai_addr is NULL?\n" ));
+#else
+ Debug( LDAP_DEBUG_ANY, "slap_get_listener_addresses: "
+ "getaddrinfo ai_addr is NULL?\n", 0, 0, 0 );
+#endif
freeaddrinfo(res);
goto errexit;
}
- *(struct sockaddr_un *)*sap =
- *((struct sockaddr_un *)sai->ai_addr);
- } break;
-# endif
+
+ switch (sai->ai_family) {
# ifdef LDAP_PF_INET6
- case AF_INET6: {
- *sap = ch_malloc(sizeof(struct sockaddr_in6));
- if (*sap == NULL) {
- freeaddrinfo(res);
- goto errexit;
- }
- *(struct sockaddr_in6 *)*sap =
- *((struct sockaddr_in6 *)sai->ai_addr);
- } break;
+ case AF_INET6:
+ *sap = ch_malloc(sizeof(struct sockaddr_in6));
+ if (*sap == NULL) {
+ freeaddrinfo(res);
+ goto errexit;
+ }
+ *(struct sockaddr_in6 *)*sap =
+ *((struct sockaddr_in6 *)sai->ai_addr);
+ break;
# endif
- case AF_INET: {
- *sap = ch_malloc(sizeof(struct sockaddr_in));
- if (*sap == NULL) {
- freeaddrinfo(res);
- goto errexit;
+ case AF_INET:
+ *sap = ch_malloc(sizeof(struct sockaddr_in));
+ if (*sap == NULL) {
+ freeaddrinfo(res);
+ goto errexit;
+ }
+ *(struct sockaddr_in *)*sap =
+ *((struct sockaddr_in *)sai->ai_addr);
+ break;
+ default:
+ *sap = NULL;
+ break;
}
- *(struct sockaddr_in *)*sap =
- *((struct sockaddr_in *)sai->ai_addr);
- } break;
- default:
- *sap = NULL;
- break;
- }
- if (*sap != NULL) {
- (*sap)->sa_family = sai->ai_family;
- sap++;
- }
- } while ((sai = sai->ai_next) != NULL);
- freeaddrinfo(res);
-
-#else
-# ifdef LDAP_PF_LOCAL
- if ( port == 0 ) {
- *sal = ch_malloc(2 * sizeof(*sal));
- if (*sal == NULL) {
- return -1;
+ if (*sap != NULL) {
+ (*sap)->sa_family = sai->ai_family;
+ sap++;
+ *sap = NULL;
+ }
}
- sap = *sal;
- *sap = ch_malloc(sizeof(struct sockaddr_un));
- if (*sap == NULL)
- goto errexit;
- (void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_un) );
- (*sap)->sa_family = AF_LOCAL;
- if ( strlen(host) >
- (sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "slap_get_listener_addresses: domain socket path (%s) too long in URL\n",
- host ));
+
+ freeaddrinfo(res);
#else
- Debug( LDAP_DEBUG_ANY,
- "daemon: domain socket path (%s) too long in URL",
- host, 0, 0);
-#endif
- goto errexit;
- }
- strcpy( ((struct sockaddr_un *)*sap)->sun_path, host );
- } else
-# endif
- {
struct in_addr in;
if ( host == NULL ) {
AC_MEMCPY( &in, he->h_addr, sizeof( in ) );
}
- *sal = ch_malloc(2 * sizeof(*sal));
+ *sal = ch_malloc(2 * sizeof(void *));
if (*sal == NULL) {
return -1;
}
if (*sap == NULL) {
goto errexit;
}
+ sap[1] = NULL;
(void)memset( (void *)*sap, '\0', sizeof(struct sockaddr_in) );
(*sap)->sa_family = AF_INET;
((struct sockaddr_in *)*sap)->sin_port = htons(port);
((struct sockaddr_in *)*sap)->sin_addr = in;
- }
- sap++;
#endif
+ }
- *sap = NULL;
return 0;
errexit:
Listener *li;
LDAPURLDesc *lud;
unsigned short port;
- int err, addrlen;
+ int err, addrlen = 0;
struct sockaddr **sal, **psal;
+ int socktype = SOCK_STREAM; /* default to COTS */
+#ifdef LDAP_PF_LOCAL
+ mode_t perms = S_IRWXU;
+ int crit = 1;
+#endif
rc = ldap_url_parse( url, &lud );
port = (unsigned short) lud->lud_port;
- if ( ldap_pvt_url_scheme2proto(lud->lud_scheme) == LDAP_PROTO_IPC ) {
+ tmp = ldap_pvt_url_scheme2proto(lud->lud_scheme);
+ if ( tmp == LDAP_PROTO_IPC ) {
#ifdef LDAP_PF_LOCAL
if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
err = slap_get_listener_addresses(LDAPI_SOCK, 0, &sal);
} else {
err = slap_get_listener_addresses(lud->lud_host, 0, &sal);
}
+
+ if ( lud->lud_exts ) {
+ err = get_url_perms( lud->lud_exts, &perms, &crit );
+ }
#else
#ifdef NEW_LOGGING
return NULL;
#endif
} else {
+#ifdef LDAP_CONNECTIONLESS
+ l.sl_is_udp = ( tmp == LDAP_PROTO_UDP );
+#endif
if( lud->lud_host == NULL || lud->lud_host[0] == '\0'
|| strcmp(lud->lud_host, "*") == 0 )
{
sal++;
continue;
}
- l.sl_sd = socket( (*sal)->sa_family, SOCK_STREAM, 0);
+#ifdef LDAP_CONNECTIONLESS
+ if (l.sl_is_udp)
+ socktype = SOCK_DGRAM;
+#endif
+ l.sl_sd = socket( (*sal)->sa_family, socktype, 0);
if ( l.sl_sd == AC_SOCKET_INVALID ) {
int err = sock_errno();
#ifdef NEW_LOGGING
#ifdef LDAP_PF_LOCAL
case AF_LOCAL: {
char *addr = ((struct sockaddr_un *)*sal)->sun_path;
- if ( chmod( addr, S_IRWXU ) < 0 ) {
+ if ( chmod( addr, perms ) < 0 && crit ) {
int err = sock_errno();
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
case AF_INET: {
char *s;
-#ifdef HAVE_GETADDRINFO
+#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
char addr[INET_ADDRSTRLEN];
inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
addr, sizeof(addr) );
s = addr;
#else
- s = inet_ntoa( l.sl_addr.sin_addr );
+ s = inet_ntoa( ((struct sockaddr_in *) *sal)->sin_addr );
#endif
+ port = ((struct sockaddr_in *)*sal) ->sin_port;
l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
sprintf( l.sl_name, "IP=%s:%d",
s != NULL ? s : "unknown" , port );
char addr[INET6_ADDRSTRLEN];
inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
addr, sizeof addr);
+ port = ((struct sockaddr_in6 *)*sal)->sin6_port;
l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
sprintf( l.sl_name, "IP=%s %d", addr, port );
} break;
)
{
int l;
- time_t last_idle_check = slap_get_time();
+ time_t last_idle_check = 0;
time( &starttime );
+ if ( global_idletimeout > 0 ) {
+ last_idle_check = slap_get_time();
+ }
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
continue;
+#ifdef LDAP_CONNECTIONLESS
+ /* Since this is connectionless, the data port is the
+ * listening port. The listen() and accept() calls
+ * are unnecessary.
+ */
+ if ( slap_listeners[l]->sl_is_udp )
+ {
+ slapd_add( slap_listeners[l]->sl_sd );
+ continue;
+ }
+#endif
if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
int err = sock_errno();
ber_socket_t nfds;
#define SLAPD_EBADF_LIMIT 16
int ebadf = 0;
+ int emfile = 0;
#define SLAPD_IDLE_CHECK_LIMIT 4
- time_t now = slap_get_time();
+ time_t now;
fd_set readfds;
Sockaddr from;
#if defined(SLAPD_RLOOKUPS)
- struct hostent *hp;
+ struct hostent *hp;
#endif
struct timeval zero;
struct timeval *tvp;
- if( global_idletimeout > 0 && difftime(
- last_idle_check+global_idletimeout/SLAPD_IDLE_CHECK_LIMIT,
- now ) < 0 )
- {
- connections_timeout_idle(now);
+ if( emfile ) {
+ now = slap_get_time();
+ connections_timeout_idle( now );
+ }
+ else if ( global_idletimeout > 0 ) {
+ now = slap_get_time();
+ if ( difftime( last_idle_check+global_idletimeout/SLAPD_IDLE_CHECK_LIMIT, now ) < 0 ) {
+ connections_timeout_idle( now );
+ }
}
FD_ZERO( &writefds );
Debug( LDAP_DEBUG_CONNS, "daemon: select timeout - yielding\n",
0, 0, 0 );
#endif
- ldap_pvt_thread_yield();
+ ldap_pvt_thread_yield();
continue;
default: /* something happened - deal with it */
slap_ssf_t ssf = 0;
char *authid = NULL;
- char *dnsname;
+ char *dnsname = NULL;
char *peeraddr;
#ifdef LDAP_PF_LOCAL
char peername[MAXPATHLEN + sizeof("PATH=")];
if ( !FD_ISSET( slap_listeners[l]->sl_sd, &readfds ) )
continue;
+#ifdef LDAP_CONNECTIONLESS
+ if ( slap_listeners[l]->sl_is_udp )
+ {
+ /* The first time we receive a query, we set this
+ * up as a "connection". It remains open for the life
+ * of the slapd.
+ */
+ if ( slap_listeners[l]->sl_is_udp < 2 )
+ {
+ id = connection_init(
+ slap_listeners[l]->sl_sd,
+ slap_listeners[l]->sl_url, "", "",
+ slap_listeners[l]->sl_name,
+ 2, ssf, authid );
+ slap_listeners[l]->sl_is_udp++;
+ }
+ continue;
+ }
+#endif
+
s = accept( slap_listeners[l]->sl_sd,
(struct sockaddr *) &from, &len );
if ( s == AC_SOCKET_INVALID ) {
int err = sock_errno();
+
+#ifdef EMFILE
+ if( err == EMFILE ) {
+ emfile++;
+ } else
+#endif
+#ifdef ENFILE
+ if( err == ENFILE ) {
+ emfile++;
+ } else
+#endif
+ {
+ emfile=0;
+ }
+
+ if( emfile < 3 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
- (long)slap_listeners[l]->sl_sd, err, sock_errstr(err) ));
+ LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
+ "slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
+ (long)slap_listeners[l]->sl_sd, err, sock_errstr(err) ));
#else
- Debug( LDAP_DEBUG_ANY,
- "daemon: accept(%ld) failed errno=%d (%s)\n",
- (long) slap_listeners[l]->sl_sd, err,
- sock_errstr(err) );
-#endif
+ Debug( LDAP_DEBUG_ANY,
+ "daemon: accept(%ld) failed errno=%d (%s)\n",
+ (long) slap_listeners[l]->sl_sd, err,
+ sock_errstr(err) );
+#endif
+ } else {
+ /* prevent busy loop */
+# ifdef HAVE_USLEEP
+ if( emfile % 4 == 3 ) usleep( 250 );
+# else
+ if( emfile % 8 == 7 ) sleep( 1 );
+# endif
+ }
+
+ ldap_pvt_thread_yield();
continue;
}
+ emfile = 0;
#ifndef HAVE_WINSOCK
/* make sure descriptor number isn't too great */
if ( s >= dtblsize ) {
-#ifdef NEW_LGGING
+#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "slapd_daemon_task: %ld beyond descriptor table size %ld\n",
- (long)s, (long)dtblsize ));
+ "slapd_daemon_task: %ld beyond descriptor table size %ld\n",
+ (long)s, (long)dtblsize ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: %ld beyond descriptor table size %ld\n",
(long) s, (long) dtblsize, 0 );
#endif
+
slapd_close(s);
+ ldap_pvt_thread_yield();
continue;
}
#endif
case AF_LOCAL:
sprintf( peername, "PATH=%s", from.sa_un_addr.sun_path );
ssf = LDAP_PVT_SASL_LOCAL_SSF;
+ dnsname = "local";
break;
#endif /* LDAP_PF_LOCAL */
for ( i = 0; i < readfds.fd_count; i++ ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
- " %d%s", readfs.fd_array[i], "r", 0 );
+ " %d%s", readfds.fd_array[i], "r", 0 ));
#else
Debug( LDAP_DEBUG_CONNS, " %d%s",
readfds.fd_array[i], "r", 0 );
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( i == slap_listeners[l]->sl_sd ) {
+#ifdef LDAP_CONNECTIONLESS
+ /* The listener is the data port. Don't
+ * skip it.
+ */
+ if (slap_listeners[l]->sl_is_udp)
+ continue;
+#endif
is_listener = 1;
break;
}
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( i == slap_listeners[l]->sl_sd ) {
+#ifdef LDAP_CONNECTIONLESS
+ if (slap_listeners[l]->sl_is_udp)
+ continue;
+#endif
is_listener = 1;
break;
}
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( rd == slap_listeners[l]->sl_sd ) {
+#ifdef LDAP_CONNECTIONLESS
+ if (slap_listeners[l]->sl_is_udp)
+ continue;
+#endif
is_listener = 1;
break;
}
}
#endif /* LDAP_PF_LOCAL */
slapd_close( slap_listeners[l]->sl_sd );
- break;
}
+ if ( slap_listeners[l]->sl_url )
+ free ( slap_listeners[l]->sl_url );
+ if ( slap_listeners[l]->sl_name )
+ free ( slap_listeners[l]->sl_name );
+ free ( slap_listeners[l] );
}
+ free ( slap_listeners );
+ slap_listeners = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
#endif
return rc;
}
-
- /* wait for the listener thread to complete */
- ldap_pvt_thread_join( listener_tid, (void *) NULL );
+
+ /* wait for the listener thread to complete */
+ ldap_pvt_thread_join( listener_tid, (void *) NULL );
}
#else
/* experimental code */
void slapd_add_internal(ber_socket_t s) {
slapd_add(s);
}
+
+Listener ** slapd_get_listeners(void) {
+ return slap_listeners;
+}
projects / openldap / blobdiff