From: Renato Westphal <renato@opensourcerouting.org>
Date: Thu, 27 Apr 2017 11:56:15 +0000 (-0300)
Subject: ldpd: fix issues detected by Coverity Scan
X-Git-Tag: reindent-master-before~210^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=af7e63a35774771ad87e7a25c2a3a08a3a7128af;p=matthieu%2Ffrr.git

ldpd: fix issues detected by Coverity Scan

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

diff --git a/ldpd/lde.c b/ldpd/lde.c
index 25f7178b6b..859d47431b 100644
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -80,10 +80,6 @@ static zebra_capabilities_t _caps_p [] =
 
 static struct zebra_privs_t lde_privs =
 {
-#if defined(FRR_USER) && defined(FRR_GROUP)
-	.user = FRR_USER,
-	.group = FRR_GROUP,
-#endif
 #if defined(VTY_GROUP)
 	.vty_group = VTY_GROUP,
 #endif
@@ -164,10 +160,8 @@ void
 lde_init(struct ldpd_init *init)
 {
 	/* drop privileges */
-	if (init->user)
-		lde_privs.user = init->user;
-	if (init->group)
-		lde_privs.group = init->group;
+	lde_privs.user = init->user;
+	lde_privs.group = init->group;
 	zprivs_init(&lde_privs);
 
 #ifdef HAVE_PLEDGE
diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c
index 20cc9f7444..017eec2502 100644
--- a/ldpd/ldpe.c
+++ b/ldpd/ldpe.c
@@ -66,10 +66,6 @@ static zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t ldpe_privs =
 {
-#if defined(FRR_USER) && defined(FRR_GROUP)
-	.user = FRR_USER,
-	.group = FRR_GROUP,
-#endif
 #if defined(VTY_GROUP)
 	.vty_group = VTY_GROUP,
 #endif
@@ -143,10 +139,8 @@ void
 ldpe_init(struct ldpd_init *init)
 {
 	/* drop privileges */
-	if (init->user)
-		ldpe_privs.user = init->user;
-	if (init->group)
-		ldpe_privs.group = init->group;
+	ldpe_privs.user = init->user;
+	ldpe_privs.group = init->group;
 	zprivs_init(&ldpe_privs);
 
 	/* listen on ldpd control socket */