X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapcommon.c;h=01a49554ebc3cc06daf23c4c4a0f55138ace5d72;hb=e7ddb6155c74b320d4714b953f2c1c7d2ab748ff;hp=714e2bcca747f7d2004cf394555f66ec84b54b88;hpb=9ac070beb39ea164633914151f1c1a159d870730;p=openldap diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c index 714e2bcca7..01a49554eb 100644 --- a/servers/slapd/slapcommon.c +++ b/servers/slapd/slapcommon.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2013 The OpenLDAP Foundation. + * Copyright 1998-2014 The OpenLDAP Foundation. * Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 2003 IBM Corporation. * All rights reserved. @@ -92,7 +92,7 @@ usage( int tool, const char *progname ) break; case SLAPTEST: - options = " [-n databasenumber] [-u]\n"; + options = " [-n databasenumber] [-u] [-Q]\n"; break; case SLAPSCHEMA: @@ -786,6 +786,11 @@ slap_tool_init( ber_memfree( nbase.bv_val ); BER_BVZERO( &nbase ); + if( be == NULL ) { + fprintf( stderr, "%s: slap_init no backend for \"%s\"\n", + progname, base.bv_val ); + exit( EXIT_FAILURE ); + } switch ( tool ) { case SLAPACL: goto startup; @@ -794,11 +799,6 @@ slap_tool_init( break; } - if( be == NULL ) { - fprintf( stderr, "%s: slap_init no backend for \"%s\"\n", - progname, base.bv_val ); - exit( EXIT_FAILURE ); - } /* If the named base is a glue master, operate on the * entire context */