X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=53ccf4004767eb5ddae2d1dc302e5ad64165d870;hb=7f54a89f32c34ec0e109ef3ca41c36545fe42b7c;hp=5be95f88d8acb9c3c0109791aa9103d5dcbbdef1;hpb=b509dd4d8cbd8b8e388a02ca9d8f7eaa5d8b21fa;p=openldap diff --git a/servers/slapd/main.c b/servers/slapd/main.c index 5be95f88d8..53ccf40047 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -1,5 +1,6 @@ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ #include "portable.h" @@ -12,46 +13,44 @@ #include #include #include -#include #include -#include "ldap_defaults.h" +#include "ldap_pvt.h" + #include "slap.h" #include "lutil.h" +#include "ldif.h" #ifdef LDAP_SIGCHLD static RETSIGTYPE wait4child( int sig ); #endif -#ifdef HAVE_WINSOCK +#ifdef HAVE_NT_SERVICE_MANAGER #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; +static struct sockaddr_in bind_addr; -void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls ); -void LogSlapdStoppedEvent( char *svc ); - -void CommenceStartupProcessing( LPCTSTR serviceName, +void CommenceStartupProcessing( LPCTSTR serverName, 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; \ -} +#define SERVICE_EXIT( e, n ) do { \ + if ( is_NT_Service ) { \ + SLAPDServiceStatus.dwWin32ExitCode = (e); \ + SLAPDServiceStatus.dwServiceSpecificExitCode = (n); \ + } \ +} while ( 0 ) + #else #define SERVICE_EXIT( e, n ) #define MAIN_RETURN(x) return(x) #endif +#ifdef HAVE_NT_EVENT_LOG +void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls ); +void LogSlapdStoppedEvent( char *svc ); +#endif + /* * 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 @@ -67,14 +66,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 }, @@ -88,7 +87,7 @@ static STRDISP syslog_types[] = { static int cnvt_str2int( char *, STRDISP_P, int ); -#endif /* LOG_LOCAL4 */ +#endif /* LOG_LOCAL4 */ static void @@ -97,9 +96,6 @@ usage( char *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) @@ -109,55 +105,47 @@ usage( char *name ) #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" + "\t-n serverName\tservice name\n" +#ifdef HAVE_CHROOT + "\t-r directory\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 ); } -#ifdef HAVE_WINSOCK +#ifdef HAVE_NT_SERVICE_MANAGER void WINAPI ServiceMain( DWORD argc, LPTSTR *argv ) #else int main( int argc, char **argv ) #endif { - int i; - int rc; + int i, no_detach = 0; + int rc = 1; char *urls = NULL; #if defined(HAVE_SETUID) && defined(HAVE_SETGID) char *username = NULL; char *groupname = NULL; #endif +#if defined(HAVE_CHROOT) + char *sandbox = NULL; +#endif #ifdef LOG_LOCAL4 - int syslogUser = DEFAULT_SYSLOG_USER; + int syslogUser = DEFAULT_SYSLOG_USER; #endif -#ifdef HAVE_WINSOCK - char *NTservice = SERVICE_NAME; + + 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; - int serverMode = SLAP_SERVER_MODE; - - int port = LDAP_PORT; -#ifdef HAVE_TLS - int tls_port = LDAPS_PORT; -#else - int tls_port = 0; -#endif + char *serverName = NULL; + int serverMode = SLAP_SERVER_MODE; #ifdef CSRIMALLOC FILE *leakfile; @@ -166,113 +154,98 @@ int main( int argc, char **argv ) } #endif - g_argc = argc; - g_argv = argv; -#ifdef HAVE_WINSOCK +#ifdef HAVE_NT_SERVICE_MANAGER { int *i; char *newConfigFile; + char *newUrls; + char *regService = NULL; if ( is_NT_Service ) { - CommenceStartupProcessing( NTservice, slap_sig_shutdown ); + serverName = argv[0]; + CommenceStartupProcessing( serverName, slap_sig_shutdown ); + if ( strcmp(serverName, SERVICE_NAME) ) + regService = serverName; } - 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" ); + i = (int*)getRegParam( regService, "DebugLevel" ); if ( i != NULL ) { slap_debug = *i; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "main: new debug level from registry is: %d\n", slap_debug )); +#else Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 ); +#endif + } + + newUrls = (char *) getRegParam(regService, "Urls"); + if (newUrls) + { + if (urls) + ch_free(urls); + + urls = ch_strdup(newUrls); +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "main: new urls from registry: %s\n", urls )); +#else + Debug(LDAP_DEBUG_ANY, "new urls from registry: %s\n", + urls, 0, 0); +#endif + } - newConfigFile = (char*)getRegParam( NULL, "ConfigFile" ); + + newConfigFile = (char*)getRegParam( regService, "ConfigFile" ); if ( newConfigFile != NULL ) { configfile = newConfigFile; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "main: new config file from registry is: %s\n", configfile )); +#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:p:s:" + "d:f:h:s:n:" +#ifdef HAVE_CHROOT + "r:" +#endif #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 */ if ( urls != NULL ) free( urls ); urls = ch_strdup( optarg ); - break; + break; + case 'd': /* set debug level and 'do not detach' flag */ + no_detach = 1; #ifdef LDAP_DEBUG - case 'd': /* turn on debugging */ slap_debug |= atoi( optarg ); - break; #else - case 'd': /* turn on debugging */ - fprintf( stderr, - "must compile with LDAP_DEBUG for debugging\n" ); - break; + if ( atoi( optarg ) != 0 ) + fputs( "must compile with LDAP_DEBUG for debugging\n", + stderr ); #endif + break; case 'f': /* read config file */ configfile = ch_strdup( optarg ); 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; - -#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; @@ -284,17 +257,10 @@ int main( int argc, char **argv ) break; #endif -#ifdef LDAP_CONNECTIONLESS - case 'c': /* do connectionless (udp) */ - /* udp = 1; */ - fprintf( stderr, "connectionless support not supported"); - exit( EXIT_FAILURE ); - break; -#endif - -#ifdef SLAPD_BDB2 - case 't': /* timed server */ - serverMode |= SLAP_TIMED_MODE; +#ifdef HAVE_CHROOT + case 'r': + if( sandbox ) free(sandbox); + sandbox = ch_strdup( optarg ); break; #endif @@ -310,11 +276,11 @@ int main( int argc, char **argv ) break; #endif /* SETUID && GETUID */ -#ifdef HAVE_WINSOCK case 'n': /* NT service name */ - NTservice = ch_strdup( optarg ); + if( serverName != NULL ) free( serverName ); + serverName = ch_strdup( optarg ); break; -#endif + default: usage( argv[0] ); rc = 1; @@ -323,51 +289,154 @@ int main( int argc, char **argv ) } } +#ifdef NEW_LOGGING + lutil_log_initialize( argc, argv ); +#endif + + 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; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "%s", Versionstr )); +#else Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 ); +#endif + - if ( (serverName = strrchr( argv[0], *LDAP_DIRSEP )) == NULL ) { - serverName = ch_strdup( argv[0] ); - } else { - serverName = ch_strdup( serverName + 1 ); + if( serverName == NULL ) { + if ( (serverName = strrchr( argv[0], *LDAP_DIRSEP )) == NULL ) { + serverName = argv[0]; + } else { + serverName = serverName + 1; + } } #ifdef LOG_LOCAL4 openlog( serverName, OPENLOG_OPTIONS, syslogUser ); -#else +#elif LOG_DEBUG openlog( serverName, OPENLOG_OPTIONS ); #endif - if( slapd_daemon_init( urls, port, tls_port ) != 0 ) { + if( slapd_daemon_init( urls ) != 0 ) { rc = 1; SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 ); goto stop; } +#if defined(HAVE_CHROOT) + if ( sandbox ) { + if ( chdir( sandbox ) ) { + perror("chdir"); + rc = 1; + goto stop; + } + if ( chroot( sandbox ) ) { + perror("chroot"); + rc = 1; + goto stop; + } + } +#endif + #if defined(HAVE_SETUID) && defined(HAVE_SETGID) if ( username != NULL || groupname != NULL ) { slap_init_user( username, groupname ); } #endif + extops_init(); + +#ifdef SLAPD_MODULES + if ( module_init() != 0 ) { + rc = 1; + SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 17 ); + goto destroy; + } +#endif + if ( slap_init( serverMode, serverName ) != 0 ) { rc = 1; SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 ); goto destroy; } + if ( slap_schema_init( ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "main: schema initialization error\n" )); +#else + Debug( LDAP_DEBUG_ANY, + "schema initialization error\n", + 0, 0, 0 ); +#endif + + goto destroy; + } + if ( read_config( configfile ) != 0 ) { rc = 1; SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 ); goto destroy; } + if ( glue_sub_init( ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "main: subordinate config error\n")); +#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(( "operation", LDAP_LEVEL_CRIT, + "main: schema prep error\n")); +#else + Debug( LDAP_DEBUG_ANY, + "schema prep error\n", + 0, 0, 0 ); +#endif + + goto destroy; + } + #ifdef HAVE_TLS - ldap_pvt_tls_init(); - ldap_pvt_tls_init_def_ctx(); + rc = ldap_pvt_tls_init(); + if( rc != 0) { +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "main: tls init failed: %d\n", rc )); +#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; + } + + 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 )); +#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; + } #endif (void) SIGNAL( LDAP_SIGUSR1, slap_sig_wake ); @@ -390,11 +459,7 @@ int main( int argc, char **argv ) #endif #ifndef HAVE_WINSOCK -#ifdef LDAP_DEBUG - lutil_detach( ldap_debug, 0 ); -#else - lutil_detach( 0, 0 ); -#endif + lutil_detach( no_detach, 0 ); #endif /* HAVE_WINSOCK */ #ifdef CSRIMALLOC @@ -403,14 +468,20 @@ int main( int argc, char **argv ) if ( slap_startup( NULL ) != 0 ) { rc = 1; - SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 ); + SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 ); goto shutdown; } { FILE *fp; +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + "main: slapd starting.\n" )); +#else Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 ); +#endif + if (( slapd_pid_file != NULL ) && (( fp = fopen( slapd_pid_file, "w" )) != NULL )) @@ -430,13 +501,14 @@ int main( int argc, char **argv ) } } -#ifdef HAVE_WINSOCK - LogSlapdStartedEvent( NTservice, slap_debug, configfile, urls ); +#ifdef HAVE_NT_EVENT_LOG + if (is_NT_Service) + LogSlapdStartedEvent( serverName, slap_debug, configfile, urls ); #endif rc = slapd_daemon(); -#ifdef HAVE_WINSOCK +#ifdef HAVE_NT_SERVICE_MANAGER /* Throw away the event that we used during the startup process. */ if ( is_NT_Service ) ldap_pvt_thread_cond_destroy( &started_event ); @@ -450,20 +522,43 @@ destroy: /* remember an error during destroy */ rc |= slap_destroy(); +#ifdef SLAPD_MODULES + module_kill(); +#endif + + extops_kill(); + stop: -#ifdef HAVE_WINSOCK - LogSlapdStoppedEvent( NTservice ); +#ifdef HAVE_NT_EVENT_LOG + if (is_NT_Service) + LogSlapdStoppedEvent( serverName ); #endif +#ifdef NEW_LOGGING + LDAP_LOG(( "operation", LDAP_LEVEL_CRIT, + "main: slapd stopped.\n" )); +#else Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 ); +#endif -#ifdef HAVE_WINSOCK + +#ifdef HAVE_NT_SERVICE_MANAGER ReportSlapdShutdownComplete(); #endif +#ifdef LOG_DEBUG closelog(); +#endif slapd_daemon_destroy(); + schema_destroy(); + +#ifdef HAVE_TLS + ldap_pvt_tls_destroy(); +#endif + + config_destroy(); + #ifdef CSRIMALLOC mal_dumpleaktrace( leakfile ); #endif @@ -486,16 +581,16 @@ 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 (void) wait( NULL ); #endif - (void) SIGNAL( sig, wait4child ); + (void) SIGNAL_REINSTALL( sig, wait4child ); errno = save_errno; } @@ -512,20 +607,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 */