summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2023-03-29 10:31:18 +0300
committerGitHub <noreply@github.com>2023-03-29 10:31:18 +0300
commita4bb60f52de510ea5ba6ea31894f45679770c93c (patch)
treea5e6c833612c2f83813bec9739fb73dc843144e2
parent8ed4a671c9cf9ab347f3f11b497b3de91854b85c (diff)
parent722f3aef4edeedf2932bc685a98efcd13505ab5d (diff)
Merge pull request #13129 from FRRouting/mergify/bp/stable/8.5/pr-13118
bgpd: Copy the password from the previous peer on peer_xfer_config() (backport #13118)
-rw-r--r--bgpd/bgpd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 1abd8e9a87..94d41e70c1 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1492,9 +1492,11 @@ void peer_xfer_config(struct peer *peer_dst, struct peer *peer_src)
peer_dst->v_delayopen = peer_src->v_delayopen;
/* password apply */
- if (peer_src->password && !peer_dst->password)
+ if (peer_src->password) {
+ XFREE(MTYPE_PEER_PASSWORD, peer_dst->password);
peer_dst->password =
XSTRDUP(MTYPE_PEER_PASSWORD, peer_src->password);
+ }
FOREACH_AFI_SAFI (afi, safi) {
peer_dst->afc[afi][safi] = peer_src->afc[afi][safi];