X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapadd.c;h=d975034313f1696bcc9b29f647347dcab4f2fc96;hb=6d1aa51604a7ae9c44287af5201afc9f43b5e91e;hp=211fa6386efed866526702ee0ecaaea31aea118c;hpb=d0515c40175f564520a7945ec0d1531a9fe92599;p=openldap

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 211fa6386e..d975034313 100644
--- 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())