artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
14a2db8
)
In merge_peers also copy over the auth_conf from the new peer to the old
author
claudio
<claudio@openbsd.org>
Tue, 1 Oct 2024 18:29:34 +0000
(18:29 +0000)
committer
claudio
<claudio@openbsd.org>
Tue, 1 Oct 2024 18:29:34 +0000
(18:29 +0000)
since that one is kept.
OK tb@
usr.sbin/bgpd/session.c
patch
|
blob
|
history
diff --git
a/usr.sbin/bgpd/session.c
b/usr.sbin/bgpd/session.c
index
a423400
..
b62f6fc
100644
(file)
--- a/
usr.sbin/bgpd/session.c
+++ b/
usr.sbin/bgpd/session.c
@@
-1,4
+1,4
@@
-/* $OpenBSD: session.c,v 1.48
3 2024/10/01 11:49:2
4 claudio Exp $ */
+/* $OpenBSD: session.c,v 1.48
4 2024/10/01 18:29:3
4 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);