From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 19 Jul 2018 14:09:51 +0000 (-0400)
Subject: lib: Set proper write file when using backup config
X-Git-Tag: frr-6.1-dev~86^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fe64533ad9a780366ce143480c26a6ee61ea14ba;p=matthieu%2Ffrr.git

lib: Set proper write file when using backup config

When we read in a backup file, we should save the original
host.config so that we can put it back to the correct original
location after we read in the backup config.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/lib/libfrr.c b/lib/libfrr.c
index 9ea5e985cd..86a5bd29f8 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -745,9 +745,14 @@ static int frr_config_read_in(struct thread *t)
 {
 	if (!vty_read_config(di->config_file, config_default) &&
 	    di->backup_config_file) {
+		char *orig = XSTRDUP(MTYPE_TMP, host_config_get());
+
 		zlog_info("Attempting to read backup config file: %s specified",
 			  di->backup_config_file);
 		vty_read_config(di->backup_config_file, config_default);
+
+		host_config_set(orig);
+		XFREE(MTYPE_TMP, orig);
 	}
 	return 0;
 }