Attachment 709119 Details for Bug 919385 – patch to fix problem. stop messing with bset

[patch] patch to fix problem. stop messing with bset

tmp.patch (text/plain), 1.35 KB, created by Eric Paris on 2013-03-12 19:11:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Paris

Created: 2013-03-12 19:11:23 UTC

Size: 1.35 KB

patch

obsolete

>diff --git a/policycoreutils/newrole/newrole.c b/policycoreutils/newrole/newrole.c
>index 3753ef4..5b6dc74 100644
>--- a/policycoreutils/newrole/newrole.c
>+++ b/policycoreutils/newrole/newrole.c
>@@ -547,7 +547,7 @@ static int drop_capabilities(int full)
> 	if (!uid) return 0;
> 
> 	capng_setpid(getpid());
>-	capng_clear(CAPNG_SELECT_BOTH);
>+	capng_clear(CAPNG_SELECT_CAPS);
> 	if (capng_lock() < 0) 
> 		return -1;
> 
>@@ -558,7 +558,7 @@ static int drop_capabilities(int full)
> 	}
> 	if (! full) 
> 		capng_update(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, CAP_AUDIT_WRITE);
>-	return capng_apply(CAPNG_SELECT_BOTH);
>+	return capng_apply(CAPNG_SELECT_CAPS);
> }
> #elif defined(NAMESPACE_PRIV)
> /**
>@@ -577,7 +577,7 @@ static int drop_capabilities(int full)
> static int drop_capabilities(int full)
> {
> 	capng_setpid(getpid());
>-	capng_clear(CAPNG_SELECT_BOTH);
>+	capng_clear(CAPNG_SELECT_CAPS);
> 	if (capng_lock() < 0) 
> 		return -1;
> 
>@@ -588,8 +588,8 @@ static int drop_capabilities(int full)
> 		return -1;
> 	}
> 	if (! full) 
>-		capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, CAP_SYS_ADMIN , CAP_FOWNER , CAP_CHOWN, CAP_DAC_OVERRIDE, CAP_SETPCAP, -1);
>-	return capng_apply(CAPNG_SELECT_BOTH);
>+		capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, CAP_SYS_ADMIN , CAP_FOWNER , CAP_CHOWN, CAP_DAC_OVERRIDE, -1);
>+	return capng_apply(CAPNG_SELECT_CAPS);
> }
> 
> #else

Actions: View | Diff

Attachments on bug 919385: 706980 | 709119 | 710206