ITS#3576 use actual backend (not glue instance) for restriction and

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 09f674dd8c4c825b448b91cdd4685707ec6651d8..944faff679c8cefdb3285fe57b004a65dbf3035b 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * 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 <ac/wait.h>
 #include <ac/errno.h>
 
-#include "ldap_pvt.h"
-
 #include "slap.h"
 #include "lutil.h"
 #include "ldif.h"
@@ -255,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;
 
@@ -291,6 +290,7 @@ int main( int argc, char **argv )
        {
                int *i;
                char *newConfigFile;
+               char *newConfigDir;
                char *newUrls;
                char *regService = NULL;
 
@@ -303,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");
@@ -320,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
@@ -375,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;
                                }
@@ -412,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;
@@ -524,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 );
@@ -557,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;
@@ -603,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;
        }
@@ -621,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;
        }
@@ -644,13 +615,9 @@ 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;
        }
@@ -664,7 +631,13 @@ unhandled_option:;
                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 );
 
@@ -685,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;
        }
@@ -711,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;
@@ -734,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;
@@ -763,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
@@ -791,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 ) {
@@ -867,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