bgpd, ospfd, ospf6d: long is not bool :(

... Oops ...

(for context, the defaults code originally didn't have a dedicated
"bool" variant and just used long for bools...  I derp'd this when
adding bool as a separate case :( )

Reported-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@diac24.net>
(cherry picked from commit 4c1458b595282bff6a6e0b20767bb5cb655d0b4c)

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 243822206cfb049d0ebac1d2cb7687bc39582c9a..4f5ba285aac5c3da10e095455aca0b6b9c8a486a 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -73,20 +73,20 @@
 #endif
 
 FRR_CFG_DEFAULT_BOOL(BGP_IMPORT_CHECK,
-       { .val_long = true, .match_profile = "datacenter", },
-       { .val_long = false },
+       { .val_bool = true, .match_profile = "datacenter", },
+       { .val_bool = false },
 )
 FRR_CFG_DEFAULT_BOOL(BGP_SHOW_HOSTNAME,
-       { .val_long = true, .match_profile = "datacenter", },
-       { .val_long = false },
+       { .val_bool = true, .match_profile = "datacenter", },
+       { .val_bool = false },
 )
 FRR_CFG_DEFAULT_BOOL(BGP_LOG_NEIGHBOR_CHANGES,
-       { .val_long = true, .match_profile = "datacenter", },
-       { .val_long = false },
+       { .val_bool = true, .match_profile = "datacenter", },
+       { .val_bool = false },
 )
 FRR_CFG_DEFAULT_BOOL(BGP_DETERMINISTIC_MED,
-       { .val_long = true, .match_profile = "datacenter", },
-       { .val_long = false },
+       { .val_bool = true, .match_profile = "datacenter", },
+       { .val_bool = false },
 )
 FRR_CFG_DEFAULT_ULONG(BGP_CONNECT_RETRY,
        { .val_ulong = 10, .match_profile = "datacenter", },

diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 95537eb86ec0678d6b0473ceb267015732600140..ba3c1b8907353627cc6038a2f03793a0df0fdbf9 100644 (file)
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -52,8 +52,8 @@
 DEFINE_QOBJ_TYPE(ospf6)
 
 FRR_CFG_DEFAULT_BOOL(OSPF6_LOG_ADJACENCY_CHANGES,
-       { .val_long = true, .match_profile = "datacenter", },
-       { .val_long = false },
+       { .val_bool = true, .match_profile = "datacenter", },
+       { .val_bool = false },
 )
 
 /* global ospf6d variable */

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 152a7e83b71b0fd0fefacb726e34d5dad0c2e9a0..92c919180128f202b276b1fe3686e03f8dc11fbe 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -54,8 +54,8 @@
 #include "ospfd/ospf_bfd.h"
 
 FRR_CFG_DEFAULT_BOOL(OSPF_LOG_ADJACENCY_CHANGES,
-       { .val_long = true, .match_profile = "datacenter", },
-       { .val_long = false },
+       { .val_bool = true, .match_profile = "datacenter", },
+       { .val_bool = false },
 )
 
 static const char *const ospf_network_type_str[] = {