X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=944faff679c8cefdb3285fe57b004a65dbf3035b;hb=f955f17076dc185a589d90baa2acd33afc4c1448;hp=4c31804531739b55d4b2fc40ad4e35fa2bfde4cc;hpb=650ca42066351f2a15b64a52a853e41d6dde4ffb;p=openldap
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 4c31804531..944faff679 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,6 @@
#include
#include
-#include "ldap_pvt.h"
-
#include "slap.h"
#include "lutil.h"
#include "ldif.h"
@@ -100,7 +98,6 @@ const char Versionstr[] =
#endif
#ifdef LOG_LOCAL4
-
#define DEFAULT_SYSLOG_USER LOG_LOCAL4
typedef struct _str2intDispatch {
@@ -109,7 +106,6 @@ typedef struct _str2intDispatch {
int intVal;
} STRDISP, *STRDISP_P;
-
/* table to compute syslog-options to integer */
static STRDISP syslog_types[] = {
{ "LOCAL0", sizeof("LOCAL0"), LOG_LOCAL0 },
@@ -120,11 +116,16 @@ static STRDISP syslog_types[] = {
{ "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 );
-
+static int cnvt_str2int( char *, STRDISP_P, int );
#endif /* LOG_LOCAL4 */
#define CHECK_NONE 0x00
@@ -204,7 +205,7 @@ usage( char *name )
"\t-l facility\tSyslog facility (default: LOCAL4)\n"
#endif
"\t-n serverName\tService name\n"
- "\t-o [=val] Generic means to specify options" );
+ "\t-o [=val] generic means to specify options" );
if ( !BER_BVISNULL( &option_helpers[0].oh_name ) ) {
int i;
@@ -252,13 +253,14 @@ int main( int argc, char **argv )
#ifdef HAVE_NT_SERVICE_MANAGER
char *configfile = ".\\slapd.conf";
+ char *configdir = ".\\slapd.d";
#else
char *configfile = SLAPD_DEFAULT_CONFIGFILE;
+ char *configdir = SLAPD_DEFAULT_CONFIGDIR;
#endif
char *serverName;
int serverMode = SLAP_SERVER_MODE;
- struct berval cookie = BER_BVNULL;
struct sync_cookie *scp = NULL;
struct sync_cookie *scp_entry = NULL;
@@ -288,6 +290,7 @@ int main( int argc, char **argv )
{
int *i;
char *newConfigFile;
+ char *newConfigDir;
char *newUrls;
char *regService = NULL;
@@ -300,15 +303,8 @@ int main( int argc, char **argv )
i = (int*)lutil_getRegParam( regService, "DebugLevel" );
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 *) lutil_getRegParam(regService, "Urls");
@@ -317,30 +313,26 @@ 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*)lutil_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
+ }
+
+ newConfigDir = (char*)lutil_getRegParam( regService, "ConfigDir" );
+ if ( newConfigDir != NULL ) {
+ configdir = newConfigDir;
+ Debug ( LDAP_DEBUG_ANY, "new config dir from registry is: %s\n", configdir, 0, 0 );
}
}
#endif
while ( (i = getopt( argc, argv,
- "c:d:f:h:n:o:s:StT:V"
+ "c:d:f:F:h:n:o:s:StT:V"
#if LDAP_PF_INET6
"46"
#endif
@@ -372,21 +364,14 @@ int main( int argc, char **argv )
case 'c': /* provide sync cookie, override if exist in replica */
scp = (struct sync_cookie *) ch_calloc( 1,
sizeof( struct sync_cookie ));
- ber_str2bv( optarg, strlen( optarg ), 1, &cookie );
- ber_bvarray_add( &scp->octet_str, &cookie );
+ ber_str2bv( optarg, 0, 1, &scp->octet_str );
slap_parse_sync_cookie( scp );
LDAP_STAILQ_FOREACH( scp_entry, &slap_sync_cookie, sc_next ) {
if ( scp->rid == scp_entry->rid ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "main: duplicated replica id in cookies\n",
- 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"main: duplicated replica id in cookies\n",
0, 0, 0 );
-#endif
slap_sync_cookie_free( scp, 1 );
goto destroy;
}
@@ -409,6 +394,10 @@ int main( int argc, char **argv )
configfile = ch_strdup( optarg );
break;
+ case 'F': /* use config dir */
+ configdir = ch_strdup( optarg );
+ break;
+
case 'o': {
char *val = strchr( optarg, '=' );
struct berval opt;
@@ -450,7 +439,7 @@ int main( int argc, char **argv )
#ifdef LOG_LOCAL4
case 'l': /* set syslog local user */
syslogUser = cnvt_str2int( optarg,
- syslog_types, DEFAULT_SYSLOG_USER );
+ syslog_types, DEFAULT_SYSLOG_USER );
break;
#endif
@@ -521,14 +510,11 @@ unhandled_option:;
}
}
-#ifdef NEW_LOGGING
- lutil_log_initialize( argc, argv );
-#else
- lutil_set_debug_level( "slapd", slap_debug );
+ (void) ldap_pvt_thread_initialize();
+
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
if ( version ) {
fprintf( stderr, "%s\n", Versionstr );
@@ -554,11 +540,7 @@ unhandled_option:;
#endif
}
-#ifdef NEW_LOGGING
- LDAP_LOG( SLAPD, INFO, "%s", Versionstr, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "%s", Versionstr, 0, 0 );
-#endif
if( check == CHECK_NONE && slapd_daemon_init( urls ) != 0 ) {
rc = 1;
@@ -600,13 +582,9 @@ unhandled_option:;
#endif
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;
}
@@ -618,13 +596,9 @@ unhandled_option:;
}
if ( slap_controls_init( ) != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT, "main: controls initialization error\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"controls initialization error\n",
0, 0, 0 );
-#endif
goto destroy;
}
@@ -641,23 +615,29 @@ unhandled_option:;
#ifdef LDAP_SLAPI
if ( slapi_int_initialize() != 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 ( frontend_init() ) {
+ goto destroy;
+ }
+
if ( overlay_init() ) {
goto destroy;
}
- if ( read_config( configfile, 0 ) != 0 ) {
+#ifdef SLAP_DYNACL
+ if ( acl_init() ) {
+ goto destroy;
+ }
+#endif /* SLAP_DYNACL */
+
+ if ( read_config( configfile, configdir ) != 0 ) {
rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
@@ -678,25 +658,10 @@ unhandled_option:;
}
}
- 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;
}
@@ -704,13 +669,9 @@ unhandled_option:;
#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;
@@ -727,13 +688,9 @@ unhandled_option:;
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",
rc, 0, 0 );
-#endif
rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
goto destroy;
@@ -756,6 +713,9 @@ unhandled_option:;
#endif
(void) SIGNAL( SIGINT, slap_sig_shutdown );
(void) SIGNAL( SIGTERM, slap_sig_shutdown );
+#ifdef SIGTRAP
+ (void) SIGNAL( SIGTRAP, slap_sig_shutdown );
+#endif
#ifdef LDAP_SIGCHLD
(void) SIGNAL( LDAP_SIGCHLD, wait4child );
#endif
@@ -784,11 +744,7 @@ unhandled_option:;
goto shutdown;
}
-#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 ) {
@@ -860,11 +816,7 @@ stop:
lutil_LogStoppedEvent( 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