From: Renato Westphal <renato@opensourcerouting.org>
Date: Thu, 29 Sep 2016 17:52:32 +0000 (-0300)
Subject: ldpd: reset interface configuration when it's disabled
X-Git-Tag: frr-2.0-rc1~181
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=271327b121ef552336d628f46741e250349d6214;p=matthieu%2Ffrr.git

ldpd: reset interface configuration when it's disabled

This is necessary to prevent the same old configuration to come back
when the interface is reactivated later for a given address-family.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/ldpd/ldp_vty_conf.c b/ldpd/ldp_vty_conf.c
index a3e1b9a250..1cc9bea9dd 100644
--- a/ldpd/ldp_vty_conf.c
+++ b/ldpd/ldp_vty_conf.c
@@ -833,6 +833,8 @@ ldp_vty_interface(struct vty *vty, struct vty_arg *args[])
 			goto cancel;
 
 		ia->enabled = 0;
+		ia->hello_holdtime = 0;
+		ia->hello_interval = 0;
 		ldp_reload(vty_conf);
 		return (CMD_SUCCESS);
 	}