aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristof Provost <kp@FreeBSD.org>2023-01-24 06:46:46 +0000
committerKristof Provost <kp@FreeBSD.org>2023-01-31 03:29:52 +0000
commit5a0cbbcaca6dcb656cb9d7b50de3a81654d02020 (patch)
treec60aadaa457b9525b39daf11ce1341242478ba9e
parent870464f11f3c53fcc7114ea406f95655b9821263 (diff)
downloadsrc-5a0cbbcaca6dcb656cb9d7b50de3a81654d02020.tar.gz
src-5a0cbbcaca6dcb656cb9d7b50de3a81654d02020.zip
pfctl: rule.label is a two-dimensional array
Fix checking for a non-empty first string. PR: 269075 MFC after: 1 week Reported by: nreilly@blackberry.com (cherry picked from commit cd80c52cade3e38d273eecec6f9b0a7cba23bcc8)
-rw-r--r--sbin/pfctl/pfctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 5b170219e2ab..6fb7aeb45d00 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1130,7 +1130,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
case PFCTL_SHOW_LABELS:
break;
case PFCTL_SHOW_RULES:
- if (rule.label[0] && (opts & PF_OPT_SHOWALL))
+ if (rule.label[0][0] && (opts & PF_OPT_SHOWALL))
labels = 1;
print_rule(&rule, anchor_call, rule_numbers, numeric);
printf("\n");
@@ -1184,7 +1184,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
break;
}
case PFCTL_SHOW_RULES:
- if (rule.label[0] && (opts & PF_OPT_SHOWALL))
+ if (rule.label[0][0] && (opts & PF_OPT_SHOWALL))
labels = 1;
INDENT(depth, !(opts & PF_OPT_VERBOSE));
print_rule(&rule, anchor_call, rule_numbers, numeric);