+/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <ac/unistd.h>
#include "ldap_pvt.h"
-#include "ldap_defaults.h"
+#include "lutil.h"
#include "slap.h"
#ifdef HAVE_TCPD
int deny_severity = LOG_NOTICE;
#endif /* TCP Wrappers */
+#ifdef LDAP_PF_LOCAL
+#include <sys/stat.h>
+#endif /* LDAP_PF_LOCAL */
+
/* globals */
time_t starttime;
ber_socket_t dtblsize;
+#ifdef LDAP_PF_LOCAL
+typedef union slap_sockaddr {
+ struct sockaddr sa_addr;
+ struct sockaddr_in sa_in_addr;
+ struct sockaddr_un sa_un_addr;
+} Sockaddr;
+#endif /* LDAP_PF_LOCAL */
+
typedef struct slap_listener {
char* sl_url;
char* sl_name;
int sl_is_tls;
#endif
ber_socket_t sl_sd;
+#ifdef LDAP_PF_LOCAL
+ Sockaddr sl_sa;
+#define sl_addr sl_sa.sa_in_addr
+#else
struct sockaddr_in sl_addr;
+#endif /* LDAP_PF_LOCAL */
} Listener;
Listener **slap_listeners = NULL;
-#ifdef HAVE_WINSOCK2
-/* in nt_main.c */
-extern ldap_pvt_thread_cond_t started_event;
-
-/* forward reference */
-static void hit_socket(void);
-/* In wsa_err.c */
-char *WSAGetLastErrorString();
-static ldap_pvt_thread_t hit_tid;
+static ber_socket_t wake_sds[2];
+#ifdef NO_THREADS
+static int waking;
#define WAKE_LISTENER(w) \
-do {\
- if( w ) {\
- ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );\
- hit_socket(); \
- }\
-} while(0)
+((w && !waking) ? tcp_write( wake_sds[1], "0", 1 ), waking=1 : 0)
#else
#define WAKE_LISTENER(w) \
-do {\
- if( w ) {\
- ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );\
- }\
-} while(0)
+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
volatile sig_atomic_t slapd_shutdown = 0;
-static int sel_exit_fd;
static ldap_pvt_thread_t listener_tid;
-static volatile sig_atomic_t slapd_listener = 0;
static struct slap_daemon {
ldap_pvt_thread_mutex_t sd_mutex;
*/
void slapd_remove(ber_socket_t s, int wake) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- WAKE_LISTENER(wake);
Debug( LDAP_DEBUG_CONNS, "daemon: removing %ld%s%s\n",
(long) s,
FD_CLR( s, &slap_daemon.sd_writers );
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
+ WAKE_LISTENER(wake);
}
void slapd_clr_write(ber_socket_t s, int wake) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- WAKE_LISTENER(wake);
assert( FD_ISSET( s, &slap_daemon.sd_actives) );
FD_CLR( s, &slap_daemon.sd_writers );
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
-
- if( wake ) {
- ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
- }
+ WAKE_LISTENER(wake);
}
void slapd_set_write(ber_socket_t s, int wake) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- WAKE_LISTENER(wake);
assert( FD_ISSET( s, &slap_daemon.sd_actives) );
- FD_SET( (unsigned) s, &slap_daemon.sd_writers );
+ if (!FD_ISSET(s, &slap_daemon.sd_writers))
+ FD_SET( (unsigned) s, &slap_daemon.sd_writers );
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
-
- if( wake ) {
- ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
- }
+ WAKE_LISTENER(wake);
}
void slapd_clr_read(ber_socket_t s, int wake) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- WAKE_LISTENER(wake);
assert( FD_ISSET( s, &slap_daemon.sd_actives) );
FD_CLR( s, &slap_daemon.sd_readers );
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
-
- if( wake ) {
- ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
- }
+ WAKE_LISTENER(wake);
}
void slapd_set_read(ber_socket_t s, int wake) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- WAKE_LISTENER(wake);
assert( FD_ISSET( s, &slap_daemon.sd_actives) );
- FD_SET( s, &slap_daemon.sd_readers );
+ if (!FD_ISSET(s, &slap_daemon.sd_readers))
+ FD_SET( s, &slap_daemon.sd_readers );
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
-
- if( wake ) {
- ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
- }
+ WAKE_LISTENER(wake);
}
static void slapd_close(ber_socket_t s) {
}
-Listener *
-open_listener(
- const char* url,
- int port,
- int tls_port )
+static Listener * open_listener( const char* url )
{
+ int tmp, rc;
Listener l;
Listener *li;
LDAPURLDesc *lud;
- int tmp, rc;
- int err;
- char *errstr;
char *s;
+ int port;
rc = ldap_url_parse( url, &lud );
}
#ifndef HAVE_TLS
- if( lud->lud_ldaps ) {
+ if( lud->lud_properties & LDAP_URL_USE_SSL ) {
Debug( LDAP_DEBUG_ANY,
"daemon: TLS not supported (%s)\n",
url, 0, 0 );
}
if(! lud->lud_port ) {
- lud->lud_port = port;
+ lud->lud_port = LDAP_PORT;
}
#else
- l.sl_is_tls = lud->lud_ldaps;
+ l.sl_is_tls = (lud->lud_properties & LDAP_URL_USE_SSL);
if(! lud->lud_port ) {
- lud->lud_port = lud->lud_ldaps ? tls_port : port;
+ lud->lud_port = (lud->lud_properties & LDAP_URL_USE_SSL) ? LDAPS_PORT : LDAP_PORT;
}
#endif
+#ifdef LDAP_PF_LOCAL
+ if (lud->lud_protocol == LDAP_PROTO_LOCAL) {
+ port = 0;
+ (void) memset( (void *)&l.sl_sa.sa_un_addr, '\0', sizeof(l.sl_sa.sa_un_addr) );
+
+ l.sl_sa.sa_un_addr.sun_family = AF_UNIX;
+
+ /* hack: overload the host to be the path */
+ if ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) {
+ strcpy( l.sl_sa.sa_un_addr.sun_path, "/tmp/.ldap-sock" );
+ } else {
+ if ( strlen(lud->lud_host) > (sizeof(l.sl_sa.sa_un_addr.sun_path) - 1) ) {
+ Debug( LDAP_DEBUG_ANY, "domain socket path (%s) too long in URL: %s",
+ lud->lud_host, url, 0);
+ ldap_free_urldesc( lud );
+ return NULL;
+ }
+ strcpy( l.sl_sa.sa_un_addr.sun_path, lud->lud_host );
+ }
+ unlink( l.sl_sa.sa_un_addr.sun_path );
+#if 0
+ /* I don't think we need to set this. */
+ l.sl_sa.sa_un_addr.sun_len = sizeof( l.sl_sa.sa_un_addr.sun_len ) +
+ sizeof( l.sl_sa.sa_un_addr.sun_family ) +
+ strlen( l.sl_sa.sa_un_addr.sun_path ) + 1;
+#endif
+ } else {
+#endif /* LDAP_PF_LOCAL */
+
port = lud->lud_port;
(void) memset( (void*) &l.sl_addr, '\0', sizeof(l.sl_addr) );
sizeof( l.sl_addr.sin_addr ) );
}
}
+#ifdef LDAP_PF_LOCAL
+ }
+#endif /* LDAP_PF_LOCAL */
ldap_free_urldesc( lud );
-
+#ifdef LDAP_PF_LOCAL
+ l.sl_sd = socket( l.sl_sa.sa_addr.sa_family, SOCK_STREAM, 0 );
+ if ( l.sl_sd == AC_SOCKET_INVALID ) {
+#else
if ( (l.sl_sd = socket( AF_INET, SOCK_STREAM, 0 )) == AC_SOCKET_INVALID ) {
- SOCK_ERR(err, errstr);
+#endif /* LDAP_PF_LOCAL */
+ int err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"daemon: socket() failed errno=%d (%s)\n", err,
- errstr, 0 );
+ sock_errstr(err), 0 );
return NULL;
}
}
#endif
+#ifdef LDAP_PF_LOCAL
+ /* for IP sockets only */
+ if ( l.sl_sa.sa_addr.sa_family == AF_INET ) {
+#endif /* LDAP_PF_LOCAL */
+
#ifdef SO_REUSEADDR
/* enable address reuse */
tmp = 1;
- if ( setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
- (char *) &tmp, sizeof(tmp) ) == -1 )
- {
- SOCK_ERR(err, errstr);
+ rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR,
+ (char *) &tmp, sizeof(tmp) );
+ if ( rc == AC_SOCKET_ERROR ) {
+ int err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
- (long) l.sl_sd, err, errstr );
+ (long) l.sl_sd, err, sock_errstr(err) );
}
#endif
#ifdef SO_KEEPALIVE
/* enable keep alives */
tmp = 1;
- if ( setsockopt( l.sl_sd, SOL_SOCKET, SO_KEEPALIVE,
- (char *) &tmp, sizeof(tmp) ) == -1 )
- {
- SOCK_ERR(err, errstr);
+ rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_KEEPALIVE,
+ (char *) &tmp, sizeof(tmp) );
+ if ( rc == AC_SOCKET_ERROR ) {
+ int err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"slapd(%ld): setsockopt(SO_KEEPALIVE) failed errno=%d (%s)\n",
- (long) l.sl_sd, err, errstr );
+ (long) l.sl_sd, err, sock_errstr(err) );
}
#endif
#ifdef TCP_NODELAY
/* enable no delay */
tmp = 1;
- if ( setsockopt( l.sl_sd, IPPROTO_TCP, TCP_NODELAY,
- (char *)&tmp, sizeof(tmp) ) )
- {
- SOCK_ERR(err, errstr);
+ rc = setsockopt( l.sl_sd, IPPROTO_TCP, TCP_NODELAY,
+ (char *)&tmp, sizeof(tmp) );
+ if ( rc == AC_SOCKET_ERROR ) {
+ int err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"slapd(%ld): setsockopt(TCP_NODELAY) failed errno=%d (%s)\n",
- (long) l.sl_sd, err, errstr );
+ (long) l.sl_sd, err, sock_errstr(err) );
}
#endif
- if ( bind( l.sl_sd, (struct sockaddr *) &l.sl_addr, sizeof(l.sl_addr) ) == -1 ) {
- SOCK_ERR(err, errstr);
+#ifdef LDAP_PF_LOCAL
+ /* close conditional */
+ }
+
+ switch ( l.sl_sa.sa_addr.sa_family ) {
+ case AF_UNIX:
+ rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
+ sizeof(l.sl_sa.sa_un_addr) );
+ break;
+ case AF_INET:
+ rc = bind( l.sl_sd, (struct sockaddr *)&l.sl_sa,
+ sizeof(l.sl_sa.sa_in_addr) );
+ break;
+ default:
+ rc = AC_SOCKET_ERROR;
+ errno = EINVAL;
+ break;
+ }
+#else
+ rc = bind( l.sl_sd, (struct sockaddr *) &l.sl_addr, sizeof(l.sl_addr) );
+#endif /* LDAP_PF_LOCAL */
+ if ( rc == AC_SOCKET_ERROR ) {
+ int err = sock_errno();
Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
- (long) l.sl_sd, err, errstr );
+ (long) l.sl_sd, err, sock_errstr(err) );
tcp_close( l.sl_sd );
return NULL;
}
-
+#ifdef LDAP_PF_LOCAL
+ if ( l.sl_sa.sa_addr.sa_family == AF_UNIX ) {
+ if ( chmod( l.sl_sa.sa_un_addr.sun_path, S_IRWXU ) < 0 ) {
+ int err = sock_errno();
+ Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
+ (long) l.sl_sd, err, sock_errstr(err) );
+ tcp_close( l.sl_sd );
+ return NULL;
+ }
+ }
+#endif /* LDAP_PF_LOACL */
l.sl_url = ch_strdup( url );
-
+#ifdef LDAP_PF_LOCAL
+ switch ( l.sl_sa.sa_addr.sa_family ) {
+ case AF_UNIX:
+ l.sl_name = ch_malloc( strlen(l.sl_sa.sa_un_addr.sun_path) + sizeof("PATH=") );
+ sprintf( l.sl_name, "PATH=%s", l.sl_sa.sa_un_addr.sun_path );
+ break;
+ case AF_INET:
+ l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
+ s = inet_ntoa( l.sl_addr.sin_addr );
+ sprintf( l.sl_name, "IP=%s:%d",
+ s != NULL ? s : "unknown" , port );
+ break;
+ default:
+ l.sl_name = ch_strdup( "UNKNOWN" );
+ break;
+ }
+#else
l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65336") );
s = inet_ntoa( l.sl_addr.sin_addr );
sprintf( l.sl_name, "IP=%s:%d",
s != NULL ? s : "unknown" , port );
+#endif /* LDAP_PF_LOCAL */
li = ch_malloc( sizeof( Listener ) );
*li = l;
static int sockinit(void);
static int sockdestroy(void);
-int slapd_daemon_init(char *urls, int port, int tls_port )
+int slapd_daemon_init( const char *urls )
{
int i, rc;
- int err;
- char *errstr;
char **u;
-#ifndef HAVE_TLS
- assert( tls_port == 0 );
-#endif
-
- Debug( LDAP_DEBUG_ARGS, "daemon_init: %s (%d/%d)\n",
- urls ? urls : "<null>", port, tls_port );
+ Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n",
+ urls ? urls : "<null>", 0, 0 );
- if( rc = sockinit() ) {
+ if( (rc = sockinit()) != 0 ) {
return rc;
}
}
#endif /* !FD_SETSIZE */
- /* set up a datagram socket connected to itself. we write a byte
- * on this socket whenever we catch a signal. The main loop will
- * be select'ing on this socket, and will wake up when this byte
- * arrives.
+ /* open a pipe (or something equivalent connected to itself).
+ * we write a byte on this fd whenever we catch a signal. The main
+ * loop will be select'ing on this socket, and will wake up when
+ * this byte arrives.
*/
- if( (sel_exit_fd = socket( AF_INET, SOCK_DGRAM, 0 )) < 0 )
- {
- SOCK_ERR(err, errstr);
+ if( (rc = lutil_pair( wake_sds )) < 0 ) {
Debug( LDAP_DEBUG_ANY,
- "daemon: socket() failed errno=%d (%s)\n", err,
- errstr, 0 );
- return sel_exit_fd;
- } else {
- struct sockaddr_in si;
- int len = sizeof(si);
-
- (void) memset( (void*) &si, 0, len );
-
- si.sin_family = AF_INET;
- si.sin_port = 0;
- si.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
- if( rc = bind( sel_exit_fd, (struct sockaddr *)&si, len ) )
- {
- SOCK_ERR(err, errstr);
- Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
- (long) sel_exit_fd, err, errstr );
- tcp_close( sel_exit_fd );
- return rc;
- }
- if( rc = getsockname( sel_exit_fd, (struct sockaddr *)&si, &len))
- {
- SOCK_ERR(err, errstr);
- Debug( LDAP_DEBUG_ANY, "daemon: getsockname(%ld) failed errno=%d (%s)\n",
- (long) sel_exit_fd, err, errstr );
- tcp_close( sel_exit_fd );
- return rc;
- }
- if( rc = connect( sel_exit_fd, (struct sockaddr *)&si, len))
- {
- SOCK_ERR(err, errstr);
- Debug( LDAP_DEBUG_ANY, "daemon: connect(%ld) failed errno=%d (%s)\n",
- (long) sel_exit_fd, err, errstr );
- tcp_close( sel_exit_fd );
- return rc;
- }
+ "daemon: lutil_pair() failed rc=%d\n", rc, 0, 0 );
+ return rc;
}
FD_ZERO( &slap_daemon.sd_readers );
slap_listeners = ch_malloc( (i+1)*sizeof(Listener *) );
for(i = 0; u[i] != NULL; i++ ) {
- slap_listeners[i] = open_listener( u[i], port, tls_port );
+ slap_listeners[i] = open_listener( u[i] );
if( slap_listeners[i] == NULL ) {
charray_free( u );
slapd_daemon_destroy(void)
{
connections_destroy();
+ tcp_close( wake_sds[1] );
+ tcp_close( wake_sds[0] );
sockdestroy();
return 0;
}
)
{
int l;
- int err;
- char *errstr;
-
+ time_t last_idle_check = slap_get_time();
time( &starttime );
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
continue;
if ( listen( slap_listeners[l]->sl_sd, 5 ) == -1 ) {
- SOCK_ERR(err, errstr);
+ int err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"daemon: listen(%s, 5) failed errno=%d (%s)\n",
- (long) slap_listeners[l]->sl_url, err,
- errstr );
+ slap_listeners[l]->sl_url, err,
+ sock_errstr(err) );
return( (void*)-1 );
}
slapd_add( slap_listeners[l]->sl_sd );
}
-#ifdef HAVE_WINSOCK
+#ifdef HAVE_NT_SERVICE_MANAGER
if ( started_event != NULL ) {
ldap_pvt_thread_cond_signal( &started_event );
}
int ebadf = 0;
#define SLAPD_IDLE_CHECK_LIMIT 4
- time_t last_idle_check = slap_get_time();
- time_t now;
+ time_t now = slap_get_time();
fd_set readfds;
fd_set writefds;
-
+#ifdef LDAP_PF_LOCAL
+ Sockaddr from;
+/* minimize impact, undefine later. */
+#define sin_addr sa_in_addr.sin_addr
+#define sin_port sa_in_addr.sin_port
+#else
struct sockaddr_in from;
-#if defined(SLAPD_RLOOKUPS) || defined(HAVE_TCPD)
+#endif /* LDAP_PF_LOCAL */
+#if defined(SLAPD_RLOOKUPS)
struct hostent *hp;
#endif
struct timeval zero;
memcpy( &readfds, &slap_daemon.sd_readers, sizeof(fd_set) );
memcpy( &writefds, &slap_daemon.sd_writers, sizeof(fd_set) );
#endif
- FD_SET( sel_exit_fd, &readfds );
+ assert(!FD_ISSET(wake_sds[0], &readfds));
+ FD_SET( wake_sds[0], &readfds );
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
continue;
- FD_SET( slap_listeners[l]->sl_sd, &readfds );
+ if (!FD_ISSET(slap_listeners[l]->sl_sd, &readfds))
+ FD_SET( slap_listeners[l]->sl_sd, &readfds );
}
#ifndef HAVE_WINSOCK
NULL, tvp ))
{
case -1: { /* failure - try again */
- SOCK_ERR(err, errstr);
- if( err == EBADF && ++ebadf < SLAPD_EBADF_LIMIT) {
- continue;
+ int err = sock_errno();
+
+ if( err == EBADF
+#ifdef HAVE_WINSOCK
+ || err == WSAENOTSOCK /* you'd think this would be EBADF */
+#endif
+ ) {
+ if (++ebadf < SLAPD_EBADF_LIMIT)
+ continue;
}
if( err != EINTR ) {
Debug( LDAP_DEBUG_CONNS,
"daemon: select failed (%d): %s\n",
- err, errstr, 0 );
+ err, sock_errstr(err), 0 );
slapd_shutdown = -1;
}
/* FALL THRU */
}
- if( FD_ISSET( sel_exit_fd, &readfds ) )
- {
- char c;
- tcp_read( sel_exit_fd, &c, 1 );
+ if( FD_ISSET( wake_sds[0], &readfds ) ) {
+ char c[BUFSIZ];
+ tcp_read( wake_sds[0], c, sizeof(c) );
+#ifdef NO_THREADS
+ waking = 0;
+#endif
continue;
}
+
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
ber_int_t s;
socklen_t len = sizeof(from);
char *dnsname;
char *peeraddr;
-
+#ifdef LDAP_PF_LOCAL
+ char peername[MAXPATHLEN + sizeof("PATH=")];
+#else
char peername[sizeof("IP=255.255.255.255:65336")];
-
+#endif /* LDAP_PF_LOCAL */
if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
continue;
if ( (s = accept( slap_listeners[l]->sl_sd,
(struct sockaddr *) &from, &len )) == AC_SOCKET_INVALID )
{
- SOCK_ERR(err, errstr);
+ int err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"daemon: accept(%ld) failed errno=%d (%s)\n",
(long) slap_listeners[l]->sl_sd, err,
- errstr );
+ sock_errstr(err) );
continue;
}
len = sizeof(from);
if ( getpeername( s, (struct sockaddr *) &from, &len ) != 0 ) {
- SOCK_ERR(err, errstr);
+ int err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"daemon: getpeername( %ld ) failed: errno=%d (%s)\n",
- (long) s, err, errstr );
+ (long) s, err, sock_errstr(err) );
slapd_close(s);
continue;
}
+#ifdef LDAP_PF_LOCAL
+ switch ( from.sa_addr.sa_family ) {
+ case AF_UNIX:
+ sprintf( peername, "PATH=%s", from.sa_un_addr.sun_path );
+ break;
+ case AF_INET:
+#endif /* LDAP_PF_LOCAL */
peeraddr = inet_ntoa( from.sin_addr );
sprintf( peername, "IP=%s:%d",
peeraddr != NULL ? peeraddr : "unknown",
(unsigned) ntohs( from.sin_port ) );
-#if defined(SLAPD_RLOOKUPS) || defined(HAVE_TCPD)
+#if defined(SLAPD_RLOOKUPS)
hp = gethostbyaddr( (char *)
- &(from.sin_addr.s_addr),
- sizeof(from.sin_addr.s_addr), AF_INET );
+ &(from.sin_addr),
+ sizeof(from.sin_addr), AF_INET );
if(hp) {
dnsname = ldap_pvt_str2lower( hp->h_name );
continue;
}
#endif /* HAVE_TCPD */
+#ifdef LDAP_PF_LOCAL
+ break;
+ default:
+ slapd_close(s);
+ continue;
+ }
+#undef sin_addr
+#undef sin_port
+#endif /* LDAP_PF_LOCAL */
if( (id = connection_init(s,
slap_listeners[l]->sl_url,
}
#else
for ( i = 0; i < nfds; i++ ) {
- int a, r, w;
+ int r, w;
int is_listener = 0;
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
0, 0, 0 );
} else if ( slapd_shutdown < 0 ) {
+#ifdef HAVE_NT_SERVICE_MANAGER
+ if (slapd_shutdown == -1)
+ Debug( LDAP_DEBUG_TRACE,
+ "daemon: shutdown initiated by Service Manager.\n",
+ 0, 0, 0);
+ else
+#endif
Debug( LDAP_DEBUG_TRACE,
"daemon: abnormal condition, shutdown initiated.\n",
0, 0, 0 );
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( slap_listeners[l]->sl_sd != AC_SOCKET_INVALID ) {
+#ifdef LDAP_PF_LOCAL
+ if ( slap_listeners[l]->sl_sa.sa_addr.sa_family == AF_UNIX ) {
+ unlink( slap_listeners[l]->sl_sa.sa_un_addr.sun_path );
+ }
+#endif /* LDAP_PF_LOCAL */
slapd_close( slap_listeners[l]->sl_sd );
break;
}
return 0;
}
-void hit_socket(void)
-{
- ber_socket_t s;
- int on = 1;
- extern struct sockaddr_in bind_addr;
-
- /* throw something at the socket to terminate the select() in the daemon thread. */
- if (( s = socket( AF_INET, SOCK_STREAM, 0 )) == AC_SOCKET_INVALID )
- Debug( LDAP_DEBUG_ANY,
- "slap_set_shutdown: socket failed\n\tWSAGetLastError=%d (%s)\n",
- WSAGetLastError(), WSAGetLastErrorString(), 0 );
-
- if ( ioctlsocket( s, FIONBIO, &on ) == -1 )
- Debug( LDAP_DEBUG_ANY,
- "slap_set_shutdown:FIONBIO ioctl on %d faled\n\tWSAGetLastError=%d (%s)\n",
- s, WSAGetLastError(), WSAGetLastError() );
-
- bind_addr.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
-
- if ( connect( s, (struct sockaddr *)&bind_addr, sizeof( struct sockaddr_in )) == SOCKET_ERROR ) {
- Debug( LDAP_DEBUG_ANY,
- "hit_socket: error on connect: %d\n",
- WSAGetLastError(), 0, 0 );
- /* we can probably expect some error to occur here, mostly WSAEWOULDBLOCK */
- }
-
- tcp_close(s);
-}
-
#elif HAVE_WINSOCK
static int sockinit(void)
-{ WSADATA wsaData;
+{
+ WSADATA wsaData;
if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
return -1;
}
}
#endif
-void
-slap_set_shutdown( int sig )
+RETSIGTYPE
+slap_sig_shutdown( int sig )
{
- int l;
- slapd_shutdown = sig;
-#ifndef HAVE_WINSOCK
- if(slapd_listener) {
- ldap_pvt_thread_kill( listener_tid, LDAP_SIGUSR1 );
- }
-#else
- /* trying to "hit" the socket seems to always get a */
- /* EWOULDBLOCK error, so just close the listen socket to */
- /* break out of the select since we're shutting down anyway */
- for ( l = 0; slap_listeners[l] != NULL; l++ ) {
- if ( slap_listeners[l]->sl_sd >= 0 ) {
- tcp_close( slap_listeners[l]->sl_sd );
- }
- }
+ Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: signal %d\n", sig, 0, 0);
+
+ /*
+ * If the NT Service Manager is controlling the server, we don't
+ * want SIGBREAK to kill the server. For some strange reason,
+ * SIGBREAK is generated when a user logs out.
+ */
+
+#if HAVE_NT_SERVICE_MANAGER && SIGBREAK
+ if (is_NT_Service && sig == SIGBREAK)
+ Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: SIGBREAK ignored.\n",
+ 0, 0, 0);
+ else
#endif
- tcp_write( sel_exit_fd, "0", 1 );
+ slapd_shutdown = sig;
+
+ WAKE_LISTENER(1);
+
/* reinstall self */
- (void) SIGNAL( sig, slap_set_shutdown );
+ (void) SIGNAL( sig, slap_sig_shutdown );
}
-void
-slap_do_nothing( int sig )
+RETSIGTYPE
+slap_sig_wake( int sig )
{
+ WAKE_LISTENER(1);
+
/* reinstall self */
- (void) SIGNAL( sig, slap_do_nothing );
+ (void) SIGNAL( sig, slap_sig_wake );
}
projects / openldap / blobdiff