From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Wed, 12 Jun 2019 14:35:42 +0000 (+0200)
Subject: BGP: Fix bug introduced in one of last patches
X-Git-Tag: v2.0.5~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d35fb9d732b05f20a556e9bda798939358459975;p=thirdparty%2Fbird.git

BGP: Fix bug introduced in one of last patches
---

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index c8aeb292c..470c6ff52 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1998,8 +1998,10 @@ bgp_reconfigure(struct proto *P, struct proto_config *CF)
 		     OFFSETOF(struct bgp_config, password) - sizeof(struct proto_config))
     && ((!old->password && !new->password)
 	|| (old->password && new->password && !strcmp(old->password, new->password)))
-    && net_equal(old->remote_range, new->remote_range)
-    && !strcmp(old->dynamic_name, new->dynamic_name)
+    && ((!old->remote_range && !new->remote_range)
+	|| (old->remote_range && new->remote_range && net_equal(old->remote_range, new->remote_range)))
+    && ((!old->dynamic_name && !new->dynamic_name)
+	|| (old->dynamic_name && new->dynamic_name && !strcmp(old->dynamic_name, new->dynamic_name)))
     && (old->dynamic_name_digits == new->dynamic_name_digits);
 
   /* FIXME: Move channel reconfiguration to generic protocol code ? */