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 25f7178b6b47d1f918d68db9a89621b501f16f32..859d47431b394c5855e72d234b9ef5c7e9fdb6db 100644 (file)
--- 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 20cc9f7444290bef31c86e05e9e8873b7cfa5b66..017eec2502c4145cf9bdfe5bc99d233d927e8bc9 100644 (file)
--- 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 */