From: claudio <claudio@openbsd.org>
Date: Sat, 8 Sep 2018 12:29:19 +0000 (+0000)
Subject: More BGPD_OPT_NOACTION checking to make regress happier.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=07c4085b740d8b25b62cd6a24d1f25bfa2aaa6fc;p=openbsd

More BGPD_OPT_NOACTION checking to make regress happier.
---

diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 52ea78f05de..21fb38b57ca 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.339 2018/09/08 12:18:51 claudio Exp $ */
+/*	$OpenBSD: parse.y,v 1.340 2018/09/08 12:29:19 claudio Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1073,14 +1073,17 @@ rdomainopts	: RD STRING {
 		| network
 		| DEPEND ON STRING	{
 			/* XXX this is a hack */
-			if (if_nametoindex($3) == 0) {
+			if ((cmd_opts & BGPD_OPT_NOACTION) == 0 &&
+			    if_nametoindex($3) == 0) {
 				yyerror("interface %s does not exist", $3);
 				free($3);
 				YYERROR;
 			}
 			strlcpy(currdom->ifmpe, $3, IFNAMSIZ);
 			free($3);
-			if (get_mpe_label(currdom)) {
+			/* XXX this is in the wrong place */
+			if ((cmd_opts & BGPD_OPT_NOACTION) == 0 &&
+			    get_mpe_label(currdom)) {
 				yyerror("failed to get mpls label from %s",
 				    currdom->ifmpe);
 				YYERROR;