upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: usr: dnssec-verify now uses exit code 1 when failing due to illegal options

Browse source 
Previously, dnssec-verify exited with code 0 if the options could not be parsed. This has been fixed.

Closes #5574

Merge branch '5574-dnssec-verify-uses-exit-code-0-when-failing-due-to-illegal-option' into 'main'

See merge request isc-projects/bind9!11106
This commit is contained in:
Mark Andrews 2025-10-22 13:21:52 +11:00
commit 5bb4874057
12 changed files with 84 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bin/check/named-checkzone.c
View file

@ -61,10 +61,10 @@ static enum { progmode_check, progmode_compile } progmode;
} while (0)
ISC_NORETURN static void
usage(void);
usage(int ret);
static void
usage(void) {
usage(int ret) {
fprintf(stderr,
"usage: %s [-djqvD] [-c class] "
"[-f inputformat] [-F outputformat] [-J filename] "
@ -77,7 +77,7 @@ usage(void) {
"%s zonename [ (filename|-) ]\n",
isc_commandline_progname,
progmode == progmode_check ? "[-o filename]" : "-o filename");
exit(EXIT_FAILURE);
exit(ret);
}
static void
@ -420,9 +420,10 @@ main(int argc, char **argv) {
isc_commandline_progname,
isc_commandline_option);
}
FALLTHROUGH;
usage(EXIT_FAILURE);
case 'h':
usage();
usage(EXIT_SUCCESS);
default:
fprintf(stderr, "%s: unhandled option -%c\n",
@ -486,7 +487,7 @@ main(int argc, char **argv) {
if (output_filename == NULL) {
fprintf(stderr, "output file required, but not "
"specified\n");
usage();
usage(EXIT_FAILURE);
}
}
@ -510,7 +511,7 @@ main(int argc, char **argv) {
if (argc - isc_commandline_index < 1 ||
argc - isc_commandline_index > 2)
{
usage();
usage(EXIT_FAILURE);
}
if (!quiet) {

15
bin/delv/delv.c
View file

@ -170,8 +170,11 @@ get_reverse(char *reverse, size_t len, char *value, bool strict);
static isc_result_t
parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc);
ISC_NORETURN static void
usage(int ret);
static void
usage(void) {
usage(int ret) {
fprintf(stderr,
"Usage: delv [@server] {q-opt} {d-opt} [domain] [q-type] "
"[q-class]\n"
@ -254,7 +257,7 @@ usage(void) {
"process)\n"
" +[no]yaml (Present the results as "
"YAML)\n");
exit(EXIT_FAILURE);
exit(ret);
}
ISC_NORETURN static void
@ -1360,7 +1363,7 @@ plus_option(char *option) {
invalid_option:
need_value:
fprintf(stderr, "Invalid option: +%s\n", option);
usage();
usage(EXIT_FAILURE);
}
return;
}
@ -1416,8 +1419,8 @@ dash_option(char *option, char *next, bool *open_type_class) {
/* handled in preparse_args() */
break;
case 'h':
usage();
exit(EXIT_SUCCESS);
usage(EXIT_SUCCESS);
case 'i':
no_sigs = true;
root_validation = false;
@ -1570,7 +1573,7 @@ dash_option(char *option, char *next, bool *open_type_class) {
invalid_option:
default:
fprintf(stderr, "Invalid option: -%s\n", option);
usage();
usage(EXIT_FAILURE);
}
UNREACHABLE();
return false;

14
bin/dnssec/dnssec-dsfromkey.c
View file

@ -329,10 +329,10 @@ emits(bool showall, bool cds, dns_rdata_t *rdata) {
}
ISC_NORETURN static void
usage(void);
usage(int ret);
static void
usage(void) {
usage(int ret) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, " %s [options] keyfile\n\n",
isc_commandline_progname);
@ -362,7 +362,7 @@ usage(void) {
" -V: print version information\n");
fprintf(stderr, "Output: DS or CDS RRs\n");
exit(EXIT_FAILURE);
exit(ret);
}
int
@ -378,7 +378,7 @@ main(int argc, char **argv) {
dns_rdataset_t rdataset;
if (argc == 1) {
usage();
usage(EXIT_FAILURE);
}
isc_commandline_init(argc, argv);
@ -446,10 +446,12 @@ main(int argc, char **argv) {
isc_commandline_progname,
isc_commandline_option);
}
FALLTHROUGH;
/* Does not return. */
usage(EXIT_FAILURE);
case 'h':
/* Does not return. */
usage();
usage(EXIT_SUCCESS);
case 'V':
/* Does not return. */

13
bin/dnssec/dnssec-importkey.c
View file

@ -262,10 +262,10 @@ emit(const char *dir, dns_rdata_t *rdata) {
}
ISC_NORETURN static void
usage(void);
usage(int ret);
static void
usage(void) {
usage(int ret) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, " %s options [-K dir] keyfile\n\n",
isc_commandline_progname);
@ -290,7 +290,7 @@ usage(void) {
fprintf(stderr, " -D sync date/[+-]offset/none: set/unset "
"CDS and CDNSKEY deletion date\n");
exit(EXIT_FAILURE);
exit(ret);
}
int
@ -304,7 +304,7 @@ main(int argc, char **argv) {
isc_stdtime_t now = isc_stdtime_now();
if (argc == 1) {
usage();
usage(EXIT_FAILURE);
}
isc_commandline_init(argc, argv);
@ -381,10 +381,11 @@ main(int argc, char **argv) {
isc_commandline_progname,
isc_commandline_option);
}
FALLTHROUGH;
usage(EXIT_FAILURE);
case 'h':
/* Does not return. */
usage();
usage(EXIT_SUCCESS);
case 'V':
/* Does not return. */

14
bin/dnssec/dnssec-keyfromlabel.c
View file

@ -46,10 +46,10 @@
static uint16_t tag_min = 0, tag_max = 0xffff;
ISC_NORETURN static void
usage(void);
usage(int ret);
static void
usage(void) {
usage(int ret) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, " %s -l label [options] name\n\n",
isc_commandline_progname);
@ -98,7 +98,7 @@ usage(void) {
fprintf(stderr, " K<name>+<alg>+<id>.key, "
"K<name>+<alg>+<id>.private\n");
exit(EXIT_FAILURE);
exit(ret);
}
int
@ -144,7 +144,7 @@ main(int argc, char **argv) {
isc_stdtime_t now = isc_stdtime_now();
if (argc == 1) {
usage();
usage(EXIT_FAILURE);
}
isc_commandline_init(argc, argv);
@ -322,10 +322,12 @@ main(int argc, char **argv) {
isc_commandline_progname,
isc_commandline_option);
}
FALLTHROUGH;
/* Does not return. */
usage(EXIT_FAILURE);
case 'h':
/* Does not return. */
usage();
usage(EXIT_SUCCESS);
case 'V':
/* Does not return. */

14
bin/dnssec/dnssec-keygen.c
View file

@ -68,7 +68,7 @@ static int min_rsa = 1024;
static int min_dh = 128;
ISC_NORETURN static void
usage(void);
usage(int ret);
static void
progress(int p);
@ -128,7 +128,7 @@ struct keygen_ctx {
typedef struct keygen_ctx keygen_ctx_t;
static void
usage(void) {
usage(int ret) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, " %s [options] name\n\n", isc_commandline_progname);
fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
@ -203,7 +203,7 @@ usage(void) {
fprintf(stderr, " K<name>+<alg>+<id>.key, "
"K<name>+<alg>+<id>.private\n");
exit(EXIT_FAILURE);
exit(ret);
}
static void
@ -802,7 +802,7 @@ main(int argc, char **argv) {
};
if (argc == 1) {
usage();
usage(EXIT_FAILURE);
}
isc_commandline_init(argc, argv);
@ -1042,10 +1042,12 @@ main(int argc, char **argv) {
isc_commandline_progname,
isc_commandline_option);
}
FALLTHROUGH;
/* Does not return. */
usage(EXIT_FAILURE);
case 'h':
/* Does not return. */
usage();
usage(EXIT_SUCCESS);
case 'V':
/* Does not return. */

14
bin/dnssec/dnssec-revoke.c
View file

@ -37,10 +37,10 @@
#include "dnssectool.h"
ISC_NORETURN static void
usage(void);
usage(int ret);
static void
usage(void) {
usage(int ret) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, " %s [options] keyfile\n\n",
isc_commandline_progname);
@ -56,7 +56,7 @@ usage(void) {
fprintf(stderr, " K<name>+<alg>+<new id>.key, "
"K<name>+<alg>+<new id>.private\n");
exit(EXIT_FAILURE);
exit(ret);
}
int
@ -78,7 +78,7 @@ main(int argc, char **argv) {
isc_commandline_init(argc, argv);
if (argc == 1) {
usage();
usage(EXIT_FAILURE);
}
isc_commandline_errprint = false;
@ -117,10 +117,12 @@ main(int argc, char **argv) {
isc_commandline_progname,
isc_commandline_option);
}
FALLTHROUGH;
/* Does not return. */
usage(EXIT_FAILURE);
case 'h':
/* Does not return. */
usage();
usage(EXIT_SUCCESS);
case 'V':
/* Does not return. */

17
bin/dnssec/dnssec-settime.c
View file

@ -41,10 +41,10 @@
#include "dnssectool.h"
ISC_NORETURN static void
usage(void);
usage(int ret);
static void
usage(void) {
usage(int ret) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, " %s [options] keyfile\n\n",
isc_commandline_progname);
@ -99,7 +99,7 @@ usage(void) {
fprintf(stderr, " K<name>+<alg>+<new id>.key, "
"K<name>+<alg>+<new id>.private\n");
exit(EXIT_FAILURE);
exit(ret);
}
static void
@ -240,7 +240,7 @@ main(int argc, char **argv) {
options = DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE;
if (argc == 1) {
usage();
usage(EXIT_FAILURE);
}
setup_logging();
@ -336,10 +336,13 @@ main(int argc, char **argv) {
isc_commandline_progname,
isc_commandline_option);
}
FALLTHROUGH;
/* Does not return. */
usage(EXIT_FAILURE);
case 'h':
/* Does not return. */
usage();
usage(EXIT_SUCCESS);
case 'I':
if (setinact || unsetinact) {
fatal("-I specified more than once");
@ -473,7 +476,7 @@ main(int argc, char **argv) {
case ' ':
break;
default:
usage();
usage(EXIT_FAILURE);
break;
}
} while (*p != '\0');

14
bin/dnssec/dnssec-signzone.c
View file

@ -3115,10 +3115,10 @@ print_version(FILE *fp) {
}
ISC_NORETURN static void
usage(void);
usage(int ret);
static void
usage(void) {
usage(int ret) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, "\t%s [options] zonefile [keys]\n",
isc_commandline_progname);
@ -3205,7 +3205,7 @@ usage(void) {
fprintf(stderr, "(default: all zone keys that have private keys)\n");
fprintf(stderr, "\tkeyfile (Kname+alg+tag)\n");
exit(EXIT_FAILURE);
exit(ret);
}
static void
@ -3576,10 +3576,12 @@ main(int argc, char *argv[]) {
isc_commandline_progname,
isc_commandline_option);
}
FALLTHROUGH;
/* Does not return. */
usage(EXIT_FAILURE);
case 'h':
/* Does not return. */
usage();
usage(EXIT_SUCCESS);
case 'V':
/* Does not return. */
@ -3646,7 +3648,7 @@ main(int argc, char *argv[]) {
argv += isc_commandline_index;
if (argc < 1) {
usage();
usage(EXIT_FAILURE);
}
file = argv[0];

13
bin/dnssec/dnssec-verify.c
View file

@ -135,10 +135,10 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) {
}
ISC_NORETURN static void
usage(void);
usage(int ret);
static void
usage(void) {
usage(int ret) {
fprintf(stderr, "Usage:\n");
fprintf(stderr, "\t%s [options] zonefile [keys]\n",
isc_commandline_progname);
@ -159,7 +159,7 @@ usage(void) {
fprintf(stderr, "\t-x:\tDNSKEY record signed with KSKs only, "
"not ZSKs\n");
fprintf(stderr, "\t-z:\tAll records signed with KSKs\n");
exit(EXIT_SUCCESS);
exit(ret);
}
int
@ -254,11 +254,12 @@ main(int argc, char *argv[]) {
isc_commandline_progname,
isc_commandline_option);
}
FALLTHROUGH;
/* Does not return. */
usage(EXIT_FAILURE);
case 'h':
/* Does not return. */
usage();
usage(EXIT_SUCCESS);
case 'V':
/* Does not return. */
@ -282,7 +283,7 @@ main(int argc, char *argv[]) {
argv += isc_commandline_index;
if (argc < 1) {
usage();
usage(EXIT_FAILURE);
}
file = argv[0];

4
bin/dnssec/dnssectool.c
View file

@ -547,14 +547,14 @@ try_key:
}
bool
isoptarg(const char *arg, char **argv, void (*usage)(void)) {
isoptarg(const char *arg, char **argv, void (*usage)(int ret)) {
if (!strcasecmp(isc_commandline_argument, arg)) {
if (argv[isc_commandline_index] == NULL) {
fprintf(stderr, "%s: missing argument -%c %s\n",
isc_commandline_progname,
isc_commandline_option,
isc_commandline_argument);
usage();
usage(EXIT_FAILURE);
}
isc_commandline_argument = argv[isc_commandline_index];
/* skip to next argument */

2
bin/dnssec/dnssectool.h
View file

@ -106,7 +106,7 @@ key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir,
isc_mem_t *mctx, uint16_t min, uint16_t max, bool *exact);
bool
isoptarg(const char *arg, char **argv, void (*usage)(void));
isoptarg(const char *arg, char **argv, void (*usage)(int ret));
void
loadjournal(isc_mem_t *mctx, dns_db_t *db, const char *journal);