X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=2e0f46fb548267aff7e04aa577f2156d79bb7889;hb=17f95a3fd30247a0735a3526d85b46178304748d;hp=b1beef495d5c19c2537cf587ee6d1493fe19b5c0;hpb=aee36002767937f0dfe7382270979f0827fcf072;p=openldap diff --git a/servers/slapd/main.c b/servers/slapd/main.c index b1beef495d..2e0f46fb54 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -1,13 +1,13 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ #include "portable.h" +#include "slapi_common.h" #include -#include #include #include #include @@ -17,26 +17,19 @@ #include "ldap_pvt.h" + #include "slap.h" +#include "slapi.h" #include "lutil.h" #include "ldif.h" -/* I guess this should be declared in ldap_pvt.h */ -extern int ldap_pvt_tls_init_def_ctx( void ); - #ifdef LDAP_SIGCHLD static RETSIGTYPE wait4child( int sig ); #endif #ifdef HAVE_NT_SERVICE_MANAGER #define MAIN_RETURN(x) return -struct sockaddr_in bind_addr; - -/* in nt_main.c */ -LDAP_LUTIL_V(SERVICE_STATUS) SLAPDServiceStatus; -LDAP_LUTIL_V(SERVICE_STATUS_HANDLE) hSLAPDServiceStatus; -extern ldap_pvt_thread_cond_t started_event, stopped_event; -extern int is_NT_Service; +static struct sockaddr_in bind_addr; void CommenceStartupProcessing( LPCTSTR serverName, void(*stopper)(int)); @@ -91,13 +84,14 @@ static STRDISP syslog_types[] = { { "LOCAL5", sizeof("LOCAL5"), LOG_LOCAL5 }, { "LOCAL6", sizeof("LOCAL6"), LOG_LOCAL6 }, { "LOCAL7", sizeof("LOCAL7"), LOG_LOCAL7 }, - { NULL } + { NULL, 0, 0 } }; static int cnvt_str2int( char *, STRDISP_P, int ); #endif /* LOG_LOCAL4 */ +static int check_config = 0; static void usage( char *name ) @@ -105,22 +99,25 @@ usage( char *name ) fprintf( stderr, "usage: %s options\n", name ); fprintf( stderr, - "\t-d level\tDebug Level" "\n" - "\t-f filename\tConfiguration File\n" + "\t-4\t\tIPv4 only\n" + "\t-6\t\tIPv6 only\n" + "\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" + "\t-g group\tGroup (id or name) to run as\n" #endif - "\t-h URLs\tList of URLs to serve\n" + "\t-h URLs\t\tList of URLs to serve\n" #ifdef LOG_LOCAL4 - "\t-l sysloguser\tSyslog User (default: LOCAL4)\n" + "\t-l facility\tSyslog facility (default: LOCAL4)\n" #endif - "\t-n serverName\tservice name\n" + "\t-n serverName\tService name\n" #ifdef HAVE_CHROOT - "\t-r directory\n" + "\t-r directory\tSandbox directory to chroot to\n" #endif - "\t-s level\tSyslog Level\n" + "\t-s level\tSyslog level\n" + "\t-t\t\tCheck configuration file and exit\n" #if defined(HAVE_SETUID) && defined(HAVE_SETGID) - "\t-u user\tUser (id or name) to ran as\n" + "\t-u user\t\tUser (id or name) to run as\n" #endif ); } @@ -144,6 +141,9 @@ int main( int argc, char **argv ) #ifdef LOG_LOCAL4 int syslogUser = DEFAULT_SYSLOG_USER; #endif + + int g_argc = argc; + char **g_argv = argv; #ifdef HAVE_NT_SERVICE_MANAGER char *configfile = ".\\slapd.conf"; @@ -160,8 +160,6 @@ int main( int argc, char **argv ) } #endif - g_argc = argc; - g_argv = argv; #ifdef HAVE_NT_SERVICE_MANAGER { @@ -182,8 +180,10 @@ int main( int argc, char **argv ) { slap_debug = *i; #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "main: new debug level from registry is: %d\n", slap_debug )); + lutil_log_initialize( argc, argv ); + LDAP_LOG( SLAPD, INFO, + "main: new debug level from registry is: %d\n", + slap_debug, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 ); #endif @@ -197,8 +197,8 @@ int main( int argc, char **argv ) urls = ch_strdup(newUrls); #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "main: new urls from registry: %s\n", urls )); + LDAP_LOG( SLAPD, INFO, + "main: new urls from registry: %s\n", urls, 0, 0 ); #else Debug(LDAP_DEBUG_ANY, "new urls from registry: %s\n", urls, 0, 0); @@ -211,8 +211,8 @@ int main( int argc, char **argv ) { configfile = newConfigFile; #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "main: new config file from registry is: %s\n", configfile )); + LDAP_LOG( SLAPD, INFO, + "main: new config file from registry is: %s\n", configfile, 0, 0 ); #else Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", configfile, 0, 0 ); #endif @@ -222,7 +222,10 @@ int main( int argc, char **argv ) #endif while ( (i = getopt( argc, argv, - "d:f:h:s:n:" + "d:f:h:s:n:t" +#if LDAP_PF_INET6 + "46" +#endif #ifdef HAVE_CHROOT "r:" #endif @@ -234,6 +237,15 @@ int main( int argc, char **argv ) #endif )) != EOF ) { switch ( i ) { +#ifdef LDAP_PF_INET6 + case '4': + slap_inet4or6 = AF_INET; + break; + case '6': + slap_inet4or6 = AF_INET6; + break; +#endif + case 'h': /* listen URLs */ if ( urls != NULL ) free( urls ); urls = ch_strdup( optarg ); @@ -289,6 +301,10 @@ int main( int argc, char **argv ) serverName = ch_strdup( optarg ); break; + case 't': + check_config++; + break; + default: usage( argv[0] ); rc = 1; @@ -299,16 +315,15 @@ int main( int argc, char **argv ) #ifdef NEW_LOGGING lutil_log_initialize( argc, argv ); -#endif - +#else lutil_set_debug_level( "slapd", slap_debug ); ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug); ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug); ldif_debug = slap_debug; +#endif #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "%s", Versionstr )); + LDAP_LOG( SLAPD, INFO, "%s", Versionstr, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 ); #endif @@ -316,9 +331,9 @@ int main( int argc, char **argv ) if( serverName == NULL ) { if ( (serverName = strrchr( argv[0], *LDAP_DIRSEP )) == NULL ) { - serverName = ch_strdup( argv[0] ); + serverName = argv[0]; } else { - serverName = ch_strdup( serverName + 1 ); + serverName = serverName + 1; } } @@ -328,7 +343,7 @@ int main( int argc, char **argv ) openlog( serverName, OPENLOG_OPTIONS ); #endif - if( slapd_daemon_init( urls ) != 0 ) { + if( !check_config && slapd_daemon_init( urls ) != 0 ) { rc = 1; SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 ); goto stop; @@ -371,10 +386,9 @@ int main( int argc, char **argv ) goto destroy; } - if ( schema_init( ) != 0 ) { + if ( slap_schema_init( ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, - "main: schema initialization error\n" )); + LDAP_LOG( OPERATION, CRIT, "main: schema initialization error\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "schema initialization error\n", @@ -384,16 +398,61 @@ int main( int argc, char **argv ) goto destroy; } - if ( read_config( configfile ) != 0 ) { +#ifdef HAVE_TLS + /* Library defaults to full certificate checking. This is correct when + * a client is verifying a server because all servers should have a + * valid cert. But few clients have valid certs, so we want our default + * to be no checking. The config file can override this as usual. + */ + rc = 0; + (void) ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc ); +#endif + +#ifdef LDAP_SLAPI + if ( slapi_init() != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, CRIT, "main: slapi initialization error\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "slapi initialization error\n", + 0, 0, 0 ); +#endif + + goto destroy; + } +#endif /* LDAP_SLAPI */ + + if ( read_config( configfile, 0 ) != 0 ) { rc = 1; SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 ); + + if ( check_config ) { + fprintf( stderr, "config check failed\n" ); + } + + goto destroy; + } + + if ( check_config ) { + rc = 0; + fprintf( stderr, "config check succeeded\n" ); goto destroy; } - if ( schema_prep( ) != 0 ) { + if ( glue_sub_init( ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, - "main: schema prep error\n")); + LDAP_LOG( SLAPD, CRIT, "main: subordinate config error\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "subordinate config error\n", + 0, 0, 0 ); +#endif + goto destroy; + } + + if ( slap_schema_check( ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( SLAPD, CRIT, "main: schema prep error\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "schema prep error\n", @@ -407,8 +466,7 @@ int main( int argc, char **argv ) rc = ldap_pvt_tls_init(); if( rc != 0) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, - "main: tls init failed: %d\n", rc )); + LDAP_LOG( SLAPD, CRIT, "main: tls init failed: %d\n", rc, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "main: TLS init failed: %d\n", @@ -422,12 +480,11 @@ int main( int argc, char **argv ) rc = ldap_pvt_tls_init_def_ctx(); if( rc != 0) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, - "main: tls init def ctx failed: %d\n", rc )); + LDAP_LOG( SLAPD, CRIT, "main: tls init def ctx failed: %d\n", rc, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "main: TLS init def ctx failed: %d\n", - 0, 0, 0 ); + rc, 0, 0 ); #endif rc = 1; SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 ); @@ -472,8 +529,7 @@ int main( int argc, char **argv ) FILE *fp; #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "main: slapd starting.\n" )); + LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 ); #endif @@ -531,8 +587,7 @@ stop: #endif #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, - "main: slapd stopped.\n" )); + LDAP_LOG( SLAPD, CRIT, "main: slapd stopped.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 ); #endif @@ -553,6 +608,8 @@ stop: ldap_pvt_tls_destroy(); #endif + config_destroy(); + #ifdef CSRIMALLOC mal_dumpleaktrace( leakfile ); #endif @@ -588,7 +645,7 @@ wait4child( int sig ) errno = save_errno; } -#endif /* SIGCHLD || SIGCLD */ +#endif /* LDAP_SIGCHLD */ #ifdef LOG_LOCAL4