summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrenato <renato@openbsd.org>2016-07-15 17:03:10 +0000
committerrenato <renato@openbsd.org>2016-07-15 17:03:10 +0000
commit34d7bc8b7b8f72e60481bc25f39fbdcf13f894fc (patch)
tree341c458d89db0963a91fa22ae5065012aca3d0cf
parentdisable acpicbkbd by default until after the release when acpi ec (diff)
downloadwireguard-openbsd-34d7bc8b7b8f72e60481bc25f39fbdcf13f894fc.tar.xz
wireguard-openbsd-34d7bc8b7b8f72e60481bc25f39fbdcf13f894fc.zip
Update per-neighbor GTSM options on config reload.
-rw-r--r--usr.sbin/ldpd/ldpd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/ldpd/ldpd.c b/usr.sbin/ldpd/ldpd.c
index 51ef17dc5ec..48f98ad91c2 100644
--- a/usr.sbin/ldpd/ldpd.c
+++ b/usr.sbin/ldpd/ldpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldpd.c,v 1.56 2016/07/01 23:29:55 renato Exp $ */
+/* $OpenBSD: ldpd.c,v 1.57 2016/07/15 17:03:10 renato Exp $ */
/*
* Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -1011,6 +1011,8 @@ merge_nbrps(struct ldpd_conf *conf, struct ldpd_conf *xconf)
nbrp_changed = 0;
nbrp->keepalive = xn->keepalive;
+ nbrp->gtsm_enabled = xn->gtsm_enabled;
+ nbrp->gtsm_hops = xn->gtsm_hops;
nbrp->auth.method = xn->auth.method;
strlcpy(nbrp->auth.md5key, xn->auth.md5key,
sizeof(nbrp->auth.md5key));