From b9e0ee2fedbb14ed48872cb4a7cfd9d744777730 Mon Sep 17 00:00:00 2001
From: Claudio Jeker <claudio@cvs.openbsd.org>
Date: Sat, 9 Mar 2019 10:05:59 +0000
Subject: Unbreak 'announce inet none' which was actually clearing way too
 much. 'announce inet none' should only clear AFI/SAFI pairs where the AFI is
 inet. OK benno@

---
 usr.sbin/bgpd/parse.y | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index b1b95be3445..e6207b6ad13 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.382 2019/03/07 07:42:36 claudio Exp $ */
+/*	$OpenBSD: parse.y,v 1.383 2019/03/09 10:05:58 claudio Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1348,7 +1348,8 @@ peeropts	: REMOTEAS as4number	{
 
 			if ($3 == SAFI_NONE) {
 				for (aid = 0; aid < AID_MAX; aid++) {
-					if (aid2afi(aid, &afi, &safi) == -1)
+					if (aid2afi(aid, &afi, &safi) == -1 ||
+					    afi != $2)
 						continue;
 					curpeer->conf.capabilities.mp[aid] = 0;
 				}	
-- 
cgit v1.2.3