ldpd: fix issues detected by Coverity Scan

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2017-04-27 08:56:15 -03:00
parent 77e17a6ae5
commit af7e63a357
2 changed files with 4 additions and 16 deletions

View File

@ -80,10 +80,6 @@ static zebra_capabilities_t _caps_p [] =
static struct zebra_privs_t lde_privs = 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) #if defined(VTY_GROUP)
.vty_group = VTY_GROUP, .vty_group = VTY_GROUP,
#endif #endif
@ -164,10 +160,8 @@ void
lde_init(struct ldpd_init *init) lde_init(struct ldpd_init *init)
{ {
/* drop privileges */ /* drop privileges */
if (init->user) lde_privs.user = init->user;
lde_privs.user = init->user; lde_privs.group = init->group;
if (init->group)
lde_privs.group = init->group;
zprivs_init(&lde_privs); zprivs_init(&lde_privs);
#ifdef HAVE_PLEDGE #ifdef HAVE_PLEDGE

View File

@ -66,10 +66,6 @@ static zebra_capabilities_t _caps_p [] =
struct zebra_privs_t ldpe_privs = struct zebra_privs_t ldpe_privs =
{ {
#if defined(FRR_USER) && defined(FRR_GROUP)
.user = FRR_USER,
.group = FRR_GROUP,
#endif
#if defined(VTY_GROUP) #if defined(VTY_GROUP)
.vty_group = VTY_GROUP, .vty_group = VTY_GROUP,
#endif #endif
@ -143,10 +139,8 @@ void
ldpe_init(struct ldpd_init *init) ldpe_init(struct ldpd_init *init)
{ {
/* drop privileges */ /* drop privileges */
if (init->user) ldpe_privs.user = init->user;
ldpe_privs.user = init->user; ldpe_privs.group = init->group;
if (init->group)
ldpe_privs.group = init->group;
zprivs_init(&ldpe_privs); zprivs_init(&ldpe_privs);
/* listen on ldpd control socket */ /* listen on ldpd control socket */