X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=de931e49088dd0318cf6b010e6556abb2f6b8520;hb=f8c0481dd47a78d24a57e9872e8b775a7152b4d2;hp=0fc8b3072c552b10e3532f79c95ded24f9f0d113;hpb=d5860fb05ca2076bf46c23d8efadd1e53a62b53f;p=openldap diff --git a/servers/slapd/main.c b/servers/slapd/main.c index 0fc8b3072c..de931e4908 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -1,13 +1,12 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ #include "portable.h" #include -#include #include #include #include @@ -15,8 +14,11 @@ #include #include +#include "ldap_pvt.h" + #include "slap.h" #include "lutil.h" +#include "ldif.h" #ifdef LDAP_SIGCHLD static RETSIGTYPE wait4child( int sig ); @@ -24,13 +26,7 @@ static RETSIGTYPE wait4child( int sig ); #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)); @@ -69,14 +65,14 @@ const char Versionstr[] = #define DEFAULT_SYSLOG_USER LOG_LOCAL4 typedef struct _str2intDispatch { - char *stringVal; - int abbr; - int intVal; + char *stringVal; + int abbr; + int intVal; } STRDISP, *STRDISP_P; /* table to compute syslog-options to integer */ -static STRDISP syslog_types[] = { +static STRDISP syslog_types[] = { { "LOCAL0", sizeof("LOCAL0"), LOG_LOCAL0 }, { "LOCAL1", sizeof("LOCAL1"), LOG_LOCAL1 }, { "LOCAL2", sizeof("LOCAL2"), LOG_LOCAL2 }, @@ -90,8 +86,9 @@ static STRDISP syslog_types[] = { static int cnvt_str2int( char *, STRDISP_P, int ); -#endif /* LOG_LOCAL4 */ +#endif /* LOG_LOCAL4 */ +static int check_config = 0; static void usage( char *name ) @@ -99,22 +96,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 ); } @@ -126,7 +126,7 @@ int main( int argc, char **argv ) #endif { int i, no_detach = 0; - int rc; + int rc = 1; char *urls = NULL; #if defined(HAVE_SETUID) && defined(HAVE_SETGID) char *username = NULL; @@ -136,16 +136,19 @@ 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; #ifdef HAVE_NT_SERVICE_MANAGER char *configfile = ".\\slapd.conf"; #else char *configfile = SLAPD_DEFAULT_CONFIGFILE; #endif - char *serverName = NULL; - int serverMode = SLAP_SERVER_MODE; + char *serverName = NULL; + int serverMode = SLAP_SERVER_MODE; #ifdef CSRIMALLOC FILE *leakfile; @@ -154,8 +157,6 @@ int main( int argc, char **argv ) } #endif - g_argc = argc; - g_argv = argv; #ifdef HAVE_NT_SERVICE_MANAGER { @@ -175,7 +176,14 @@ int main( int argc, char **argv ) if ( i != NULL ) { slap_debug = *i; +#ifdef NEW_LOGGING + 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 } newUrls = (char *) getRegParam(regService, "Urls"); @@ -185,21 +193,36 @@ int main( int argc, char **argv ) ch_free(urls); urls = ch_strdup(newUrls); +#ifdef NEW_LOGGING + 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); +#endif + } newConfigFile = (char*)getRegParam( regService, "ConfigFile" ); if ( newConfigFile != NULL ) { configfile = newConfigFile; +#ifdef NEW_LOGGING + 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 + } } #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 @@ -211,10 +234,19 @@ 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 ); - break; + break; case 'd': /* set debug level and 'do not detach' flag */ no_detach = 1; @@ -266,6 +298,10 @@ int main( int argc, char **argv ) serverName = ch_strdup( optarg ); break; + case 't': + check_config++; + break; + default: usage( argv[0] ); rc = 1; @@ -274,17 +310,27 @@ int main( int argc, char **argv ) } } +#ifdef NEW_LOGGING + lutil_log_initialize( argc, argv ); +#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( SLAPD, INFO, "%s", Versionstr, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 ); +#endif + 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; } } @@ -294,17 +340,24 @@ 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; } #if defined(HAVE_CHROOT) - if ( sandbox && chroot( sandbox ) ) { - perror("chroot"); - rc = 1; - goto stop; + if ( sandbox ) { + if ( chdir( sandbox ) ) { + perror("chdir"); + rc = 1; + goto stop; + } + if ( chroot( sandbox ) ) { + perror("chroot"); + rc = 1; + goto stop; + } } #endif @@ -330,30 +383,92 @@ int main( int argc, char **argv ) goto destroy; } - if ( schema_init( ) != 0 ) { + if ( slap_schema_init( ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, CRIT, "main: schema initialization error\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "schema initialization error\n", 0, 0, 0 ); +#endif + goto destroy; } +#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 + if ( read_config( configfile ) != 0 ) { rc = 1; SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 ); + + if ( check_config ) { + fprintf( stderr, "config check failed\n" ); + } + goto destroy; } - if ( schema_prep( ) != 0 ) { + if ( check_config ) { + rc = 0; + fprintf( stderr, "config check succeeded\n" ); + goto destroy; + } + + if ( glue_sub_init( ) != 0 ) { +#ifdef NEW_LOGGING + 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", 0, 0, 0 ); +#endif + goto destroy; } #ifdef HAVE_TLS rc = ldap_pvt_tls_init(); + if( rc != 0) { +#ifdef NEW_LOGGING + LDAP_LOG( SLAPD, CRIT, "main: tls init failed: %d\n", rc, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "main: TLS init failed: %d\n", + 0, 0, 0 ); +#endif + rc = 1; + SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 ); + goto destroy; + } - if (rc || ldap_pvt_tls_init_def_ctx() != 0) { + rc = ldap_pvt_tls_init_def_ctx(); + if( rc != 0) { +#ifdef NEW_LOGGING + 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 ); +#endif rc = 1; SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 ); goto destroy; @@ -396,7 +511,12 @@ int main( int argc, char **argv ) { FILE *fp; +#ifdef NEW_LOGGING + LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 ); +#endif + if (( slapd_pid_file != NULL ) && (( fp = fopen( slapd_pid_file, "w" )) != NULL )) @@ -449,7 +569,12 @@ stop: LogSlapdStoppedEvent( serverName ); #endif +#ifdef NEW_LOGGING + LDAP_LOG( SLAPD, CRIT, "main: slapd stopped.\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 ); +#endif + #ifdef HAVE_NT_SERVICE_MANAGER ReportSlapdShutdownComplete(); @@ -460,6 +585,14 @@ stop: #endif slapd_daemon_destroy(); + schema_destroy(); + +#ifdef HAVE_TLS + ldap_pvt_tls_destroy(); +#endif + + config_destroy(); + #ifdef CSRIMALLOC mal_dumpleaktrace( leakfile ); #endif @@ -482,10 +615,10 @@ wait4child( int sig ) #ifdef WNOHANG errno = 0; #ifdef HAVE_WAITPID - while ( waitpid( (pid_t)-1, NULL, WNOHANG ) >= 0 || errno == EINTR ) + while ( waitpid( (pid_t)-1, NULL, WNOHANG ) > 0 || errno == EINTR ) ; /* NULL */ #else - while ( wait3( NULL, WNOHANG, NULL ) >= 0 || errno == EINTR ) + while ( wait3( NULL, WNOHANG, NULL ) > 0 || errno == EINTR ) ; /* NULL */ #endif #else @@ -508,20 +641,20 @@ wait4child( int sig ) static int cnvt_str2int( char *stringVal, STRDISP_P dispatcher, int defaultVal ) { - int retVal = defaultVal; + int retVal = defaultVal; STRDISP_P disp; for (disp = dispatcher; disp->stringVal; disp++) { - if (!strncasecmp (stringVal, disp->stringVal, disp->abbr)) { + if (!strncasecmp (stringVal, disp->stringVal, disp->abbr)) { - retVal = disp->intVal; - break; + retVal = disp->intVal; + break; - } + } } return (retVal); } -#endif /* LOG_LOCAL4 */ +#endif /* LOG_LOCAL4 */