From: David Lamparter <equinox@opensourcerouting.org>
Date: Mon, 21 Aug 2017 18:05:51 +0000 (+0200)
Subject: bgpd: don't zprivs_terminate() twice
X-Git-Tag: frr-4.0-dev~389^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8e9e4bd4bf0493013e071d9edb5c374c78549c73;p=matthieu%2Ffrr.git

bgpd: don't zprivs_terminate() twice

zprivs_terminate() is called from bgp_exit()

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index d1359402df..3bf9ea02d5 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -140,11 +140,8 @@ __attribute__((__noreturn__)) void sigint(void)
 {
 	zlog_notice("Terminating on signal");
 
-	if (!retain_mode) {
+	if (!retain_mode)
 		bgp_terminate();
-		if (bgpd_privs.user) /* NULL if skip_runas flag set */
-			zprivs_terminate(&bgpd_privs);
-	}
 
 	bgp_exit(0);