From: claudio <claudio@openbsd.org>
Date: Tue, 1 Oct 2024 18:29:34 +0000 (+0000)
Subject: In merge_peers also copy over the auth_conf from the new peer to the old
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8f5501c15d6bc701fd57df879473187df203963d;p=openbsd

In merge_peers also copy over the auth_conf from the new peer to the old
since that one is kept.
OK tb@
---

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);