diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2024-10-01 18:29:35 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2024-10-01 18:29:35 +0000 |
| commit | bfcdc123f65bbe8c498358b7ee70834aab37a09b (patch) | |
| tree | 7c3416ab4c473e05a9a8727502c2d49b7241a7a6 /usr.sbin | |
| parent | 27a580f861ac0fd86a5e9a75f1dea30691e493d9 (diff) | |
In merge_peers also copy over the auth_conf from the new peer to the old
since that one is kept.
OK tb@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bgpd/session.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index a4234006a93..b62f6fc6773 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.483 2024/10/01 11:49:24 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.484 2024/10/01 18:29:34 claudio Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -3682,6 +3682,7 @@ merge_peers(struct bgpd_config *c, struct bgpd_config *nc) tcp_md5_add_listener(c, np); memcpy(&p->conf, &np->conf, sizeof(p->conf)); + memcpy(&p->auth_conf, &np->auth_conf, sizeof(p->auth_conf)); RB_REMOVE(peer_head, &nc->peers, np); free(np); |