]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/main.c
When recreating a database from an ldif file created by ldbmcat,
[openldap] / servers / slapd / main.c
index 258923e61efb1573dd8ad97d576195e92ae3ef1c..6d310de8c3bd5c1a8e8bf2d9e3c9d3bd969c6742 100644 (file)
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include "portable.h"
+
+#include <ac/signal.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+#include <ac/unistd.h>
+#include <ac/wait.h>
+#include <ac/signal.h>
+#include <ac/errno.h>
+
+#include "ldap_defaults.h"
 #include "slap.h"
-#include "ldapconfig.h"
+#include "lutil.h"
 
-extern void    slapd_daemon();
-extern int     lber_debug;
+#ifdef LDAP_SIGCHLD
+static RETSIGTYPE wait4child( int sig );
+#endif
 
-extern char Versionstr[];
+#ifdef HAVE_WINSOCK
+#define MAIN_RETURN(x) return
+struct sockaddr_in     bind_addr;
 
+/* in nt_main.c */
+extern SERVICE_STATUS                  SLAPDServiceStatus;
+extern SERVICE_STATUS_HANDLE   hSLAPDServiceStatus;
+extern ldap_pvt_thread_cond_t  started_event,          stopped_event;
+extern int       is_NT_Service;
 
-/*
- * read-only global variables or variables only written by the listener
- * thread (after they are initialized) - no need to protect them with a mutex.
- */
-int            ldap_debug = 0;
-#ifdef LDAP_DEBUG
-int            ldap_syslog = LDAP_DEBUG_STATS;
+void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls );
+void LogSlapdStoppedEvent( char *svc );
+
+void CommenceStartupProcessing( LPCTSTR serviceName,
+                                                          void(*stopper)(int));
+void ReportSlapdShutdownComplete( void );
+void *getRegParam( char *svc, char *value );
+
+#define SERVICE_EXIT( e, n ) \
+               if ( is_NT_Service ) \
+{ \
+                       SLAPDServiceStatus.dwWin32ExitCode                              = e; \
+                       SLAPDServiceStatus.dwServiceSpecificExitCode    = n; \
+} 
 #else
-int            ldap_syslog;
-#endif
-int            ldap_syslog_level = LOG_DEBUG;
-int            udp;
-int            slapd_shutdown;
-char           *default_referral;
-char           *configfile;
-time_t         starttime;
-pthread_t      listener_tid;
-int            g_argc;
-char           **g_argv;
-/*
- * global variables that need mutex protection
- */
-time_t         currenttime;
-pthread_mutex_t        currenttime_mutex;
-int            active_threads;
-pthread_mutex_t        active_threads_mutex;
-pthread_mutex_t        new_conn_mutex;
-long           ops_initiated;
-long           ops_completed;
-int            num_conns;
-pthread_mutex_t        ops_mutex;
-long           num_entries_sent;
-long           num_bytes_sent;
-pthread_mutex_t        num_sent_mutex;
+#define SERVICE_EXIT( e, n )
+#define MAIN_RETURN(x) return(x)
+#endif
+
 /*
- * these mutexes must be used when calling the entry2str()
- * routine since it returns a pointer to static data.
+ * when more than one slapd is running on one machine, each one might have
+ * it's own LOCAL for syslogging and must have its own pid/args files
  */
-pthread_mutex_t        entry2str_mutex;
-pthread_mutex_t        replog_mutex;
 
-static
-usage( name )
-    char       *name;
+#ifndef HAVE_MKVERSION
+const char Versionstr[] =
+       OPENLDAP_PACKAGE " " OPENLDAP_VERSION " Standalone LDAP Server (slapd)";
+#endif
+
+#ifdef LOG_LOCAL4
+
+#define DEFAULT_SYSLOG_USER  LOG_LOCAL4
+
+typedef struct _str2intDispatch {
+       char    *stringVal;
+       int      abbr;
+       int      intVal;
+} STRDISP, *STRDISP_P;
+
+
+/* table to compute syslog-options to integer */
+static STRDISP  syslog_types[] = {
+    { "LOCAL0",         6, LOG_LOCAL0 },
+    { "LOCAL1",         6, LOG_LOCAL1 },
+    { "LOCAL2",         6, LOG_LOCAL2 },
+    { "LOCAL3",         6, LOG_LOCAL3 },
+    { "LOCAL4",         6, LOG_LOCAL4 },
+    { "LOCAL5",         6, LOG_LOCAL5 },
+    { "LOCAL6",         6, LOG_LOCAL6 },
+    { "LOCAL7",         6, LOG_LOCAL7 },
+    { NULL }
+};
+
+static int   cnvt_str2int( char *, STRDISP_P, int );
+
+#endif  /* LOG_LOCAL4 */
+
+
+static void
+usage( char *name )
 {
-       fprintf( stderr, "usage: %s [-d ?|debuglevel] [-f configfile] [-p portnumber] [-s sysloglevel]\n", name );
+       fprintf( stderr,
+               "usage: %s options\n", name );
+       fprintf( stderr,
+#if LDAP_CONNECTIONLESS
+               "\t-c\t\tEnable (experimental) Connectionless LDAP\n"
+#endif
+               "\t-d level\tDebug Level" "\n"
+               "\t-f filename\tConfiguration File\n"
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+               "\t-g group\tGroup (id or name) to ran as\n"
+#endif
+               "\t-h URLs\tList of URLs to serve"
+#ifdef LOG_LOCAL4
+               "\t-l sysloguser\tSyslog User (default: LOCAL4)\n"
+#endif
+#ifdef HAVE_WINSOCK
+               "\t-n NTserviceName\tNT service name\n"
+#endif
+
+               "\t-p port\tLDAP Port\n"
+#ifdef HAVE_TLS
+               "\t-P port\tLDAP over TLS Port\n"
+#endif
+               "\t-s level\tSyslog Level\n"
+#ifdef SLAPD_BDB2
+               "\t-t\t\tEnable BDB2 timing\n"
+#endif
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+               "\t-u user\tUser (id or name) to ran as\n"
+#endif
+    );
 }
 
-main( argc, argv )
-    int                argc;
-    char       **argv;
+#ifdef HAVE_WINSOCK
+void WINAPI ServiceMain( DWORD argc, LPTSTR *argv )
+#else
+int main( int argc, char **argv )
+#endif
 {
        int             i;
-       int             inetd = 0;
-       int             port;
-       char            *myname;
-       Backend         *be = NULL;
-       FILE            *fp = NULL;
-       extern char     *optarg;
-
-       configfile = SLAPD_DEFAULT_CONFIGFILE;
-       port = LDAP_PORT;
+       int             rc;
+       char *urls = NULL;
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+       char *username = NULL;
+       char *groupname = NULL;
+#endif
+#ifdef LOG_LOCAL4
+    int     syslogUser = DEFAULT_SYSLOG_USER;
+#endif
+#ifdef HAVE_WINSOCK
+       char        *NTservice  = SERVICE_NAME;
+       char            *configfile = ".\\slapd.conf";
+#else
+       char            *configfile = SLAPD_DEFAULT_CONFIGFILE;
+#endif
+       char        *serverName;
+       int         serverMode = SLAP_SERVER_MODE;
+
+       int port = LDAP_PORT;
+#ifdef HAVE_TLS
+       int tls_port = LDAPS_PORT;
+#else
+       int tls_port = 0;
+#endif
+
        g_argc = argc;
        g_argv = argv;
 
-       while ( (i = getopt( argc, argv, "d:f:ip:s:u" )) != EOF ) {
+#ifdef HAVE_WINSOCK
+       {
+               int *i;
+               char *newConfigFile;
+               ldap_debug = 0xffff;
+               if ( is_NT_Service ) CommenceStartupProcessing( NTservice, slap_set_shutdown );
+               i = (int*)getRegParam( NULL, "Port" );
+               if ( i != NULL )
+               {
+                       port = *i;
+                       Debug ( LDAP_DEBUG_ANY, "new port from registry is: %d\n", port, 0, 0 );
+               }
+#ifdef HAVE_TLS
+               i = (int*)getRegParam( NULL, "TLSPort" );
+               if ( i != NULL )
+               {
+                       tls_port = *i;
+                       Debug ( LDAP_DEBUG_ANY, "new TLS port from registry is: %d\n", tls_port, 0, 0 );
+               }
+#endif
+               i = (int*)getRegParam( NULL, "DebugLevel" );
+               if ( i != NULL ) 
+               {
+                       slap_debug = *i;
+                       Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 );
+               }
+               newConfigFile = (char*)getRegParam( NULL, "ConfigFile" );
+               if ( newConfigFile != NULL ) 
+               {
+                       configfile = newConfigFile;
+                       Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", configfile, 0, 0 );
+               }
+       }
+#endif
+
+       while ( (i = getopt( argc, argv,
+                            "d:f:h:p:s:u"
+#ifdef LOG_LOCAL4
+                            "l:"
+#endif
+#ifdef SLAPD_BDB2
+                            "t"
+#endif
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+                            "u:g:"
+#endif
+#ifdef LDAP_CONNECTIONLESS
+                                "c"
+#endif
+#ifdef HAVE_WINSOCK
+                                "n:"
+#endif
+#ifdef HAVE_TLS
+                            "P:"
+#endif
+                            )) != EOF ) {
                switch ( i ) {
+               case 'h':       /* listen URLs */
+                       urls = ch_strdup( optarg );
+            break;
+
 #ifdef LDAP_DEBUG
                case 'd':       /* turn on debugging */
-                       if ( optarg[0] == '?' ) {
-                               printf( "Debug levels:\n" );
-                               printf( "\tLDAP_DEBUG_TRACE\t%d\n",
-                                   LDAP_DEBUG_TRACE );
-                               printf( "\tLDAP_DEBUG_PACKETS\t%d\n",
-                                   LDAP_DEBUG_PACKETS );
-                               printf( "\tLDAP_DEBUG_ARGS\t\t%d\n",
-                                   LDAP_DEBUG_ARGS );
-                               printf( "\tLDAP_DEBUG_CONNS\t%d\n",
-                                   LDAP_DEBUG_CONNS );
-                               printf( "\tLDAP_DEBUG_BER\t\t%d\n",
-                                   LDAP_DEBUG_BER );
-                               printf( "\tLDAP_DEBUG_FILTER\t%d\n",
-                                   LDAP_DEBUG_FILTER );
-                               printf( "\tLDAP_DEBUG_CONFIG\t%d\n",
-                                   LDAP_DEBUG_CONFIG );
-                               printf( "\tLDAP_DEBUG_ACL\t\t%d\n",
-                                   LDAP_DEBUG_ACL );
-                               printf( "\tLDAP_DEBUG_STATS\t%d\n",
-                                   LDAP_DEBUG_STATS );
-                               printf( "\tLDAP_DEBUG_STATS2\t%d\n",
-                                   LDAP_DEBUG_STATS2 );
-                               printf( "\tLDAP_DEBUG_SHELL\t%d\n",
-                                   LDAP_DEBUG_SHELL );
-                               printf( "\tLDAP_DEBUG_PARSE\t%d\n",
-                                   LDAP_DEBUG_PARSE );
-                               printf( "\tLDAP_DEBUG_ANY\t\t%d\n",
-                                   LDAP_DEBUG_ANY );
-                               exit( 0 );
-                       } else {
-                               ldap_debug |= atoi( optarg );
-                               lber_debug = (ldap_debug & LDAP_DEBUG_BER);
-                       }
+                       slap_debug |= atoi( optarg );
                        break;
 #else
                case 'd':       /* turn on debugging */
@@ -129,160 +231,274 @@ main( argc, argv )
 #endif
 
                case 'f':       /* read config file */
-                       configfile = strdup( optarg );
+                       configfile = ch_strdup( optarg );
                        break;
 
-               case 'i':       /* run from inetd */
-                       inetd = 1;
-                       break;
+               case 'p': {     /* port on which to listen */
+                               int p = atoi( optarg );
+                               if(! p ) {
+                                       fprintf(stderr, "-p %s must be numeric\n", optarg);
+                               } else if( p < 0 || p >= 1<<16) {
+                                       fprintf(stderr, "-p %s invalid\n", optarg);
+                               } else {
+                                       port = p;
+                               }
+                       } break;
 
-               case 'p':       /* port on which to listen */
-                       port = atoi( optarg );
-                       break;
+#ifdef HAVE_TLS
+               case 'P': {     /* port on which to listen for TLS */
+                               int p = atoi( optarg );
+                               if(! p ) {
+                                       fprintf(stderr, "-P %s must be numeric\n", optarg);
+                               } else if( p < 0 || p >= 1<<16) {
+                                       fprintf(stderr, "-P %s invalid\n", optarg);
+                               } else {
+                                       tls_port = p;
+                               }
+                       } break;
+#endif
 
                case 's':       /* set syslog level */
                        ldap_syslog = atoi( optarg );
                        break;
 
-               case 'u':       /* do udp */
+#ifdef LOG_LOCAL4
+               case 'l':       /* set syslog local user */
+                       syslogUser = cnvt_str2int( optarg,
+                               syslog_types, DEFAULT_SYSLOG_USER );
+                       break;
+#endif
+
+#ifdef LDAP_CONNECTIONLESS
+               case 'c':       /* do connectionless (udp) */
                        udp = 1;
                        break;
+#endif
+
+#ifdef SLAPD_BDB2
+               case 't':  /* timed server */
+                       serverMode = SLAP_TIMEDSERVER_MODE;
+                       break;
+#endif
+
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+               case 'u':       /* user name */
+                       if( username ) free(username);
+                       username = ch_strdup( optarg );
+                       break;
 
+               case 'g':       /* group name */
+                       if( groupname ) free(groupname);
+                       groupname = ch_strdup( optarg );
+                       break;
+#endif /* SETUID && GETUID */
+
+#ifdef HAVE_WINSOCK
+               case 'n':  /* NT service name */
+                       NTservice = ch_strdup( optarg );
+                       break;
+#endif
                default:
                        usage( argv[0] );
-                       exit( 1 );
+                       rc = 1;
+                       SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 15 );
+                       goto stop;
                }
        }
 
+       ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
+       ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug);
+       ldif_debug = slap_debug;
+
        Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
 
-       if ( (myname = strrchr( argv[0], '/' )) == NULL ) {
-               myname = strdup( argv[0] );
+       if ( (serverName = strrchr( argv[0], *LDAP_DIRSEP )) == NULL ) {
+               serverName = ch_strdup( argv[0] );
        } else {
-               myname = strdup( myname + 1 );
+               serverName = ch_strdup( serverName + 1 );
        }
 
-       if ( ! inetd ) {
-               /* pre-open config file before detach in case it is a relative path */
-               fp = fopen( configfile, "r" );
-               detach();
-       }
 #ifdef LOG_LOCAL4
-       openlog( myname, OPENLOG_OPTIONS, LOG_LOCAL4 );
+       openlog( serverName, OPENLOG_OPTIONS, syslogUser );
 #else
-       openlog( myname, OPENLOG_OPTIONS );
+       openlog( serverName, OPENLOG_OPTIONS );
 #endif
 
-       init();
-       read_config( configfile, &be, fp );
+       if( slapd_daemon_init( urls, port, tls_port ) != 0 ) {
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
+               goto stop;
+       }
+
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+       if ( username != NULL || groupname != NULL ) {
+               slap_init_user( username, groupname );
+       }
+#endif
 
-       if ( ! inetd ) {
-               pthread_attr_t  attr;
-               int             status;
+       if ( slap_init( serverMode, serverName ) != 0 ) {
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
+               goto destroy;
+       }
 
-               time( &starttime );
-               pthread_attr_init( &attr );
-               pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED );
+       if ( read_config( configfile ) != 0 ) {
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
+               goto destroy;
+       }
 
-#ifndef THREAD_MIT_PTHREADS
-               /* POSIX_THREADS or compatible
-                * This is a draft 10 or standard pthreads implementation
-                */
-               if ( pthread_create( &listener_tid, &attr, (void *) slapd_daemon,
-                   (void *) port ) != 0 ) {
-                       Debug( LDAP_DEBUG_ANY,
-                           "listener pthread_create failed\n", 0, 0, 0 );
-                       exit( 1 );
-               }
-#else  /* !THREAD_MIT_PTHREADS */
-               /*
-                * This is a draft 4 or earlier pthreads implementation
-                */
-               if ( pthread_create( &listener_tid, attr, (void *) slapd_daemon,
-                   (void *) port ) != 0 ) {
-                       Debug( LDAP_DEBUG_ANY,
-                           "listener pthread_create failed\n", 0, 0, 0 );
-                       exit( 1 );
-               }
-#endif /* !THREAD_MIT_PTHREADS */
-               pthread_attr_destroy( &attr );
-               pthread_join( listener_tid, (void *) &status );
-               pthread_exit( 0 );
-       } else {
-               Connection              c;
-               Operation               *o;
-               BerElement              ber;
-               unsigned long           len, tag;
-               long                    msgid;
-               int                     flen;
-               struct sockaddr_in      from;
-               struct hostent          *hp;
-
-               c.c_dn = NULL;
-               c.c_ops = NULL;
-               c.c_sb.sb_sd = 0;
-               c.c_sb.sb_options = 0;
-               c.c_sb.sb_naddr = udp ? 1 : 0;
-               c.c_sb.sb_ber.ber_buf = NULL;
-               c.c_sb.sb_ber.ber_ptr = NULL;
-               c.c_sb.sb_ber.ber_end = NULL;
-               pthread_mutex_init( &c.c_dnmutex, pthread_mutexattr_default );
-               pthread_mutex_init( &c.c_opsmutex, pthread_mutexattr_default );
-               pthread_mutex_init( &c.c_pdumutex, pthread_mutexattr_default );
-#ifdef notdefcldap
-               c.c_sb.sb_addrs = (void **) saddrlist;
-               c.c_sb.sb_fromaddr = &faddr;
-               c.c_sb.sb_useaddr = saddrlist[ 0 ] = &saddr;
-#endif
-               flen = sizeof(from);
-               if ( getpeername( 0, (struct sockaddr *) &from, &flen ) == 0 ) {
-#ifdef REVERSE_LOOKUP
-                       hp = gethostbyaddr( (char *) &(from.sin_addr.s_addr),
-                           sizeof(from.sin_addr.s_addr), AF_INET );
+#ifdef HAVE_TLS
+       ldap_pvt_tls_init();
+       ldap_pvt_tls_init_def_ctx();
+#endif
+
+       (void) SIGNAL( LDAP_SIGUSR1, slap_do_nothing );
+       (void) SIGNAL( LDAP_SIGUSR2, slap_set_shutdown );
+#ifdef SIGPIPE
+       (void) SIGNAL( SIGPIPE, SIG_IGN );
+#endif
+#ifdef SIGHUP
+       (void) SIGNAL( SIGHUP, slap_set_shutdown );
+#endif
+       (void) SIGNAL( SIGINT, slap_set_shutdown );
+       (void) SIGNAL( SIGTERM, slap_set_shutdown );
+#ifdef LDAP_SIGCHLD
+       (void) SIGNAL( LDAP_SIGCHLD, wait4child );
+#endif
+#ifdef SIGBREAK
+       /* SIGBREAK is generated when Ctrl-Break is pressed. */
+       (void) SIGNAL( SIGBREAK, slap_set_shutdown );
+#endif
+
+#ifndef HAVE_WINSOCK
+#ifdef LDAP_DEBUG
+               lutil_detach( ldap_debug, 0 );
 #else
-                       hp = NULL;
+               lutil_detach( 0, 0 );
 #endif
+#endif /* HAVE_WINSOCK */
+
+       if ( slap_startup(-1)  != 0 ) {
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+               goto shutdown;
+       }
 
-                       Debug( LDAP_DEBUG_ARGS, "connection from %s (%s)\n",
-                           hp == NULL ? "unknown" : hp->h_name,
-                           inet_ntoa( from.sin_addr ), 0 );
+       {
+               FILE *fp;
 
-                       c.c_addr = inet_ntoa( from.sin_addr );
-                       c.c_domain = strdup( hp == NULL ? "" : hp->h_name );
-               } else {
-                       Debug( LDAP_DEBUG_ARGS, "connection from unknown\n",
-                           0, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
+
+               if (( slapd_pid_file != NULL ) &&
+                       (( fp = fopen( slapd_pid_file, "w" )) != NULL ))
+               {
+                       fprintf( fp, "%d\n", (int) getpid() );
+                       fclose( fp );
                }
 
-               ber_init( &ber, 0 );
-               while ( (tag = ber_get_next( &c.c_sb, &len, &ber ))
-                   == LDAP_TAG_MESSAGE ) {
-                       pthread_mutex_lock( &currenttime_mutex );
-                       time( &currenttime );
-                       pthread_mutex_unlock( &currenttime_mutex );
-
-                       if ( (tag = ber_get_int( &ber, &msgid ))
-                           != LDAP_TAG_MSGID ) {
-                               /* log and send error */
-                               Debug( LDAP_DEBUG_ANY,
-                                   "ber_get_int returns 0x%x\n", tag, 0, 0 );
-                               return;
+               if (( slapd_args_file != NULL ) &&
+                       (( fp = fopen( slapd_args_file, "w" )) != NULL ))
+               {
+                       for ( i = 0; i < g_argc; i++ ) {
+                               fprintf( fp, "%s ", g_argv[i] );
                        }
+                       fprintf( fp, "\n" );
+                       fclose( fp );
+               }
+       }
 
-                       if ( (tag = ber_peek_tag( &ber, &len ))
-                           == LBER_ERROR ) {
-                               /* log, close and send error */
-                               Debug( LDAP_DEBUG_ANY,
-                                   "ber_peek_tag returns 0x%x\n", tag, 0, 0 );
-                               ber_free( &ber, 1 );
-                               close( c.c_sb.sb_sd );
-                               c.c_sb.sb_sd = -1;
-                               return;
-                       }
+#ifdef HAVE_WINSOCK
+       LogSlapdStartedEvent( NTservice, slap_debug, configfile, urls );
+#endif
 
-                       connection_activity( &c );
+       rc = slapd_daemon();
 
-                       ber_free( &ber, 1 );
-               }
-       }
+#ifdef HAVE_WINSOCK
+       /* Throw away the event that we used during the startup process. */
+       if ( is_NT_Service )
+               ldap_pvt_thread_cond_destroy( &started_event );
+#endif
+
+shutdown:
+       /* remember an error during shutdown */
+       rc |= slap_shutdown(-1);
+destroy:
+       /* remember an error during destroy */
+       rc |= slap_destroy();
+
+stop:
+#ifdef HAVE_WINSOCK
+       LogSlapdStoppedEvent( NTservice );
+#endif
+
+       Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
+
+#ifdef HAVE_WINSOCK
+       ReportSlapdShutdownComplete();
+#endif
+
+    closelog();
+       slapd_daemon_destroy();
+
+       MAIN_RETURN(rc);
+}
+
+
+#ifdef LDAP_SIGCHLD
+
+/*
+ *  Catch and discard terminated child processes, to avoid zombies.
+ */
+
+static RETSIGTYPE
+wait4child( int sig )
+{
+    int save_errno = errno;
+
+#ifdef WNOHANG
+    errno = 0;
+#ifdef HAVE_WAITPID
+    while ( waitpid( (pid_t)-1, NULL, WNOHANG ) >= 0 || errno == EINTR )
+       ;       /* NULL */
+#else
+    while ( wait3( NULL, WNOHANG, NULL ) >= 0 || errno == EINTR )
+       ;       /* NULL */
+#endif
+#else
+    (void) wait( NULL );
+#endif
+    (void) SIGNAL( sig, wait4child );
+    errno = save_errno;
+}
+
+#endif /* SIGCHLD || SIGCLD */
+
+
+#ifdef LOG_LOCAL4
+
+/*
+ *  Convert a string to an integer by means of a dispatcher table
+ *  if the string is not in the table return the default
+ */
+
+static int
+cnvt_str2int( char *stringVal, STRDISP_P dispatcher, int defaultVal )
+{
+    int        retVal = defaultVal;
+    STRDISP_P  disp;
+
+    for (disp = dispatcher; disp->stringVal; disp++) {
+
+        if (!strncasecmp (stringVal, disp->stringVal, disp->abbr)) {
+
+            retVal = disp->intVal;
+            break;
+
+        }
+    }
+
+    return (retVal);
 }
+
+#endif  /* LOG_LOCAL4 */