Attachment 253805 Details for Bug 281701 – fix operational part of the problem

[patch] fix operational part of the problem

0001-net-isc-dhcp44-server-fix-checkconfig-breakage-due-t.patch (text/plain), 1.24 KB, created by Franco Fichtner on 2024-09-25 06:49:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2024-09-25 06:49:42 UTC

Size: 1.24 KB

patch

obsolete

>From 21b2f4514d67404dd5baa0c28d383b2c0fe6c5f4 Mon Sep 17 00:00:00 2001
>From: Franco Fichtner <franco@opnsense.org>
>Date: Wed, 25 Sep 2024 08:43:58 +0200
>Subject: [PATCH] net/isc-dhcp44-server: fix checkconfig breakage due to -q
> removal attempt
>
>The test itself is safe to run with -q even if given twice.  The other
>output will still fail but you only run into the case when the config
>file is bad.
>
>This doesn't fix the actual issue which needs a run through getopts to
>be safe, but could still break in cases where ISC does not adhere to
>it strictly.
>---
> net/isc-dhcp44-server/files/isc-dhcpd.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/net/isc-dhcp44-server/files/isc-dhcpd.in b/net/isc-dhcp44-server/files/isc-dhcpd.in
>index b92fad444b4..0d0dc4593b1 100644
>--- a/net/isc-dhcp44-server/files/isc-dhcpd.in
>+++ b/net/isc-dhcp44-server/files/isc-dhcpd.in
>@@ -506,7 +506,7 @@ dhcpd_checkconfig ()
> 	case "$rc_flags" in
> 	*-q*)	rc_flags_mod=`echo "${rc_flags}" | sed -Ee 's/(^-q | -q | -q$)//'` ;;
> 	esac
>-        if ! ${command} -t -q ${rc_flags_mod}; then
>+        if ! ${command} -t -q ${rc_flags}; then
>                 err 1 "`${command} -t ${rc_flags_mod}` Configuration file sanity check failed"
>         fi
> }
>-- 
>2.30.1 (Apple Git-130)
>

Actions: View | Diff

Attachments on bug 281701: 253805 | 253822 | 253837