Attachment 246228 Details for Bug 275006 – fix the typo

[patch] fix the typo

pf-label-fix.patch (text/plain), 1.19 KB, created by Franco Fichtner on 2023-11-10 07:30:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2023-11-10 07:30:33 UTC

Size: 1.19 KB

patch

obsolete

>From cc48f7c1551d0fd4038ef3b6d9a7a448f7b27fc9 Mon Sep 17 00:00:00 2001
>From: Franco Fichtner <franco@opnsense.org>
>Date: Fri, 10 Nov 2023 07:45:44 +0100
>Subject: [PATCH] libpfctl: fix a mismerge breaking label addition
>
>This code was supposed to apply to pfctl_add_eth_rule() but instead
>applied to pfctl_add_rule() for otherwise interesting reasons.  Since
>pfctl_add_eth_rule() uses "nvl" and pfctl_add_rule() uses "nvlr" but
>also has "nvl" this compiled fine but still broke the label set.
>
>The bit that is most intriguing is that pfctl_add_eth_rule() doesn't
>even exist on stable/13 and that this wasn't caught by the existing
>tests.
>---
> lib/libpfctl/libpfctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c
>index bf25a45b792..4dec539e250 100644
>--- a/lib/libpfctl/libpfctl.c
>+++ b/lib/libpfctl/libpfctl.c
>@@ -643,7 +643,7 @@ pfctl_add_rule(int dev, const struct pfctl_rule *r, const char *anchor,
> 	labelcount = 0;
> 	while (labelcount < PF_RULE_MAX_LABEL_COUNT &&
> 	    r->label[labelcount][0] != 0) {
>-		nvlist_append_string_array(nvl, "labels",
>+		nvlist_append_string_array(nvlr, "labels",
> 		    r->label[labelcount]);
> 		labelcount++;
> 	}

Actions: View | Diff

Attachments on bug 275006: 246228