diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-24 11:22:35 -0400 | 
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-24 11:22:35 -0400 | 
| commit | 9e962de4b619a00a139f8982c9e6528553927f14 (patch) | |
| tree | 7df0f155c27bc9b5993df17d21a22314be2fb413 /lib/privs.c | |
| parent | 2d828a0c671bdac6299cf3cde2b66e3589b47c60 (diff) | |
| parent | f731a65469170480bb25c05463fba8d69f172328 (diff) | |
Merge remote-tracking branch 'origin/stable/3.0'
Diffstat (limited to 'lib/privs.c')
| -rw-r--r-- | lib/privs.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/privs.c b/lib/privs.c index 3a66382191..6b5dc9e1a6 100644 --- a/lib/privs.c +++ b/lib/privs.c @@ -104,7 +104,7 @@ static struct  #ifdef HAVE_LCAPS /* Quagga -> Linux capabilities mappings */    [ZCAP_SETID] = 	{ 2, (pvalue_t []) { CAP_SETGID,                                               CAP_SETUID 		}, }, -  [ZCAP_BIND] =		{ 2, (pvalue_t []) { CAP_NET_BIND_SERVICE	}, }, +  [ZCAP_BIND] =		{ 1, (pvalue_t []) { CAP_NET_BIND_SERVICE	}, },    [ZCAP_NET_ADMIN] =	{ 1, (pvalue_t []) { CAP_NET_ADMIN		}, },    [ZCAP_NET_RAW] = 	{ 1, (pvalue_t []) { CAP_NET_RAW		}, },    [ZCAP_CHROOT] = 	{ 1, (pvalue_t []) { CAP_SYS_CHROOT,		}, }, @@ -129,7 +129,7 @@ static struct    [ZCAP_CHROOT] = 	{ 1, (pvalue_t []) { PRIV_PROC_CHROOT		}, },    [ZCAP_NICE] = 	{ 1, (pvalue_t []) { PRIV_PROC_PRIOCNTL		}, },    [ZCAP_PTRACE] =	{ 1, (pvalue_t []) { PRIV_PROC_SESSION		}, }, -  [ZCAP_DAC_OVERRIDE] = { 2, (pvalue_t []) { PRIV_FILE_DAC_EXECUTE,  +  [ZCAP_DAC_OVERRIDE] = { 5, (pvalue_t []) { PRIV_FILE_DAC_EXECUTE,                                               PRIV_FILE_DAC_READ,                                               PRIV_FILE_DAC_SEARCH,                                               PRIV_FILE_DAC_WRITE,  | 
