From d35fb9d732b05f20a556e9bda798939358459975 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Wed, 12 Jun 2019 16:35:42 +0200 Subject: [PATCH] BGP: Fix bug introduced in one of last patches --- proto/bgp/bgp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 ? */ -- 2.39.2