ITS#5860 - more for entry cache counts

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 211fa6386efed866526702ee0ecaaea31aea118c..d975034313f1696bcc9b29f647347dcab4f2fc96 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,
@@ -467,6 +471,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 +481,9 @@ slapadd( int argc, char **argv )
                if( be->be_sync ) {
                        be->be_sync( be );
                }
+               if ( enable_meter ) {
+                       fprintf( stderr, "\n" );
+               }
        }
 
        if ( slap_tool_destroy())