From nobody Fri Jul 4 09:22:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bYSpN0yntz61GX4; Fri, 04 Jul 2025 09:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bYSpM61ZJz3pl9; Fri, 04 Jul 2025 09:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PFp62aIvPHJaLtxT77Cj7zpaG3R4wMGIy7t+D8Nt3FI=; b=prMcVGakhLP1osy7IBvs1cEuLYU9DjMiq/PkQ4pkD2QU6NOuSN4Jp2bNGPDi6jrern5wol hlwJZXGyCISfkHy8vX9uBkKhpLJaFRseuDlh3lxVJgxhWJYoeRRhrgcfpo0uQAkzU5kgYA Yon97+VGWO3eLUg8VFX6HJPRc+XlxfppAvYyKVyJvFnsHyBNU2w7WSOPwK4csuQ961TLCW fpoJo9jSzKb8jegwBPOvSw46cZKMSQ9Onx94ciuvfx8B4we+FuUWrwlKk7tdKCpGn3oa0U DU6bNJgBoWoDWkMzkI76skHoQaE2cW73yzx2MPKuPJ/MXJXkRLJYzn+hSR4VUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PFp62aIvPHJaLtxT77Cj7zpaG3R4wMGIy7t+D8Nt3FI=; b=um/tHCuchgzMBhWDH1DiuEMiIplXHpFvxOWrnOcAyDKnuULFQOUe/chmBF418F9IszE0Nx nWOa7epD4cJ2Y4Wfhf2REgfYXO3ElR8m87jC/c9b9dxP7lktPmJR/g1R9E1mQ+s8/Ibxam 92UuZLhyVnZbtClVp+ZFGtWzX6uufZLcd/RXG6Vlx3K24o2Bw6mrXSUNNFCP68Kr4wdvpC KyshPPy9nPL56gILRaVI+N8i3BR4GKKFnMlclYxjM6pBtZR69RuVH4Jzx1mMGGI5qpqsFP gCnnXKoOiVTFiiS/oMgbvpKEfMndXvzf3yUiAmOSGsHt4Al+3u28lbnU8fcROw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751620955; a=rsa-sha256; cv=none; b=rTGpwe4nl8ukWGyZ87EKKSA8XZNMCkvd9ZVfOLaT2Wn9wJTDlZqstwpzpPmRvBKbzOWSMa j6YgG1SLPwMINMMNTH8FpwknlEys8foiWDM8woR7Y6LRXbPUziD2qtV/S5EOji9+YVlSk0 HZDwWS6lYyhipbVcaB2CpAFclyEo/KYPLsbvRAG+XL5v+piW1Nnhe4Fp3M5kbArGylmHnB AA/VWierLWs3DrO63WmOaYTFUYRzQwr/Wl18b3Bsrv9ACQZapSc6BwGUa76iGASPzLoWZr MlnaaDvSYILYJDo7K8lQQkHtITYfeOwilk6fl3fY9iv+hRYGFuqHdaMSCHdEdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bYSpM5cQMzlGP; Fri, 04 Jul 2025 09:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5649MZQP055680; Fri, 4 Jul 2025 09:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5649MZQ3055677; Fri, 4 Jul 2025 09:22:35 GMT (envelope-from git) Date: Fri, 4 Jul 2025 09:22:35 GMT Message-Id: <202507040922.5649MZQ3055677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7d5d1fae2854 - main - pfctl: odd condition/test in PF lexer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d5d1fae28541034423763313cca61fa6ed15ae2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d5d1fae28541034423763313cca61fa6ed15ae2 commit 7d5d1fae28541034423763313cca61fa6ed15ae2 Author: Kristof Provost AuthorDate: 2025-06-30 12:55:38 +0000 Commit: Kristof Provost CommitDate: 2025-07-04 08:31:11 +0000 pfctl: odd condition/test in PF lexer This commit rectifies earlier change: in the lex... even inside quotes, a \ followed by space or tab should expand to space or tab, and a \ followed by newline should be ignored (as a line continuation). compatible with the needs of hoststated (which has the most strict quoted string requirements), and ifstated (where one commonly does line continuations in strings). OK deraadt@, OK millert@ Obtained from: OpenBSD, sashan , a153335958 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index c939b5ae7cce..beff11bebf69 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -6854,7 +6854,8 @@ top: } else if (c == '\\') { if ((next = lgetc(quotec)) == EOF) return (0); - if (next == quotec || c == ' ' || c == '\t') + if (next == quotec || next == ' ' || + next == '\t') c = next; else if (next == '\n') { file->lineno++;