Fix startup check

[openldap] / servers / slapd / slapdn.c

diff --git a/servers/slapd/slapdn.c b/servers/slapd/slapdn.c
index 7eb4b823cd3cc05b1991363b412e348343ffd9d0..400d5071db5b2bfb6fe81c441654cf749ac4c26d 100644 (file)
--- a/servers/slapd/slapdn.c
+++ b/servers/slapd/slapdn.c
@@ -1,6 +1,6 @@
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -37,12 +37,9 @@
 int
 slapdn( int argc, char **argv )
 {
-       int                     rc = EXIT_SUCCESS;
+       int                     rc = 0;
        const char              *progname = "slapdn";
 
-#ifdef NEW_LOGGING
-       lutil_log_initialize( argc, argv );
-#endif
        slap_tool_init( progname, SLAPDN, argc, argv );
 
        argv = &argv[ optind ];
@@ -59,7 +56,10 @@ slapdn( int argc, char **argv )
                        fprintf( stderr, "DN: <%s> check failed %d (%s)\n",
                                        dn.bv_val, rc,
                                        ldap_err2string( rc ) );
-                       rc = 1;
+                       if ( !continuemode ) {
+                               rc = -1;
+                               break;
+                       }
                        
                } else {
                        fprintf( stderr, "DN: <%s> check succeeded\n"
@@ -69,7 +69,6 @@ slapdn( int argc, char **argv )
                                        ndn.bv_val, pdn.bv_val );
                        ch_free( ndn.bv_val );
                        ch_free( pdn.bv_val );
-                       rc = 0;
                }
        }