Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/npf/npfctl Replace () by [] in tcp-flags.



details:   https://anonhg.NetBSD.org/src/rev/6376ef9e2e9f
branches:  trunk
changeset: 365480:6376ef9e2e9f
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Aug 17 10:16:24 2018 +0000

description:
Replace () by [] in tcp-flags.

Fix proc-opts, the value is optional, noted by he@.

diffstat:

 usr.sbin/npf/npfctl/npf.conf.5 |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 1006f6bbe029 -r 6376ef9e2e9f usr.sbin/npf/npfctl/npf.conf.5
--- a/usr.sbin/npf/npfctl/npf.conf.5    Fri Aug 17 04:59:34 2018 +0000
+++ b/usr.sbin/npf/npfctl/npf.conf.5    Fri Aug 17 10:16:24 2018 +0000
@@ -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 @@
 ; 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 @@
 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"



Home | Main Index | Thread Index | Old Index