Use defined Root DSE attributes.

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 3933792bf8458744801b1b94c89b83affa1520c0..66e90f79c660fad84871d89cfb8eed97023c34de 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -17,6 +17,7 @@
 
 #include "slap.h"
 #include "lutil.h"
+#include "ldif.h"
 
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
@@ -69,14 +70,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 },
@@ -90,7 +91,7 @@ static STRDISP  syslog_types[] = {
 
 static int   cnvt_str2int( char *, STRDISP_P, int );
 
-#endif  /* LOG_LOCAL4 */
+#endif /* LOG_LOCAL4 */
 
 
 static void
@@ -136,7 +137,7 @@ int main( int argc, char **argv )
        char *sandbox = NULL;
 #endif
 #ifdef LOG_LOCAL4
-    int     syslogUser = DEFAULT_SYSLOG_USER;
+    int            syslogUser = DEFAULT_SYSLOG_USER;
 #endif
 
 #ifdef HAVE_NT_SERVICE_MANAGER
@@ -144,8 +145,8 @@ int main( int argc, char **argv )
 #else
        char            *configfile = SLAPD_DEFAULT_CONFIGFILE;
 #endif
-       char        *serverName = NULL;
-       int         serverMode = SLAP_SERVER_MODE;
+       char        *serverName = NULL;
+       int         serverMode = SLAP_SERVER_MODE;
 
 #ifdef CSRIMALLOC
        FILE *leakfile;
@@ -176,8 +177,8 @@ int main( int argc, char **argv )
                {
                        slap_debug = *i;
 #ifdef NEW_LOGGING
-                        LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                                   "main: new debug level from registry is: %d\n", slap_debug ));
+                       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
@@ -191,8 +192,8 @@ int main( int argc, char **argv )
 
                    urls = ch_strdup(newUrls);
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                               "main: new urls from registry: %s\n", urls ));
+                   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);
@@ -205,8 +206,8 @@ int main( int argc, char **argv )
                {
                        configfile = newConfigFile;
 #ifdef NEW_LOGGING
-                        LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                                   "main: new config file from registry is: %s\n", configfile ));
+                       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
@@ -231,7 +232,7 @@ int main( int argc, char **argv )
                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;
@@ -292,7 +293,7 @@ int main( int argc, char **argv )
        }
 
 #ifdef NEW_LOGGING
-        lutil_log_initialize( argc, argv );
+       lutil_log_initialize( argc, argv );
 #endif
 
        lutil_set_debug_level( "slapd", slap_debug );
@@ -301,8 +302,8 @@ int main( int argc, char **argv )
        ldif_debug = slap_debug;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                   "%s", Versionstr ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                  "%s", Versionstr ));
 #else
        Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
 #endif
@@ -367,8 +368,8 @@ int main( int argc, char **argv )
 
        if ( schema_init( ) != 0 ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                       "main: schema initialization error\n" ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                          "main: schema initialization error\n" ));
 #else
                Debug( LDAP_DEBUG_ANY,
                    "schema initialization error\n",
@@ -386,8 +387,8 @@ int main( int argc, char **argv )
 
        if ( schema_prep( ) != 0 ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                       "main: schema prep error\n"));
+               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                          "main: schema prep error\n"));
 #else
                Debug( LDAP_DEBUG_ANY,
                    "schema prep error\n",
@@ -399,8 +400,30 @@ int main( int argc, char **argv )
 
 #ifdef HAVE_TLS
        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 (rc || 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;
@@ -444,8 +467,8 @@ int main( int argc, char **argv )
                FILE *fp;
 
 #ifdef NEW_LOGGING
-                LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                           "main: slapd starting.\n" ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "main: slapd starting.\n" ));
 #else
                Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
 #endif
@@ -503,8 +526,8 @@ stop:
 #endif
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                   "main: slapd stopped.\n" ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+                  "main: slapd stopped.\n" ));
 #else
        Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
 #endif
@@ -567,20 +590,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 */