Tone down debug messages

[openldap] / servers / slapd / slapcommon.c

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 8d0e032f6d0725784a013edb4ec2aaee13bd0be4..a1d8c0d9d819d92a9324a15dd299b9a0287eabc6 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -63,7 +63,7 @@ usage( int tool, const char *progname )
 
        case SLAPADD:
                options = " [-c]\n\t[-g] [-n databasenumber | -b suffix]\n"
-                       "\t[-l ldiffile] [-q] [-u] [-w]\n";
+                       "\t[-l ldiffile] [-q] [-u] [-s] [-w]\n";
                break;
 
        case SLAPAUTH:
@@ -174,6 +174,8 @@ parse_slapacl( void )
  *     argc, argv      command line arguments
  */
 
+static int need_shutdown;
+
 void
 slap_tool_init(
        const char* progname,
@@ -209,7 +211,7 @@ slap_tool_init(
 
        switch( tool ) {
        case SLAPADD:
-               options = "b:cd:f:F:gl:n:qtuvw";
+               options = "b:cd:f:F:gl:n:qstuvw";
                break;
 
        case SLAPCAT:
@@ -265,59 +267,19 @@ slap_tool_init(
                case 'd': {     /* turn on debugging */
                        int     level = 0;
 
+                       if ( parse_debug_level( optarg, &level ) ) {
+                               usage( tool, progname );
+                       }
 #ifdef LDAP_DEBUG
-                       if ( optarg != NULL && optarg[ 0 ] != '-' && !isdigit( optarg[ 0 ] ) )
-                       {
-                               int     i, goterr = 0;
-                               char    **levels;
-
-                               levels = ldap_str2charray( optarg, "," );
-
-                               for ( i = 0; levels[ i ] != NULL; i++ ) {
-                                       level = 0;
-
-                                       if ( str2loglevel( levels[ i ], &level ) ) {
-                                               fprintf( stderr,
-                                                       "unrecognized log level "
-                                                       "\"%s\"\n", levels[ i ] );
-                                               goterr = 1;
-                                               /* but keep parsing... */
-
-                                       } else {
-                                               if ( level != 0 ) {
-                                                       slap_debug |= level;
-
-                                               } else {
-                                                       /* allow to reset log level */
-                                                       slap_debug = 0;
-                                               }
-                                       }
-                               }
-
-                               ldap_charray_free( levels );
-
-                               if ( goterr ) {
-                                       usage( tool, progname );
-                               }
+                       if ( level == 0 ) {
+                               /* allow to reset log level */
+                               slap_debug = 0;
 
                        } else {
-                               if ( lutil_atoix( &level, optarg, 0 ) != 0 ) {
-                                       fprintf( stderr,
-                                               "unrecognized log level "
-                                               "\"%s\"\n", optarg );
-                                       usage( tool, progname );
-                               }
-
-                               if ( level != 0 ) {
-                                       slap_debug |= level;
-
-                               } else {
-                                       /* allow to reset log level */
-                                       slap_debug = 0;
-                               }
+                               slap_debug |= level;
                        }
 #else
-                       if ( lutil_atoi( &level, optarg ) != 0 || level != 0 )
+                       if ( level != 0 )
                                fputs( "must compile with LDAP_DEBUG for debugging\n",
                                       stderr );
 #endif
@@ -382,7 +344,10 @@ slap_tool_init(
                        break;
 
                case 's':       /* dump subtree */
-                       subtree = strdup( optarg );
+                       if ( tool == SLAPADD )
+                               mode |= SLAP_TOOL_NO_SCHEMA_CHECK;
+                       else if ( tool == SLAPCAT )
+                               subtree = strdup( optarg );
                        break;
 
                case 't':       /* turn on truncate */
@@ -663,6 +628,8 @@ startup:;
 
        /* slapdn doesn't specify a backend to startup */
        if ( !dryrun && tool != SLAPDN && slap_startup( be ) ) {
+               need_shutdown = 1;
+
                switch ( tool ) {
                case SLAPTEST:
                        fprintf( stderr, "slap_startup failed "
@@ -682,7 +649,9 @@ startup:;
 void slap_tool_destroy( void )
 {
        if ( !dryrun ) {
-               slap_shutdown( be );
+               if ( need_shutdown ) {
+                       slap_shutdown( be );
+               }
                slap_destroy();
        }
 #ifdef SLAPD_MODULES