Revert revision 1.282:

"Allow for empty blocks for peers.  While this is bad style for permant
use, this is very nice to temporarily disable a peer option."

This broke the grammar by introducing shift/reduce errors.

OK phessler@

diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 8b0d503..a718afa 100644 (file)
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.284 2015/10/11 19:30:12 phessler Exp $ */
+/*     $OpenBSD: parse.y,v 1.285 2015/10/22 13:30:07 reyk Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -959,7 +959,6 @@ peeropts_l  : peeropts_l peeroptsl
                ;
 
 peeroptsl      : peeropts nl
-               | /* allow empty blocks */
                ;
 
 peeropts       : REMOTEAS as4number    {