From 65783478510af82ee5301cc77614de6862f79446 Mon Sep 17 00:00:00 2001
From: claudio <claudio@openbsd.org>
Date: Sun, 9 Sep 2018 20:41:01 +0000
Subject: [PATCH] Enable the empty as-set and prefix-set tests since that is
 now allowed again

---
 regress/usr.sbin/bgpd/config/bgpd.conf.6.in | 12 +++++++++---
 regress/usr.sbin/bgpd/config/bgpd.conf.6.ok | 14 +++++++++++++-
 regress/usr.sbin/bgpd/config/bgpd.conf.7.in | 14 ++++++++++----
 regress/usr.sbin/bgpd/config/bgpd.conf.7.ok | 12 +++++++++++-
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in
index f6c65141c7a..c197f7de796 100644
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in
@@ -1,10 +1,16 @@
-# $OpenBSD: bgpd.conf.6.in,v 1.4 2018/09/09 14:28:50 claudio Exp $
+# $OpenBSD: bgpd.conf.6.in,v 1.5 2018/09/09 20:41:01 claudio Exp $
 # test as-set blocks
 
 AS 1
 
-#as-set empty { }
-as-set one { 1 }
+as-set empty1 { }
+as-set empty2 {
+	# nothing
+}
+as-set one1 { 1 }
+as-set one2 {
+	1
+}
 
 as-set "test1" { 1 2 3 4 }
 as-set "test2" { 1, 2, 3, 4 }
diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
index a0f7c76a271..2c4871754f6 100644
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
@@ -3,7 +3,19 @@ router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
 holdtime min 3
 fib-priority 48
-as-set "one" {
+as-set "empty1" {
+	
+}
+
+as-set "empty2" {
+	
+}
+
+as-set "one1" {
+	1 
+}
+
+as-set "one2" {
 	1 
 }
 
diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.in b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in
index a477c066225..7bfafe31ed3 100644
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.in
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in
@@ -1,11 +1,17 @@
-# $OpenBSD: bgpd.conf.7.in,v 1.4 2018/09/09 14:28:50 claudio Exp $
+# $OpenBSD: bgpd.conf.7.in,v 1.5 2018/09/09 20:41:01 claudio Exp $
 # test prefix-set blocks
 
 AS 1
 
-#prefix-set empty { }
-
-prefix-set test1 { 1.2.3/24 }
+prefix-set empty1 { }
+prefix-set empty2 {
+	# comment
+}
+prefix-set one1 { 1.2.3/24 }
+prefix-set one2 {
+	# comment
+	1.2.3/24
+}
 prefix-set test2 { 1.2.3/24 1.2.8.0/22 prefixlen = 24 }
 
 prefix-set "test3_prefixes" { \
diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok
index ab369286c84..355c834de88 100644
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok
@@ -3,7 +3,17 @@ router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
 holdtime min 3
 fib-priority 48
-prefix-set "test1" {
+prefix-set "empty1" {
+}
+
+prefix-set "empty2" {
+}
+
+prefix-set "one1" {
+	1.2.3.0/24
+}
+
+prefix-set "one2" {
 	1.2.3.0/24
 }
 
-- 
2.20.1