Fix objectSubClassIndexer bug

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 686d9cfa35bae2df874c34bafc6232b3c8ab9899..8a40fe52a7ddf9fff083e68ddcb6f874490921b5 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -7,7 +7,6 @@
 
 #include <stdio.h>
 
-#include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -89,6 +88,7 @@ static int   cnvt_str2int( char *, STRDISP_P, int );
 
 #endif /* LOG_LOCAL4 */
 
+static int check_config = 0;
 
 static void
 usage( char *name )
@@ -96,22 +96,25 @@ usage( char *name )
        fprintf( stderr,
                "usage: %s options\n", name );
        fprintf( stderr,
-               "\t-d level\tDebug Level" "\n"
-               "\t-f filename\tConfiguration File\n"
+               "\t-4\t\tIPv4 only\n"
+               "\t-6\t\tIPv6 only\n"
+               "\t-d level\tDebug level" "\n"
+               "\t-f filename\tConfiguration file\n"
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
                "\t-g group\tGroup (id or name) to run as\n"
 #endif
-               "\t-h URLs\tList of URLs to serve\n"
+               "\t-h URLs\t\tList of URLs to serve\n"
 #ifdef LOG_LOCAL4
-               "\t-l sysloguser\tSyslog User (default: LOCAL4)\n"
+               "\t-l facility\tSyslog facility (default: LOCAL4)\n"
 #endif
-               "\t-n serverName\tservice name\n"
+               "\t-n serverName\tService name\n"
 #ifdef HAVE_CHROOT
-               "\t-r directory\n"
+               "\t-r directory\tSandbox directory to chroot to\n"
 #endif
-               "\t-s level\tSyslog Level\n"
+               "\t-s level\tSyslog level\n"
+               "\t-t\t\tCheck configuration file and exit\n"
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
-               "\t-u user\tUser (id or name) to run as\n"
+               "\t-u user\t\tUser (id or name) to run as\n"
 #endif
     );
 }
@@ -174,8 +177,10 @@ 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 ));
+                       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
@@ -189,8 +194,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( 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);
@@ -203,8 +208,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( 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
@@ -214,7 +219,10 @@ int main( int argc, char **argv )
 #endif
 
        while ( (i = getopt( argc, argv,
-                            "d:f:h:s:n:"
+                            "d:f:h:s:n:t"
+#if LDAP_PF_INET6
+                               "46"
+#endif
 #ifdef HAVE_CHROOT
                                "r:"
 #endif
@@ -226,6 +234,15 @@ int main( int argc, char **argv )
 #endif
                             )) != EOF ) {
                switch ( i ) {
+#ifdef LDAP_PF_INET6
+               case '4':
+                       slap_inet4or6 = AF_INET;
+                       break;
+               case '6':
+                       slap_inet4or6 = AF_INET6;
+                       break;
+#endif
+
                case 'h':       /* listen URLs */
                        if ( urls != NULL ) free( urls );
                        urls = ch_strdup( optarg );
@@ -281,6 +298,10 @@ int main( int argc, char **argv )
                        serverName = ch_strdup( optarg );
                        break;
 
+               case 't':
+                       check_config++;
+                       break;
+
                default:
                        usage( argv[0] );
                        rc = 1;
@@ -291,16 +312,15 @@ int main( int argc, char **argv )
 
 #ifdef NEW_LOGGING
        lutil_log_initialize( argc, argv );
-#endif
-
+#else
        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;
+#endif
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                  "%s", Versionstr ));
+       LDAP_LOG( SLAPD, INFO, "%s", Versionstr, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
 #endif
@@ -320,7 +340,7 @@ int main( int argc, char **argv )
        openlog( serverName, OPENLOG_OPTIONS );
 #endif
 
-       if( slapd_daemon_init( urls ) != 0 ) {
+       if( !check_config && slapd_daemon_init( urls ) != 0 ) {
                rc = 1;
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
                goto stop;
@@ -365,8 +385,7 @@ int main( int argc, char **argv )
 
        if ( slap_schema_init( ) != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                          "main: schema initialization error\n" ));
+               LDAP_LOG( OPERATION, CRIT, "main: schema initialization error\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                    "schema initialization error\n",
@@ -376,16 +395,36 @@ int main( int argc, char **argv )
                goto destroy;
        }
 
-       if ( read_config( configfile ) != 0 ) {
+#ifdef HAVE_TLS
+       /* Library defaults to full certificate checking. This is correct when
+        * a client is verifying a server because all servers should have a
+        * valid cert. But few clients have valid certs, so we want our default
+        * to be no checking. The config file can override this as usual.
+        */
+       rc = 0;
+       (void) ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc );
+#endif
+
+       if ( read_config( configfile, 0 ) != 0 ) {
                rc = 1;
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
+
+               if ( check_config ) {
+                       fprintf( stderr, "config check failed\n" );
+               }
+
+               goto destroy;
+       }
+
+       if ( check_config ) {
+               rc = 0;
+               fprintf( stderr, "config check succeeded\n" );
                goto destroy;
        }
 
        if ( glue_sub_init( ) != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                          "main: subordinate config error\n"));
+               LDAP_LOG( SLAPD, CRIT, "main: subordinate config error\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                    "subordinate config error\n",
@@ -396,8 +435,7 @@ int main( int argc, char **argv )
 
        if ( slap_schema_check( ) != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                          "main: schema prep error\n"));
+               LDAP_LOG( SLAPD, CRIT, "main: schema prep error\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                    "schema prep error\n",
@@ -411,8 +449,7 @@ int main( int argc, char **argv )
        rc = ldap_pvt_tls_init();
        if( rc != 0) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                          "main: tls init failed: %d\n", rc ));
+               LDAP_LOG( SLAPD, CRIT, "main: tls init failed: %d\n", rc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                    "main: TLS init failed: %d\n",
@@ -426,8 +463,7 @@ int main( int argc, char **argv )
        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 ));
+               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",
@@ -476,8 +512,7 @@ int main( int argc, char **argv )
                FILE *fp;
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                          "main: slapd starting.\n" ));
+               LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
 #endif
@@ -535,8 +570,7 @@ stop:
 #endif
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                  "main: slapd stopped.\n" ));
+       LDAP_LOG( SLAPD, CRIT, "main: slapd stopped.\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
 #endif