diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2019-02-12 09:02:42 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2019-02-12 09:02:42 +0000 |
| commit | ae9e5b486b9a0d4259304083fe16724f040024b4 (patch) | |
| tree | b3305ae2e8b90ac3639c0298e138b0dd80a5c525 /usr.sbin/bgpd | |
| parent | 2ccbe6a23816c67dd6fa67751f601621b4a32a8b (diff) | |
Move the yyerror in case get_mpe_config fails. If bgpd -n is used just
ignore the error and move on. This helps regress tests.
Diffstat (limited to 'usr.sbin/bgpd')
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index bac70c16f3b..297ab8553cd 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.370 2019/02/11 15:44:25 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.371 2019/02/12 09:02:41 claudio Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -1047,8 +1047,9 @@ l3vpn : VPN STRING ON STRING { u_int rdomain, label; if (get_mpe_config($4, &rdomain, &label) == -1) { - yyerror("troubles getting config of %s", $4); if ((cmd_opts & BGPD_OPT_NOACTION) == 0) { + yyerror("troubles getting config of %s", + $4); free($4); free($2); YYERROR; |