Attachment #253837 for bug #281701





dhcpd_checkconfig ()
{
        local rc_flags_mod
        setup_flags
        if ! ${command} -t -q ${rc_flags}; then
		${command} -t ${rc_flags} -Q
                err 1 "Configuration file sanity check failed"
	*-q*)	rc_flags_mod=`echo "${rc_flags}" | sed -Ee 's/(^-q | -q | -q$)//'` ;;
	esac
        if ! ${command} -t -q ${rc_flags_mod}; then
                err 1 "`${command} -t ${rc_flags_mod}` Configuration file sanity check failed"
        fi
}





--- server/dhcpd.c.orig	2022-09-28 14:39:15 UTC
+++ server/dhcpd.c
@@ -492,6 +492,9 @@ main(int argc, char **argv) {
 			cftest = 1;
 			lftest = 1;
 			log_perror = -1;
+		} else if (!strcmp (argv [i], "-Q")) {
+			quiet = 0;
+			quiet_interface_discovery = 0;
 		} else if (!strcmp (argv [i], "-q")) {
 			quiet = 1;
 			quiet_interface_discovery = 1;

Return to bug 281701

Lines 499-513 dhcpd_restartprecmd () Link Here

(-)b/net/isc-dhcp44-server/files/isc-dhcpd.in (-8 / +3 lines)
499		499
500	dhcpd_checkconfig ()	500	dhcpd_checkconfig ()
501	{	501	{
502	local rc_flags_mod
503	setup_flags	502	setup_flags
504	rc_flags_mod="$rc_flags"	503	if ! ${command} -t -q ${rc_flags}; then
505	# Eliminate '-q' flag if it is present	504	${command} -t ${rc_flags} -Q
506	case "$rc_flags" in	505	err 1 "Configuration file sanity check failed"
507	-q) rc_flags_mod=`echo "${rc_flags}" \| sed -Ee 's/(^-q \| -q \| -q$)//'` ;;
508	esac
509	if ! ${command} -t -q ${rc_flags_mod}; then
510	err 1 "`${command} -t ${rc_flags_mod}` Configuration file sanity check failed"
511	fi	506	fi
512	}	507	}
513		508

Added Link Here

(-)b/net/isc-dhcp44-server/files/patch-server_dhcpd.c (+12 lines)
1	--- server/dhcpd.c.orig 2022-09-28 14:39:15 UTC
2	+++ server/dhcpd.c
3	@@ -492,6 +492,9 @@ main(int argc, char **argv) {
4	cftest = 1;
5	lftest = 1;
6	log_perror = -1;
7	+ } else if (!strcmp (argv [i], "-Q")) {
8	+ quiet = 0;
9	+ quiet_interface_discovery = 0;
10	} else if (!strcmp (argv [i], "-q")) {
11	quiet = 1;
12	quiet_interface_discovery = 1;