diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-02 11:38:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 11:38:06 -0400 |
| commit | b46be72b4aff1d413e89bc26a70a29934afe9d85 (patch) | |
| tree | cd556a135211559b7e636db619dbf5257f874e86 /ldpd/ldpe.c | |
| parent | 2a23cf9503bf2ff36d3c34308de78618b3196f35 (diff) | |
| parent | b2ab6b282ce1569ed348aebe17432094adfe7d24 (diff) | |
Merge branch 'master' into EIGRP
Diffstat (limited to 'ldpd/ldpe.c')
| -rw-r--r-- | ldpd/ldpe.c | 10 |
1 files changed, 2 insertions, 8 deletions
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 */ |