summaryrefslogtreecommitdiff
path: root/proto/bgp/bgp.c
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2019-07-23 01:52:18 +0200
committerOndrej Zajicek (work) <santiago@crfreenet.org>2019-07-23 01:52:18 +0200
commit15b0a9229431dc75425c229b2f94e680db49d594 (patch)
tree3928d3d261fd993096bd8c85edd58399870ecee7 /proto/bgp/bgp.c
parentd843c274781bf9d30bfba93229b9f02a88f26fe2 (diff)
RPKI: Fix reconfiguration when ssh parameters are undefined
Diffstat (limited to 'proto/bgp/bgp.c')
-rw-r--r--proto/bgp/bgp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 98e66c67..309d2231 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -2011,12 +2011,10 @@ bgp_reconfigure(struct proto *P, struct proto_config *CF)
((byte *) new) + sizeof(struct proto_config),
// password item is last and must be checked separately
OFFSETOF(struct bgp_config, password) - sizeof(struct proto_config))
- && ((!old->password && !new->password)
- || (old->password && new->password && !strcmp(old->password, new->password)))
+ && !bstrcmp(old->password, new->password)
&& ((!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)))
+ && !bstrcmp(old->dynamic_name, new->dynamic_name)
&& (old->dynamic_name_digits == new->dynamic_name_digits);
/* FIXME: Move channel reconfiguration to generic protocol code ? */