make logs symmetric

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 211fa6386efed866526702ee0ecaaea31aea118c..a6cf3a2e219e52c05416564903a6b123b28a546b 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -126,8 +126,12 @@ slapadd( int argc, char **argv )
        }
 
        if ( enable_meter 
-            && !fstat ( fileno ( ldiffp->fp ), &stat_buf )
-            && S_ISREG(stat_buf.st_mode) ) {
+#ifdef LDAP_DEBUG
+               /* tools default to "none" */
+               && slap_debug == LDAP_DEBUG_NONE
+#endif
+               && !fstat ( fileno ( ldiffp->fp ), &stat_buf )
+               && S_ISREG(stat_buf.st_mode) ) {
                enable_meter = !lutil_meter_open(
                        &meter,
                        &lutil_meter_text_display,
@@ -139,7 +143,9 @@ slapadd( int argc, char **argv )
 
        /* nextline is the line number of the end of the current entry */
        for( lineno=1; ldif_read_record( ldiffp, &nextline, &buf, &lmax );
-               lineno=nextline+1 ) {
+               lineno=nextline+1 )
+       {
+               BackendDB *bd;
                Entry *e;
 
                if ( lineno < jumpline )
@@ -169,9 +175,28 @@ slapadd( int argc, char **argv )
 
                /* make sure the DN is not empty */
                if( BER_BVISEMPTY( &e->e_nname ) &&
-                       !BER_BVISEMPTY( be->be_nsuffix )) {
-                       fprintf( stderr, "%s: empty dn=\"%s\" (line=%d)\n",
-                               progname, e->e_dn, lineno );
+                       !BER_BVISEMPTY( be->be_nsuffix ))
+               {
+                       fprintf( stderr, "%s: line %d: "
+                               "cannot add entry with empty dn=\"%s\"",
+                               progname, lineno, e->e_dn );
+                       bd = select_backend( &e->e_nname, nosubordinates );
+                       if ( bd ) {
+                               BackendDB *bdtmp;
+                               int dbidx = 0;
+                               LDAP_STAILQ_FOREACH( bdtmp, &backendDB, be_next ) {
+                                       if ( bdtmp == bd ) break;
+                                       dbidx++;
+                               }
+
+                               assert( bdtmp != NULL );
+                               
+                               fprintf( stderr, "; did you mean to use database #%d (%s)?",
+                                       dbidx,
+                                       bd->be_suffix[0].bv_val );
+
+                       }
+                       fprintf( stderr, "\n" );
                        rc = EXIT_FAILURE;
                        entry_free( e );
                        if( continuemode ) continue;
@@ -179,19 +204,32 @@ slapadd( int argc, char **argv )
                }
 
                /* check backend */
-               if( select_backend( &e->e_nname, nosubordinates )
-                       != be )
-               {
+               bd = select_backend( &e->e_nname, nosubordinates );
+               if ( bd != be ) {
                        fprintf( stderr, "%s: line %d: "
-                               "database (%s) not configured to hold \"%s\"\n",
+                               "database #%d (%s) not configured to hold \"%s\"",
                                progname, lineno,
-                               be ? be->be_suffix[0].bv_val : "<none>",
+                               dbnum,
+                               be->be_suffix[0].bv_val,
                                e->e_dn );
-                       fprintf( stderr, "%s: line %d: "
-                               "database (%s) not configured to hold \"%s\"\n",
-                               progname, lineno,
-                               be ? be->be_nsuffix[0].bv_val : "<none>",
-                               e->e_ndn );
+                       if ( bd ) {
+                               BackendDB *bdtmp;
+                               int dbidx = 0;
+                               LDAP_STAILQ_FOREACH( bdtmp, &backendDB, be_next ) {
+                                       if ( bdtmp == bd ) break;
+                                       dbidx++;
+                               }
+
+                               assert( bdtmp != NULL );
+                               
+                               fprintf( stderr, "; did you mean to use database #%d (%s)?",
+                                       dbidx,
+                                       bd->be_suffix[0].bv_val );
+
+                       } else {
+                               fprintf( stderr, "; no database configured for that naming context" );
+                       }
+                       fprintf( stderr, "\n" );
                        rc = EXIT_FAILURE;
                        entry_free( e );
                        if( continuemode ) continue;
@@ -467,6 +505,9 @@ slapadd( int argc, char **argv )
        ch_free( buf );
 
        if ( !dryrun ) {
+               if ( enable_meter ) {
+                       fprintf( stderr, "Closing DB..." );
+               }
                if( be->be_entry_close( be ) ) {
                        rc = EXIT_FAILURE;
                }
@@ -474,6 +515,9 @@ slapadd( int argc, char **argv )
                if( be->be_sync ) {
                        be->be_sync( be );
                }
+               if ( enable_meter ) {
+                       fprintf( stderr, "\n" );
+               }
        }
 
        if ( slap_tool_destroy())