From: Maria Matejka <mq@ucw.cz>
Date: Mon, 23 Jan 2023 18:42:12 +0000 (+0100)
Subject: Merge commit 'd1cd5e5a63b2256eb71661f7438537e4ded7b01a' into thread-next
X-Git-Tag: v3.0-alpha1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4821612c94f9e935a6e841f6bcace9465dd2ad78;p=thirdparty%2Fbird.git

Merge commit 'd1cd5e5a63b2256eb71661f7438537e4ded7b01a' into thread-next
---

4821612c94f9e935a6e841f6bcace9465dd2ad78
diff --cc proto/bgp/config.Y
index 0be50b5e9,a2dfa747d..66d97e3bb
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@@ -29,9 -30,9 +29,9 @@@ CF_KEYWORDS(BGP, LOCAL, NEIGHBOR, AS, H
  	GRACEFUL, RESTART, AWARE, CHECK, LINK, PORT, EXTENDED, MESSAGES, SETKEY,
  	STRICT, BIND, CONFEDERATION, MEMBER, MULTICAST, FLOW4, FLOW6, LONG,
  	LIVED, STALE, IMPORT, IBGP, EBGP, MANDATORY, INTERNAL, EXTERNAL, SETS,
 -	DYNAMIC, RANGE, NAME, DIGITS, BGP_AIGP, AIGP, ORIGINATE, COST, ENFORCE,
 +	DYNAMIC, RANGE, NAME, DIGITS, AIGP, ORIGINATE, COST, ENFORCE,
  	FIRST, FREE, VALIDATE, BASE, ROLE, ROLES, PEER, PROVIDER, CUSTOMER,
- 	RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, PREFER, GLOBAL)
+ 	RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, GLOBAL)
  
  %type <i> bgp_nh
  %type <i32> bgp_afi
@@@ -44,7 -45,8 +44,9 @@@ CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, 
  
  CF_GRAMMAR
  
+ /* Workaround for collisions between keywords and symbols */
 -symbol: ROLE | PEER | PROVIDER | CUSTOMER | RS_SERVER | RS_CLIENT ;
++toksym: ROLE | PEER | PROVIDER | CUSTOMER | RS_SERVER | RS_CLIENT ;
 +toksym: BGP_MED | BGP_LOCAL_PREF | SOURCE ;
  
  proto: bgp_proto '}'  ;