upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-12 15:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[v9_9] improve command line error reporting

Browse source 
3799.	[bug]		Improve named's command line error reporting.
			[RT #35603]

(cherry picked from commit 44fbdddcad)
This commit is contained in:
Evan Hunt 2014-04-03 19:39:44 -07:00
parent d6ed62b1ae
commit 12b074bff5
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
3799. [bug] Improve named's command line error reporting.
[RT #35603]
3796. [bug] Register dns error codes. [RT #35629]
3795. [bug] Make named-checkconf detect raw masterfiles for

18
bin/named/main.c
View file

@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id$ */
/*! \file */
#include <config.h>
@ -410,16 +408,16 @@ static void
parse_command_line(int argc, char *argv[]) {
int ch;
int port;
const char *p;
isc_boolean_t disable6 = ISC_FALSE;
isc_boolean_t disable4 = ISC_FALSE;
save_command_line(argc, argv);
/* PLEASE keep options synchronized when main is hooked! */
#define CMDLINE_FLAGS "46c:C:d:E:fFgi:lm:n:N:p:P:sS:t:T:U:u:vVx:"
isc_commandline_errprint = ISC_FALSE;
while ((ch = isc_commandline_parse(argc, argv,
"46c:C:d:E:fFgi:lm:n:N:p:P:"
"sS:t:T:U:u:vVx:")) != -1) {
while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) {
switch (ch) {
case '4':
if (disable4)
@ -585,8 +583,14 @@ parse_command_line(int argc, char *argv[]) {
usage();
if (isc_commandline_option == '?')
exit(0);
ns_main_earlyfatal("unknown option '-%c'",
isc_commandline_option);
p = strchr(CMDLINE_FLAGS, isc_commandline_option);
if (p == NULL || *++p != ':')
ns_main_earlyfatal("unknown option '-%c'",
isc_commandline_option);
else
ns_main_earlyfatal("option '-%c' requires "
"an argument",
isc_commandline_option);
/* FALLTHROUGH */
default:
ns_main_earlyfatal("parsing options returned %d", ch);