From 9a55fe709c79ca6a6c4a5d67a69807c584befd0f Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Tue, 14 Aug 2007 13:42:40 +0000 Subject: [PATCH] add '-Q' switch (used by slaptest only; ITS#4930) --- servers/slapd/slapcommon.c | 7 ++++++- servers/slapd/slapcommon.h | 2 ++ servers/slapd/slaptest.c | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c index 188d4c73e5..0ce9fc9e3b 100644 --- a/servers/slapd/slapcommon.c +++ b/servers/slapd/slapcommon.c @@ -255,7 +255,7 @@ slap_tool_init( break; case SLAPTEST: - options = "d:f:F:o:uv"; + options = "d:f:F:o:Quv"; mode |= SLAP_TOOL_READMAIN | SLAP_TOOL_READONLY; break; @@ -371,6 +371,11 @@ slap_tool_init( dn_mode = SLAP_TOOL_LDAPDN_PRETTY; break; + case 'Q': + quiet++; + slap_debug = 0; + break; + case 'q': /* turn on quick */ mode |= SLAP_TOOL_QUICK; break; diff --git a/servers/slapd/slapcommon.h b/servers/slapd/slapcommon.h index 8f74a029e9..0fc4f09e15 100644 --- a/servers/slapd/slapcommon.h +++ b/servers/slapd/slapcommon.h @@ -35,6 +35,7 @@ enum slaptool { typedef struct tool_vars { Backend *tv_be; int tv_verbose; + int tv_quiet; int tv_update_ctxcsn; int tv_continuemode; int tv_nosubordinates; @@ -65,6 +66,7 @@ extern tool_vars tool_globals; #define be tool_globals.tv_be #define verbose tool_globals.tv_verbose +#define quiet tool_globals.tv_quiet #define jumpline tool_globals.tv_jumpline #define update_ctxcsn tool_globals.tv_update_ctxcsn #define continuemode tool_globals.tv_continuemode diff --git a/servers/slapd/slaptest.c b/servers/slapd/slaptest.c index ca10c7a6c7..84f87caeb5 100644 --- a/servers/slapd/slaptest.c +++ b/servers/slapd/slaptest.c @@ -104,7 +104,9 @@ slaptest( int argc, char **argv ) } } - fprintf( stderr, "config file testing succeeded\n"); + if ( !quiet ) { + fprintf( stderr, "config file testing succeeded\n"); + } slap_tool_destroy(); -- 2.39.5