diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2002-11-19 17:31:25 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2002-11-19 17:31:25 +0000 |
| commit | d8a286cf3de4fb603fc03485af16428bc75620db (patch) | |
| tree | 1bbf29c480c0dac9665cd96e8ff0d12e58ea47a1 /sbin/pfctl | |
| parent | 2563e0a16fbb24496b12a7d7f3e8728892a411f5 (diff) | |
repair queuespec syntax glitch, theo agrees
Diffstat (limited to 'sbin/pfctl')
| -rw-r--r-- | sbin/pfctl/parse.y | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 87e358d3388..34a7895dd04 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.195 2002/11/19 17:05:19 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.196 2002/11/19 17:31:24 henning Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -508,7 +508,7 @@ antispoof_iflst : if_item { $$ = $1; } /* altq stuff */ altqif : ALTQ interface SCHEDULER schedtype bandwidth tbrsize - qassign { + QUEUE qassign { struct pf_altq a; memset(&a, 0, sizeof(a)); @@ -523,13 +523,17 @@ altqif : ALTQ interface SCHEDULER schedtype bandwidth tbrsize YYERROR; } a.tbrsize = $6; - expand_altq(&a, $2, $7); + if ($8 == NULL) { + yyerror("no child queues?"); + YYERROR; + } + expand_altq(&a, $2, $8); } ; -qassign : /* empty */ { $$ = NULL; } - | QUEUE qassign_item { $$ = $2; } - | QUEUE '{' qassign_list '}' { $$ = $3; } +qassign : /* empty */ { $$ = NULL; } + | qassign_item { $$ = $1; } + | '{' qassign_list '}' { $$ = $2; } ; qassign_list : qassign_item { $$ = $1; } |