summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2017-01-25 00:11:08 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2017-01-25 00:11:08 +0000
commit995538d2093d90c336c36e38a6d0f656f4bce2a2 (patch)
tree2917f257a5e51149b76e75fbfef9578e473ce1ec
parentfb0e96c86ec553a9cae3f448550ee30d2f660826 (diff)
Flag the Loc-RIB with F_RIB_LOCAL so we can remove one ugly hack somewhere else
-rw-r--r--usr.sbin/bgpd/bgpd.h4
-rw-r--r--usr.sbin/bgpd/parse.y4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index 4a2805a5e84..5d43f448827 100644
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.h,v 1.299 2017/01/24 04:22:42 benno Exp $ */
+/* $OpenBSD: bgpd.h,v 1.300 2017/01/25 00:11:07 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -903,7 +903,7 @@ SIMPLEQ_HEAD(rib_names, rde_rib);
extern struct rib_names ribnames;
/* rde_rib flags */
-#define F_RIB_ENTRYLOCK 0x0001
+#define F_RIB_LOCAL 0x0001
#define F_RIB_NOEVALUATE 0x0002
#define F_RIB_NOFIB 0x0004
#define F_RIB_NOFIBSYNC 0x0008
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 1d6a934587d..76d9c90c4f5 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.296 2017/01/24 04:22:42 benno Exp $ */
+/* $OpenBSD: parse.y,v 1.297 2017/01/25 00:11:07 claudio Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -2754,7 +2754,7 @@ parse_config(char *filename, struct bgpd_config *xconf, struct peer **xpeers)
netconf = &conf->networks;
add_rib("Adj-RIB-In", 0, F_RIB_NOFIB | F_RIB_NOEVALUATE);
- add_rib("Loc-RIB", 0, 0);
+ add_rib("Loc-RIB", 0, F_RIB_LOCAL);
if ((file = pushfile(filename, 1)) == NULL) {
free(conf);