diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2018-06-22 14:19:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 14:19:13 -0500 |
| commit | 3a743cb7ec5fd1e91e0803487c606cf63e54c22b (patch) | |
| tree | b3291b5c500560e474f7248b23c5b8cf5c156bd5 | |
| parent | 5caa3ad34fb8cf59d1b14b31547d24f1801b8289 (diff) | |
| parent | 38e72ffa9a104a5739482fc641882d296be11a30 (diff) | |
Merge pull request #2520 from donaldsharp/privs_smivs
lib: Fix privs when using HAVE_CAPABILITIES
| -rw-r--r-- | lib/privs.c | 13 | ||||
| -rw-r--r-- | sharpd/sharp_main.c | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/privs.c b/lib/privs.c index cfe7d6d6f8..7c99742d34 100644 --- a/lib/privs.c +++ b/lib/privs.c @@ -824,6 +824,19 @@ void zprivs_init(struct zebra_privs_t *zprivs) #ifdef HAVE_CAPABILITIES zprivs_caps_init(zprivs); + + /* + * If we have initialized the system with no requested + * capabilities, change will not have been set + * to anything by zprivs_caps_init, As such + * we should make sure that when we attempt + * to raize privileges that we actually have + * a do nothing function to call instead of a + * crash :). + */ + if (!zprivs->change) + zprivs->change = zprivs_change_null; + #else /* !HAVE_CAPABILITIES */ /* we dont have caps. we'll need to maintain rid and saved uid * and change euid back to saved uid (who we presume has all neccessary diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index a478b416bf..22a19da0b3 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -51,7 +51,6 @@ uint32_t installed_routes = 0; uint32_t removed_routes = 0; zebra_capabilities_t _caps_p[] = { - ZCAP_NET_RAW, ZCAP_BIND, ZCAP_NET_ADMIN, }; struct zebra_privs_t sharp_privs = { |