/* $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"
#include <ac/time.h>
#include <ac/unistd.h>
#include <ac/wait.h>
-#include <ac/signal.h>
#include <ac/errno.h>
+#include "ldap_pvt.h"
+
#include "slap.h"
#include "lutil.h"
+#include "ldif.h"
#ifdef LDAP_SIGCHLD
static RETSIGTYPE wait4child( int sig );
#ifdef HAVE_NT_SERVICE_MANAGER
#define MAIN_RETURN(x) return
-struct sockaddr_in bind_addr;
-
-/* in nt_main.c */
-LIBLUTIL_F (SERVICE_STATUS) SLAPDServiceStatus;
-LIBLUTIL_F (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 serviceName,
+void CommenceStartupProcessing( LPCTSTR serverName,
void(*stopper)(int));
void ReportSlapdShutdownComplete( void );
void *getRegParam( char *svc, char *value );
#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 },
static int cnvt_str2int( char *, STRDISP_P, int );
-#endif /* LOG_LOCAL4 */
+#endif /* LOG_LOCAL4 */
static void
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)
#ifdef LOG_LOCAL4
"\t-l sysloguser\tSyslog User (default: LOCAL4)\n"
#endif
-#ifdef HAVE_NT_EVENT_LOG
- "\t-n NTserviceName\tNT service name\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
#endif
{
int i, no_detach = 0;
- int rc;
+ int rc = 1;
char *urls = NULL;
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
char *username = NULL;
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_EVENT_LOG
- char *NTservice = SERVICE_NAME;
-#endif
#ifdef HAVE_NT_SERVICE_MANAGER
char *configfile = ".\\slapd.conf";
#else
char *configfile = SLAPD_DEFAULT_CONFIGFILE;
#endif
- char *serverName;
- int serverMode = SLAP_SERVER_MODE;
+ char *serverName = NULL;
+ int serverMode = SLAP_SERVER_MODE;
#ifdef CSRIMALLOC
FILE *leakfile;
}
#endif
- g_argc = argc;
- g_argv = argv;
#ifdef HAVE_NT_SERVICE_MANAGER
{
char *regService = NULL;
if ( is_NT_Service ) {
- NTservice = argv[0];
- CommenceStartupProcessing( NTservice, slap_sig_shutdown );
- if ( strcmp(NTservice, SERVICE_NAME) )
- regService = NTservice;
+ serverName = argv[0];
+ CommenceStartupProcessing( serverName, slap_sig_shutdown );
+ if ( strcmp(serverName, SERVICE_NAME) )
+ regService = serverName;
}
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");
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( 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: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_NT_EVENT_LOG
- "n:"
#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;
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;
- break;
-#endif
-
#ifdef HAVE_CHROOT
case 'r':
if( sandbox ) free(sandbox);
break;
#endif /* SETUID && GETUID */
-#ifdef HAVE_NT_EVENT_LOG
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;
}
}
+#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
}
#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
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();
+ 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;
+ }
- if (ldap_pvt_tls_init_def_ctx() != 0)
- {
+ 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;
{
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 ))
#ifdef HAVE_NT_EVENT_LOG
if (is_NT_Service)
- LogSlapdStartedEvent( NTservice, slap_debug, configfile, urls );
+ LogSlapdStartedEvent( serverName, slap_debug, configfile, urls );
#endif
rc = slapd_daemon();
stop:
#ifdef HAVE_NT_EVENT_LOG
if (is_NT_Service)
- LogSlapdStoppedEvent( NTservice );
+ 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_NT_SERVICE_MANAGER
ReportSlapdShutdownComplete();
#endif
slapd_daemon_destroy();
+ schema_destroy();
+
+#ifdef HAVE_TLS
+ ldap_pvt_tls_destroy();
+#endif
+
+ config_destroy();
+
#ifdef CSRIMALLOC
mal_dumpleaktrace( leakfile );
#endif
#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;
}
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 */
projects / openldap / blobdiff