diff options
| author | darrenr <darrenr@FreeBSD.org> | 2000-10-26 12:47:40 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2000-10-26 12:47:40 +0000 |
| commit | 19fc1404db530a797fa9749bd9e43a4ff6443af2 (patch) | |
| tree | fbd8a19d1ac5a67c2f97846960388b19cc6e5a57 /contrib/ipfilter/man/ipf.5 | |
| parent | e2c5762cd8ef648d3145c3349333f89c8d137fff (diff) | |
| download | FreeBSD-src-19fc1404db530a797fa9749bd9e43a4ff6443af2.zip FreeBSD-src-19fc1404db530a797fa9749bd9e43a4ff6443af2.tar.gz | |
fix conflicts from rcsids
Diffstat (limited to 'contrib/ipfilter/man/ipf.5')
| -rw-r--r-- | contrib/ipfilter/man/ipf.5 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/ipfilter/man/ipf.5 b/contrib/ipfilter/man/ipf.5 index d9e9992..bc84d6d 100644 --- a/contrib/ipfilter/man/ipf.5 +++ b/contrib/ipfilter/man/ipf.5 @@ -32,7 +32,7 @@ proto = "proto" protocol . ip = srcdst [ flags ] [ with withopt ] [ icmp ] [ keep ] . group = [ "head" decnumber ] [ "group" decnumber ] . -block = "block" [ icmp[return-code] | "return-rst" ] . +block = "block" [ return-icmp[return-code] | "return-rst" ] . auth = "auth" | "preauth" . log = "log" [ "body" ] [ "first" ] [ "or-block" ] [ "level" loglevel ] . call = "call" [ "now" ] function-name . @@ -43,7 +43,7 @@ protocol = "tcp/udp" | "udp" | "tcp" | "icmp" | decnumber . srcdst = "all" | fromto . fromto = "from" [ "!" ] object "to" [ "!" ] object . -icmp = "return-icmp" | "return-icmp-as-dest" . +return-icmp = "return-icmp" | "return-icmp-as-dest" . object = addr [ port-comp | port-range ] . addr = "any" | nummask | host-name [ "mask" ipaddr | "mask" hexnumber ] . port-comp = "port" compare port-num . |
