diff options
Diffstat (limited to 'usr.sbin/unbound/smallapp/unbound-checkconf.c')
| -rw-r--r-- | usr.sbin/unbound/smallapp/unbound-checkconf.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.sbin/unbound/smallapp/unbound-checkconf.c b/usr.sbin/unbound/smallapp/unbound-checkconf.c index b359da354bb..5d7997fe076 100644 --- a/usr.sbin/unbound/smallapp/unbound-checkconf.c +++ b/usr.sbin/unbound/smallapp/unbound-checkconf.c @@ -88,6 +88,7 @@ usage(void) printf("file if omitted %s is used.\n", CONFIGFILE); printf("-o option print value of option to stdout.\n"); printf("-f output full pathname with chroot applied, eg. with -o pidfile.\n"); + printf("-q quiet (suppress output on success).\n"); printf("-h show this usage help.\n"); printf("Version %s\n", PACKAGE_VERSION); printf("BSD licensed, see LICENSE in source package for details.\n"); @@ -969,7 +970,7 @@ check_auth(struct config_file* cfg) /** check config file */ static void -checkconf(const char* cfgfile, const char* opt, int final) +checkconf(const char* cfgfile, const char* opt, int final, int quiet) { char oldwd[4096]; struct config_file* cfg = config_create(); @@ -1002,7 +1003,7 @@ checkconf(const char* cfgfile, const char* opt, int final) check_fwd(cfg); check_hints(cfg); check_auth(cfg); - printf("unbound-checkconf: no errors in %s\n", cfgfile); + if(!quiet) { printf("unbound-checkconf: no errors in %s\n", cfgfile); } config_delete(cfg); } @@ -1016,6 +1017,7 @@ int main(int argc, char* argv[]) { int c; int final = 0; + int quiet = 0; const char* f; const char* opt = NULL; const char* cfgfile = CONFIGFILE; @@ -1028,7 +1030,7 @@ int main(int argc, char* argv[]) cfgfile = CONFIGFILE; #endif /* USE_WINSOCK */ /* parse the options */ - while( (c=getopt(argc, argv, "fho:")) != -1) { + while( (c=getopt(argc, argv, "fhqo:")) != -1) { switch(c) { case 'f': final = 1; @@ -1036,6 +1038,9 @@ int main(int argc, char* argv[]) case 'o': opt = optarg; break; + case 'q': + quiet = 1; + break; case '?': case 'h': default: @@ -1053,7 +1058,7 @@ int main(int argc, char* argv[]) if (pledge("stdio rpath dns getpw", NULL) == -1) fatal_exit("Could not pledge"); - checkconf(f, opt, final); + checkconf(f, opt, final, quiet); checklock_stop(); return 0; } |