diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2002-12-30 23:46:55 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2002-12-30 23:46:55 +0000 |
| commit | 74646c57070167e97a51b357158f0fb3dda6c71b (patch) | |
| tree | 2d4e7dd8d7cf2c133082bd0c51ff6104b366b92e | |
| parent | bbddd86155348485658feb91744c38f5801d1780 (diff) | |
Change ipv6-icmp-type to icpm6-type. pf.conf files will need to be adjusted
to reflect this.
ok dhartmei@ henning@
| -rw-r--r-- | sbin/pfctl/parse.y | 6 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_parser.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 6359012da51..668976aa9d1 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.270 2002/12/27 22:13:31 mcbride Exp $ */ +/* $OpenBSD: parse.y,v 1.271 2002/12/30 23:46:54 mcbride Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -1870,7 +1870,7 @@ icmp6type : STRING { $$ = ulval + 1; } else { if ((p = geticmptypebyname($1, AF_INET6)) == NULL) { - yyerror("unknown ipv6-icmp-type %s", $1); + yyerror("unknown icmp6-type %s", $1); YYERROR; } $$ = p->type + 1; @@ -3437,10 +3437,10 @@ lookup(char *s) { "from", FROM}, { "group", GROUP}, { "icmp-type", ICMPTYPE}, + { "icmp6-type", ICMP6TYPE}, { "in", IN}, { "inet", INET}, { "inet6", INET6}, - { "ipv6-icmp-type", ICMP6TYPE}, { "keep", KEEP}, { "label", LABEL}, { "limit", LIMIT}, diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 521a7d95526..6b4d000f4c0 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.c,v 1.123 2002/12/18 19:40:41 dhartmei Exp $ */ +/* $OpenBSD: pfctl_parser.c,v 1.124 2002/12/30 23:46:54 mcbride Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -858,7 +858,7 @@ print_filter(struct pf_rule *r, int verbose) if (r->af != AF_INET6) printf("icmp-type"); else - printf("ipv6-icmp-type"); + printf("icmp6-type"); if (it != NULL) printf(" %s ", it->name); else |