X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=119e24a9554d70cc8f1514a6e2fb5bd7b4804c8f;hb=581c1ff6c74f5eb281b5e0052b2a5ca84a7679bd;hp=7de2855ba472ea9ee90ade3032709e1e3e9e36fd;hpb=f54bc2635738dd9ec568367e3d685d9c148055a7;p=openldap diff --git a/servers/slapd/main.c b/servers/slapd/main.c index 7de2855ba4..119e24a955 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2005 The OpenLDAP Foundation. + * Copyright 1998-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -98,37 +98,6 @@ 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", sizeof("LOCAL0"), LOG_LOCAL0 }, - { "LOCAL1", sizeof("LOCAL1"), LOG_LOCAL1 }, - { "LOCAL2", sizeof("LOCAL2"), LOG_LOCAL2 }, - { "LOCAL3", sizeof("LOCAL3"), LOG_LOCAL3 }, - { "LOCAL4", sizeof("LOCAL4"), LOG_LOCAL4 }, - { "LOCAL5", sizeof("LOCAL5"), LOG_LOCAL5 }, - { "LOCAL6", sizeof("LOCAL6"), LOG_LOCAL6 }, - { "LOCAL7", sizeof("LOCAL7"), LOG_LOCAL7 }, -#ifdef LOG_USER - { "USER", sizeof("USER"), LOG_USER }, -#endif -#ifdef LOG_DAEMON - { "DAEMON", sizeof("DAEMON"), LOG_DAEMON }, -#endif - { NULL, 0, 0 } -}; - -static int cnvt_str2int( char *, STRDISP_P, int ); -#endif /* LOG_LOCAL4 */ - #define CHECK_NONE 0x00 #define CHECK_CONFIG 0x01 static int check = CHECK_NONE; @@ -136,6 +105,10 @@ static int version = 0; void *slap_tls_ctx; +#ifdef LOG_LOCAL4 +#define DEFAULT_SYSLOG_USER LOG_LOCAL4 +#endif /* LOG_LOCAL4 */ + static int slapd_opt_slp( const char *val, void *arg ) { @@ -185,6 +158,134 @@ struct option_helper { { BER_BVNULL, 0, NULL, NULL } }; +#ifdef LOG_LOCAL4 +static int +parse_syslog_user( const char *arg, int *syslogUser ) +{ + static slap_verbmasks syslogUsers[] = { + { BER_BVC( "LOCAL0" ), LOG_LOCAL0 }, + { BER_BVC( "LOCAL1" ), LOG_LOCAL1 }, + { BER_BVC( "LOCAL2" ), LOG_LOCAL2 }, + { BER_BVC( "LOCAL3" ), LOG_LOCAL3 }, + { BER_BVC( "LOCAL4" ), LOG_LOCAL4 }, + { BER_BVC( "LOCAL5" ), LOG_LOCAL5 }, + { BER_BVC( "LOCAL6" ), LOG_LOCAL6 }, + { BER_BVC( "LOCAL7" ), LOG_LOCAL7 }, +#ifdef LOG_USER + { BER_BVC( "USER" ), LOG_USER }, +#endif /* LOG_USER */ +#ifdef LOG_DAEMON + { BER_BVC( "DAEMON" ), LOG_DAEMON }, +#endif /* LOG_DAEMON */ + { BER_BVNULL, 0 } + }; + int i = verb_to_mask( optarg, syslogUsers ); + + if ( BER_BVISNULL( &syslogUsers[ i ].word ) ) { + Debug( LDAP_DEBUG_ANY, + "unrecognized syslog user \"%s\".\n", + optarg, 0, 0 ); + return 1; + } + + *syslogUser = syslogUsers[ i ].mask; + + return 0; +} +#endif /* LOG_LOCAL4 */ + +static int +parse_syslog_level( const char *arg, int *levelp ) +{ + static slap_verbmasks str2syslog_level[] = { + { BER_BVC( "EMERG" ), LOG_EMERG }, + { BER_BVC( "ALERT" ), LOG_ALERT }, + { BER_BVC( "CRIT" ), LOG_CRIT }, + { BER_BVC( "ERR" ), LOG_ERR }, + { BER_BVC( "WARNING" ), LOG_WARNING }, + { BER_BVC( "NOTICE" ), LOG_NOTICE }, + { BER_BVC( "INFO" ), LOG_INFO }, + { BER_BVC( "DEBUG" ), LOG_DEBUG }, + { BER_BVNULL, 0 } + }; + int i = verb_to_mask( arg, str2syslog_level ); + if ( BER_BVISNULL( &str2syslog_level[ i ].word ) ) { + Debug( LDAP_DEBUG_ANY, + "unknown syslog level \"%s\".\n", + arg, 0, 0 ); + return 1; + } + + *levelp = str2syslog_level[ i ].mask; + + return 0; +} + +int +parse_debug_unknowns( char **unknowns, int *levelp ) +{ + int i, level, rc = 0; + + for ( i = 0; unknowns[ i ] != NULL; i++ ) { + level = 0; + if ( str2loglevel( unknowns[ i ], &level )) { + fprintf( stderr, + "unrecognized log level \"%s\"\n", unknowns[ i ] ); + rc = 1; + } else { + *levelp |= level; + } + } + return rc; +} + +int +parse_debug_level( const char *arg, int *levelp, char ***unknowns ) +{ + int level; + + if ( arg && arg[ 0 ] != '-' && !isdigit( (unsigned char) arg[ 0 ] ) ) + { + int i; + char **levels; + + levels = ldap_str2charray( arg, "," ); + + for ( i = 0; levels[ i ] != NULL; i++ ) { + level = 0; + + if ( str2loglevel( levels[ i ], &level ) ) { + /* remember this for later */ + ldap_charray_add( unknowns, levels[ i ] ); + fprintf( stderr, + "unrecognized log level \"%s\" (deferred)\n", + levels[ i ] ); + } else { + *levelp |= level; + } + } + + ldap_charray_free( levels ); + + } else { + if ( lutil_atoix( &level, arg, 0 ) != 0 ) { + fprintf( stderr, + "unrecognized log level " + "\"%s\"\n", arg ); + return 1; + } + + if ( level == 0 ) { + *levelp = 0; + + } else { + *levelp |= level; + } + } + + return 0; +} + static void usage( char *name ) { @@ -247,23 +348,28 @@ int main( int argc, char **argv ) char *sandbox = NULL; #endif #ifdef LOG_LOCAL4 - int syslogUser = DEFAULT_SYSLOG_USER; + int syslogUser = DEFAULT_SYSLOG_USER; #endif int g_argc = argc; char **g_argv = argv; - char *configfile = NULL; - char *configdir = NULL; - char *serverName; - int serverMode = SLAP_SERVER_MODE; + char *configfile = NULL; + char *configdir = NULL; + char *serverName; + int serverMode = SLAP_SERVER_MODE; struct sync_cookie *scp = NULL; struct sync_cookie *scp_entry = NULL; - char *serverNamePrefix = ""; + char **debug_unknowns = NULL; + char **syslog_unknowns = NULL; + + char *serverNamePrefix = ""; size_t l; + int slapd_pid_file_unlink = 0, slapd_args_file_unlink = 0; + #ifdef CSRIMALLOC FILE *leakfile; if( ( leakfile = fopen( "slapd.leak", "w" )) == NULL ) { @@ -332,18 +438,21 @@ int main( int argc, char **argv ) #endif while ( (i = getopt( argc, argv, - "c:d:f:F:h:n:o:s:StT:V" + "c:d:f:F:h:n:o:s:tT:V" #if LDAP_PF_INET6 "46" #endif #ifdef HAVE_CHROOT "r:" #endif +#ifdef LDAP_SYSLOG + "S:" +#endif #ifdef LOG_LOCAL4 - "l:" + "l:" #endif #if defined(HAVE_SETUID) && defined(HAVE_SETGID) - "u:g:" + "u:g:" #endif )) != EOF ) { switch ( i ) { @@ -389,40 +498,21 @@ int main( int argc, char **argv ) LDAP_STAILQ_INSERT_TAIL( &slap_sync_cookie, scp, sc_next ); break; - case 'd': /* set debug level and 'do not detach' flag */ - no_detach = 1; -#ifdef LDAP_DEBUG - if ( optarg != NULL && optarg[ 0 ] != '-' && !isdigit( optarg[ 0 ] ) ) - { - int level; - - if ( str2loglevel( optarg, &level ) ) { - fprintf( stderr, - "unrecognized log level " - "\"%s\"\n", optarg ); - goto destroy; - } + case 'd': { /* set debug level and 'do not detach' flag */ + int level = 0; - slap_debug |= level; - } else { - int level; - char *next = NULL; - - level = strtol( optarg, &next, 0 ); - if ( next == NULL || next[ 0 ] != '\0' ) { - fprintf( stderr, - "unrecognized log level " - "\"%s\"\n", optarg ); - goto destroy; - } - slap_debug |= level; + no_detach = 1; + if ( parse_debug_level( optarg, &level, &debug_unknowns ) ) { + goto destroy; } +#ifdef LDAP_DEBUG + slap_debug |= level; #else - if ( atoi( optarg ) != 0 ) + if ( level != 0 ) fputs( "must compile with LDAP_DEBUG for debugging\n", stderr ); #endif - break; + } break; case 'f': /* read config file */ configfile = ch_strdup( optarg ); @@ -467,13 +557,24 @@ int main( int argc, char **argv ) } case 's': /* set syslog level */ - ldap_syslog = atoi( optarg ); + if ( parse_debug_level( optarg, &ldap_syslog, &syslog_unknowns ) ) { + goto destroy; + } + break; + +#if defined(LDAP_DEBUG) && defined(LDAP_SYSLOG) + case 'S': + if ( parse_syslog_level( optarg, &ldap_syslog_level ) ) { + goto destroy; + } break; +#endif /* LDAP_DEBUG && LDAP_SYSLOG */ #ifdef LOG_LOCAL4 case 'l': /* set syslog local user */ - syslogUser = cnvt_str2int( optarg, - syslog_types, DEFAULT_SYSLOG_USER ); + if ( parse_syslog_user( optarg, &syslogUser ) ) { + goto destroy; + } break; #endif @@ -622,6 +723,21 @@ unhandled_option:; goto destroy; } + if ( debug_unknowns ) { + rc = parse_debug_unknowns( debug_unknowns, &slap_debug ); + ldap_charray_free( debug_unknowns ); + debug_unknowns = NULL; + if ( rc ) + goto destroy; + } + if ( syslog_unknowns ) { + rc = parse_debug_unknowns( syslog_unknowns, &ldap_syslog ); + ldap_charray_free( syslog_unknowns ); + syslog_unknowns = NULL; + if ( rc ) + goto destroy; + } + if ( check & CHECK_CONFIG ) { fprintf( stderr, "config check succeeded\n" ); @@ -668,8 +784,8 @@ unhandled_option:; /* Force new ctx to be created */ ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_CTX, NULL ); - rc = ldap_pvt_tls_init_def_ctx(); - if( rc == 0) { + rc = ldap_pvt_tls_init_def_ctx( 1 ); + if( rc == 0 ) { ldap_pvt_tls_get_option( NULL, LDAP_OPT_X_TLS_CTX, &slap_tls_ctx ); /* Restore previous ctx */ ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_CTX, def_ctx ); @@ -715,49 +831,68 @@ unhandled_option:; mal_leaktrace(1); #endif - /* - * FIXME: moved here from slapd_daemon_task() - * because back-monitor db_open() needs it - */ - time( &starttime ); - - if ( slap_startup( NULL ) != 0 ) { - rc = 1; - SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 ); - goto shutdown; - } - - Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 ); - - if ( slapd_pid_file != NULL ) { FILE *fp = fopen( slapd_pid_file, "w" ); - if( fp != NULL ) { - fprintf( fp, "%d\n", (int) getpid() ); - fclose( fp ); + if ( fp == NULL ) { + int save_errno = errno; - } else { - free(slapd_pid_file); + Debug( LDAP_DEBUG_ANY, "unable to open pid file " + "\"%s\": %d (%s)\n", + slapd_pid_file, + save_errno, strerror( save_errno ) ); + + free( slapd_pid_file ); slapd_pid_file = NULL; + + rc = 1; + goto destroy; } + fprintf( fp, "%d\n", (int) getpid() ); + fclose( fp ); + slapd_pid_file_unlink = 1; } if ( slapd_args_file != NULL ) { FILE *fp = fopen( slapd_args_file, "w" ); - if( fp != NULL ) { - for ( i = 0; i < g_argc; i++ ) { - fprintf( fp, "%s ", g_argv[i] ); - } - fprintf( fp, "\n" ); - fclose( fp ); - } else { - free(slapd_args_file); + if ( fp == NULL ) { + int save_errno = errno; + + Debug( LDAP_DEBUG_ANY, "unable to open args file " + "\"%s\": %d (%s)\n", + slapd_args_file, + save_errno, strerror( save_errno ) ); + + free( slapd_args_file ); slapd_args_file = NULL; + + rc = 1; + goto destroy; + } + + for ( i = 0; i < g_argc; i++ ) { + fprintf( fp, "%s ", g_argv[i] ); } + fprintf( fp, "\n" ); + fclose( fp ); + slapd_args_file_unlink = 1; } + /* + * FIXME: moved here from slapd_daemon_task() + * because back-monitor db_open() needs it + */ + time( &starttime ); + + if ( slap_startup( NULL ) != 0 ) { + rc = 1; + SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 ); + goto shutdown; + } + + Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 ); + #ifdef HAVE_NT_EVENT_LOG if (is_NT_Service) lutil_LogStartedEvent( serverName, slap_debug, configfile ? @@ -794,6 +929,9 @@ destroy: extops_kill(); + supported_feature_destroy(); + entry_info_destroy(); + stop: #ifdef HAVE_NT_EVENT_LOG if (is_NT_Service) @@ -822,10 +960,10 @@ stop: ldap_pvt_tls_destroy(); #endif - if ( slapd_pid_file != NULL ) { + if ( slapd_pid_file_unlink ) { unlink( slapd_pid_file ); } - if ( slapd_args_file != NULL ) { + if ( slapd_args_file_unlink ) { unlink( slapd_args_file ); } @@ -875,31 +1013,3 @@ wait4child( int sig ) #endif /* LDAP_SIGCHLD */ - -#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 */