X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=136d3ec05e0c6dae7828c05e121e7fb4f6202602;hb=475712431908440fea71253efa10de4ff97bc0eb;hp=76f8cd9acd2531fc56283f0c5291e53dc6dc8faf;hpb=0a7ca1e8d2f575f1a0c65932eb1e26136656c128;p=openldap diff --git a/servers/slapd/main.c b/servers/slapd/main.c index 76f8cd9acd..136d3ec05e 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -2,6 +2,8 @@ #include +#include +#include #include #include #include @@ -11,55 +13,56 @@ #include "slap.h" #include "lutil.h" /* Get lutil_detach() */ - -/* - * 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; -#else -int ldap_syslog; +#ifdef LDAP_SIGCHLD +static void wait4child( int sig ); #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; -#ifdef SLAPD_CRYPT -pthread_mutex_t crypt_mutex; -#endif -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; + /* - * 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; + +#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(); + +#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 [-d ?|debuglevel] [-f configfile] [-p portnumber] [-s sysloglevel]", name ); +#ifdef LOG_LOCAL4 + fprintf( stderr, " [-l sysloguser]" ); +#endif + fprintf( stderr, "\n" ); } int @@ -68,16 +71,24 @@ main( int argc, char **argv ) int i; int inetd = 0; int port; - char *myname; + int udp; Backend *be = NULL; FILE *fp = NULL; + char *configfile; + char *serverName; +#ifdef LOG_LOCAL4 + char *optstring = "d:f:ip:s:ul:"; + int syslogUser = DEFAULT_SYSLOG_USER; +#else + char *optstring = "d:f:ip:s:u"; +#endif configfile = SLAPD_DEFAULT_CONFIGFILE; port = LDAP_PORT; g_argc = argc; g_argv = argv; - while ( (i = getopt( argc, argv, "d:f:ip:s:u" )) != EOF ) { + while ( (i = getopt( argc, argv, optstring )) != EOF ) { switch ( i ) { #ifdef LDAP_DEBUG case 'd': /* turn on debugging */ @@ -138,6 +149,13 @@ main( int argc, char **argv ) ldap_syslog = atoi( optarg ); break; +#ifdef LOG_LOCAL4 + case 'l': /* set syslog local user */ + syslogUser = cnvt_str2int( optarg, syslog_types, + DEFAULT_SYSLOG_USER ); + break; +#endif + case 'u': /* do udp */ udp = 1; break; @@ -150,10 +168,10 @@ main( int argc, char **argv ) Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 ); - if ( (myname = strrchr( argv[0], '/' )) == NULL ) { - myname = ch_strdup( argv[0] ); + if ( (serverName = strrchr( argv[0], '/' )) == NULL ) { + serverName = ch_strdup( argv[0] ); } else { - myname = ch_strdup( myname + 1 ); + serverName = ch_strdup( serverName + 1 ); } if ( ! inetd ) { @@ -165,54 +183,43 @@ main( int argc, char **argv ) lutil_detach( 0, 0 ); #endif } + #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 ( ! inetd ) { - pthread_attr_t attr; int status; - time( &starttime ); - pthread_attr_init( &attr ); -#ifdef DETACH_LISTENER_THREAD - /* we should detach it if we're going to join with it */ - pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED ); + (void) SIGNAL( SIGPIPE, SIG_IGN ); + (void) SIGNAL( LDAP_SIGUSR1, slap_do_nothing ); + (void) SIGNAL( LDAP_SIGUSR2, slap_set_shutdown ); + (void) SIGNAL( SIGTERM, slap_set_shutdown ); + (void) SIGNAL( SIGINT, slap_set_shutdown ); + (void) SIGNAL( SIGHUP, slap_set_shutdown ); +#ifdef LDAP_SIGCHLD + (void) SIGNAL( LDAP_SIGCHLD, wait4child ); #endif -#if !defined(HAVE_PTHREADS_D4) - /* POSIX_THREADS or compatible - * This is a draft 10 or standard pthreads implementation - */ - if ( pthread_create( &listener_tid, &attr, slapd_daemon, - (void *) port ) != 0 ) { - Debug( LDAP_DEBUG_ANY, - "listener pthread_create failed\n", 0, 0, 0 ); - exit( 1 ); - } -#else /* draft4 */ - /* - * This is a draft 4 or earlier pthreads implementation - */ - if ( pthread_create( &listener_tid, attr, slapd_daemon, - (void *) port ) != 0 ) { + time( &starttime ); + + if ( status = ldap_pvt_thread_create( &listener_tid, 0, + slapd_daemon, (void *) port ) != 0 ) + { Debug( LDAP_DEBUG_ANY, - "listener pthread_create failed\n", 0, 0, 0 ); + "listener ldap_pvt_thread_create failed (%d)\n", status, 0, 0 ); exit( 1 ); } -#endif /* !draft4 */ - pthread_attr_destroy( &attr ); -#ifdef HAVE_PHREADS_FINAL - pthread_join( listener_tid, (void *) NULL ); -#else - pthread_join( listener_tid, (void *) &status ); -#endif - pthread_exit( 0 ); + + ldap_pvt_thread_join( listener_tid, (void *) NULL ); + + return 0; + } else { Connection c; Operation *o; @@ -224,6 +231,7 @@ main( int argc, char **argv ) struct hostent *hp; c.c_dn = NULL; + c.c_cdn = NULL; c.c_ops = NULL; c.c_sb.sb_sd = 0; c.c_sb.sb_options = 0; @@ -231,9 +239,9 @@ main( int argc, char **argv ) 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 ); + ldap_pvt_thread_mutex_init( &c.c_dnmutex ); + ldap_pvt_thread_mutex_init( &c.c_opsmutex ); + ldap_pvt_thread_mutex_init( &c.c_pdumutex ); #ifdef notdefcldap c.c_sb.sb_addrs = (void **) saddrlist; c.c_sb.sb_fromaddr = &faddr; @@ -262,9 +270,9 @@ main( int argc, char **argv ) ber_init( &ber, 0 ); while ( (tag = ber_get_next( &c.c_sb, &len, &ber )) == LDAP_TAG_MESSAGE ) { - pthread_mutex_lock( ¤ttime_mutex ); + ldap_pvt_thread_mutex_lock( ¤ttime_mutex ); time( ¤ttime ); - pthread_mutex_unlock( ¤ttime_mutex ); + ldap_pvt_thread_mutex_unlock( ¤ttime_mutex ); if ( (tag = ber_get_int( &ber, &msgid )) != LDAP_TAG_MSGID ) { @@ -293,3 +301,67 @@ main( int argc, char **argv ) } return 1; } + + +#ifdef LDAP_SIGCHLD + +/* + * Catch and discard terminated child processes, to avoid zombies. + */ + +static void +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 (stringVal, dispatcher, defaultVal) +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); + +} /* cnvt_str2int */ + +#endif /* LOG_LOCAL4 */ +