From 17cb1ba893bed8505532a12e7d14944a50fa6f05 Mon Sep 17 00:00:00 2001 From: claudio Date: Sun, 9 Sep 2018 13:32:05 +0000 Subject: [PATCH] Bad merge, change a optnl to comma since that is what we want there. --- usr.sbin/bgpd/parse.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 273251f1fa7..2e8a6de0635 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.344 2018/09/09 13:22:41 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.345 2018/09/09 13:32:05 claudio Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer @@ -411,7 +411,7 @@ as_set : ASSET STRING '{' optnl { as_set_l : /* empty */ | as4number_any { add_as_set($1); } - | as_set_l optnl as4number_any { add_as_set($3); } + | as_set_l comma as4number_any { add_as_set($3); } prefixset : PREFIXSET STRING '{' optnl { if (find_prefixset($2, conf->prefixsets) != NULL) { -- 2.20.1