minor naming cleanup; improvements to DN mapping layer; major docs update

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 2e2dc924d2ee1aabacc7b5c40de92a0930a3f190..d458acb033e11974ad473f9420b665e098fbffce 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
@@ -501,7 +501,6 @@ unhandled_option:;
 
        (void) ldap_pvt_thread_initialize();
 
-       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;
@@ -621,6 +620,12 @@ unhandled_option:;
                goto destroy;
        }
 
+#ifdef SLAP_DYNACL
+       if ( acl_init() ) {
+               goto destroy;
+       }
+#endif /* SLAP_DYNACL */
+
        if ( read_config( configfile, 0 ) != 0 ) {
                rc = 1;
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
@@ -642,13 +647,6 @@ unhandled_option:;
                }
        }
 
-       if ( glue_sub_init( ) != 0 ) {
-               Debug( LDAP_DEBUG_ANY,
-                   "subordinate config error\n",
-                   0, 0, 0 );
-               goto destroy;
-       }
-
        if ( slap_schema_check( ) != 0 ) {
                Debug( LDAP_DEBUG_ANY,
                    "schema prep error\n",