Module Name: src
Committed By: maxv
Date: Fri Aug 17 10:16:24 UTC 2018
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5
Log Message:
Replace () by [] in tcp-flags.
Fix proc-opts, the value is optional, noted by he@.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/npf/npfctl/npf.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.59 src/usr.sbin/npf/npfctl/npf.conf.5:1.60
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.59 Thu Aug 16 09:58:00 2018
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Fri Aug 17 10:16:24 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: npf.conf.5,v 1.59 2018/08/16 09:58:00 maxv Exp $
+.\" $NetBSD: npf.conf.5,v 1.60 2018/08/17 10:16:24 maxv Exp $
.\"
.\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 16, 2018
+.Dd August 17, 2018
.Dt NPF.CONF 5
.Os
.Sh NAME
@@ -371,7 +371,7 @@ map-flags = "no-ports"
; and numbers, depending on the extension.
proc = "procedure" proc-name "{" *( proc-call [ new-line ] ) "}"
-proc-opts = key " " val [ "," proc-opts ]
+proc-opts = key [ " " val ] [ "," proc-opts ]
proc-call = call-name ":" proc-opts new-line
; Group definition and the rule list.
@@ -391,7 +391,7 @@ dynamic-ruleset = "ruleset" group-opts
rule = static-rule | dynamic-ruleset
tcp-flag-mask = tcp-flags
-tcp-flags = ("S")("A")("F")("R")
+tcp-flags = [ "S" ] [ "A" ] [ "F" ] [ "R" ]
proto = "proto" protocol [ proto-opts ]
block-opts = "return-rst" | "return-icmp" | "return"
family-opt = "inet4" | "inet6"
