[src/trunk]: src/usr.sbin/npf/npfctl Fix the family option in the grammar and...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9cc6c9575d5c
branches:  trunk
changeset: 773557:9cc6c9575d5c
user:      rmind <rmind%NetBSD.org@localhost>
date:      Mon Feb 06 00:41:36 2012 +0000

description:
Fix the family option in the grammar and example.

diffstat:

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

diffs (27 lines):

diff -r f56304e298c6 -r 9cc6c9575d5c usr.sbin/npf/npfctl/npf.conf.5
--- a/usr.sbin/npf/npfctl/npf.conf.5    Mon Feb 06 00:37:52 2012 +0000
+++ b/usr.sbin/npf/npfctl/npf.conf.5    Mon Feb 06 00:41:36 2012 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: npf.conf.5,v 1.8 2012/02/06 00:37:52 rmind Exp $
+.\"    $NetBSD: npf.conf.5,v 1.9 2012/02/06 00:41:36 rmind Exp $
 .\"
 .\" Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -156,7 +156,7 @@
 ruleset                = "{" rule1 \*[Lt]newline\*[Gt], rule2 \*[Lt]newline\*[Gt], ... "}"
 
 rule           = ( "block" block-opts | "pass" ) [ "in" | out" ] [ "quick" ]
-                 [ "on" iface ] [ family "fam-opt" ] [ "proto" \*[Lt]protocol\*[Gt] ]
+                 [ "on" iface ] [ "family" fam-opt ] [ "proto" \*[Lt]protocol\*[Gt] ]
                  ( "all" | filt-opts ) [ "keep state" ] [ "apply" rproc ] }
 
 fam-opt                = [ "inet" | "inet6" ]
@@ -200,7 +200,7 @@
        block in quick from \*[Lt]1\*[Gt]
        pass out quick from $ext_if keep state apply "rid"
 
-       pass in quick inet proto tcp to $ext_if port ssh apply "log"
+       pass in quick family inet proto tcp to $ext_if port ssh apply "log"
        pass in quick proto tcp to $ext_if port $services_tcp
        pass in quick proto udp to $ext_if port $services_udp
        pass in quick proto tcp to $ext_if port 49151-65535     # Passive FTP