Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: correct error code in selinux_audit_rule_init

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: correct error code in selinux_audit_rule_init
50568367 · Linus Torvalds · e4f3b1e7 · 3ad40d64 · 50568367
Commit 50568367 authored Aug 18, 2007 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

security/selinux/ss/services.c security/selinux/ss/services.c +1 -1

No files found.
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2127,7 +2127,7 @@ int selinux_audit_rule_init(u32 field, u32 op, char *rulestr,
 	*rule = NULL;

 	if (!ss_initialized)
-		return -ENOTSUPP;
+		return -EOPNOTSUPP;

 	switch (field) {
 	case AUDIT_SUBJ_USER: