+/* $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
*/
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;
static ber_socket_t wake_sds[2];
+#ifdef NO_THREADS
+static int waking;
+#define WAKE_LISTENER(w) \
+((w && !waking) ? tcp_write( wake_sds[1], "0", 1 ), waking=1 : 0)
+#else
#define WAKE_LISTENER(w) \
do { if (w) tcp_write( wake_sds[1], "0", 1 ); } while(0)
+#endif
-#ifdef HAVE_WINSOCK2
+#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
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
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 );
WAKE_LISTENER(wake);
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
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 );
WAKE_LISTENER(wake);
}
-static 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;
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 ) {
+#endif /* LDAP_PF_LOCAL */
int err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"daemon: socket() failed errno=%d (%s)\n", err,
}
#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;
}
#endif
+#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",
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;
char **u;
-#ifndef HAVE_TLS
- assert( tls_port == 0 );
-#endif
+ Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n",
+ urls ? urls : "<null>", 0, 0 );
- Debug( LDAP_DEBUG_ARGS, "daemon_init: %s (%d/%d)\n",
- urls ? urls : "<null>", port, tls_port );
-
- if( rc = sockinit() ) {
+ if( (rc = sockinit()) != 0 ) {
return rc;
}
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_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 );
}
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
+ 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
case -1: { /* failure - try again */
int err = sock_errno();
- if( err == EBADF && ++ebadf < SLAPD_EBADF_LIMIT) {
- continue;
+ 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 ) {
}
if( FD_ISSET( wake_sds[0], &readfds ) ) {
- char c;
- tcp_read( wake_sds[0], &c, 1 );
+ char c[BUFSIZ];
+ tcp_read( wake_sds[0], c, sizeof(c) );
+#ifdef NO_THREADS
+ waking = 0;
+#endif
continue;
}
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;
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,
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;
}
RETSIGTYPE
slap_sig_shutdown( int sig )
{
+ 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
slapd_shutdown = sig;
+
WAKE_LISTENER(1);
/* reinstall self */
projects / openldap / blobdiff