sync code with last improvements from OpenBSD

This commit is contained in:
purplerain 2023-11-11 01:29:48 +00:00
parent 5903cbe575
commit 62d64fa864
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
841 changed files with 83929 additions and 40755 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: pfctl.c,v 1.391 2023/04/28 14:08:38 sashan Exp $ */
/* $OpenBSD: pfctl.c,v 1.392 2023/10/26 16:26:01 deraadt Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@ -367,7 +367,7 @@ pfctl_clear_interface_flags(int dev, int opts)
int
pfctl_clear_rules(int dev, int opts, char *anchorname)
{
struct pfr_buffer t;
struct pfr_buffer t;
memset(&t, 0, sizeof(t));
t.pfrb_type = PFRB_TRANS;
@ -931,7 +931,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
* the user has explicitly requested recursion,
* print it recursively.
*/
if (pr.anchor_call[0] &&
if (pr.anchor_call[0] &&
(((p = strrchr(pr.anchor_call, '/')) ?
p[1] == '_' : pr.anchor_call[0] == '_') ||
opts & PF_OPT_RECURSE)) {