summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2011-04-01 17:08:45 -0400
committerJames Morris <jmorris@namei.org>2011-04-04 10:31:16 +1000
commita3232d2fa2e3cbab3e76d91cdae5890fee8a4034 (patch)
treede02161b885ceb58b2c807ac6e0a721aabd3470b /kernel
parent5163b583a036b103c3cec7171d6731c125773ed6 (diff)
downloadop-kernel-dev-a3232d2fa2e3cbab3e76d91cdae5890fee8a4034.zip
op-kernel-dev-a3232d2fa2e3cbab3e76d91cdae5890fee8a4034.tar.gz
capabilities: delete all CAP_INIT macros
The CAP_INIT macros of INH, BSET, and EFF made sense at one point in time, but now days they aren't helping. Just open code the logic in the init_cred. Signed-off-by: Eric Paris <eparis@redhat.com> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cred.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cred.c b/kernel/cred.c
index 5557b55..b982f08 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -49,10 +49,10 @@ struct cred init_cred = {
.magic = CRED_MAGIC,
#endif
.securebits = SECUREBITS_DEFAULT,
- .cap_inheritable = CAP_INIT_INH_SET,
+ .cap_inheritable = CAP_EMPTY_SET,
.cap_permitted = CAP_FULL_SET,
- .cap_effective = CAP_INIT_EFF_SET,
- .cap_bset = CAP_INIT_BSET,
+ .cap_effective = CAP_FULL_SET,
+ .cap_bset = CAP_FULL_SET,
.user = INIT_USER,
.group_info = &init_groups,
#ifdef CONFIG_KEYS
OpenPOWER on IntegriCloud