Reorder DN check

diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
index 4cf22f2457dd5a647923943868ab4812a12361fe..ab8f06c01a97e8e00e3b6ea0256cd27cae68fb3f 100644 (file)
--- a/servers/slapd/tools/slapadd.c
+++ b/servers/slapd/tools/slapadd.c
@@ -59,7 +59,7 @@ main( int argc, char **argv )
 
                /* make sure the DN is valid */
                if( dn_normalize( e->e_ndn ) == NULL ) {
-                       fprintf( stderr, "%s: bad dn=\"%s\" (line=%d)\n",
+                       fprintf( stderr, "%s: invalid dn=\"%s\" (line=%d)\n",
                                progname, e->e_dn, lineno );
                        rc = EXIT_FAILURE;
                        entry_free( e );
@@ -67,7 +67,7 @@ main( int argc, char **argv )
                        break;
                }
 
-               /* make sure the DN is valid */
+               /* make sure the DN is not empty */
                if( e->e_ndn == '\0' ) {
                        fprintf( stderr, "%s: empty dn=\"%s\" (line=%d)\n",
                                progname, e->e_dn, lineno );
@@ -77,6 +77,17 @@ main( int argc, char **argv )
                        break;
                }
 
+               /* check backend */
+               if( select_backend( e->e_ndn ) != be ) {
+                       fprintf( stderr, "%s: database not configured to "
+                               "hold dn=\"%s\" (line=%d)\n",
+                               progname, e->e_dn, lineno );
+                       rc = EXIT_FAILURE;
+                       entry_free( e );
+                       if( continuemode ) continue;
+                       break;
+               }
+
                if( !noschemacheck ) {
                        /* check schema */
                        const char *text;
@@ -88,16 +99,6 @@ main( int argc, char **argv )
                                if( continuemode ) continue;
                                break;
                        }
-
-                       /* check backend */
-                       if( select_backend( e->e_ndn ) != be ) {
-                               fprintf( stderr, "%s: database not configured to hold dn=\"%s\" (line=%d)\n",
-                                       progname, e->e_dn, lineno );
-                               rc = EXIT_FAILURE;
-                               entry_free( e );
-                               if( continuemode ) continue;
-                               break;
-                       }
                }
 
                id = be->be_entry_put( be, e );