summaryrefslogtreecommitdiff
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2002-10-16 23:47:59 -0700
committerGreg Kroah-Hartman <greg@kroah.com>2002-10-16 23:47:59 -0700
commite6ebd8d693ae8a9d454065bf479fa3f271eb76de (patch)
treedbaa1204bb831bf4d58ccd48d5528dd1f30388d6 /include/linux/sched.h
parent3105592febb579aa76004aad97d24f792978c253 (diff)
LSM: Create CONFIG_SECURITY and disable it by default for now.
This allows the security hooks to be compiled away into nothingness if CONFIG_SECURITY is disabled. When disabled, the default capabilities functionality is preserved. When enabled, security modules are allowed to be loaded.
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 764a3ebf3c24..22d73238b851 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -596,9 +596,9 @@ extern int request_irq(unsigned int,
unsigned long, const char *, void *);
extern void free_irq(unsigned int, void *);
-/* capable prototype and code moved to security.[hc] */
-#include <linux/security.h>
-#if 0
+
+#ifndef CONFIG_SECURITY
+/* capable prototype and code are in security.[hc] if CONFIG_SECURITY */
static inline int capable(int cap)
{
if (cap_raised(current->cap_effective, cap)) {
@@ -607,7 +607,7 @@ static inline int capable(int cap)
}
return 0;
}
-#endif /* if 0 */
+#endif
/*
* Routines for handling mm_structs