diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 12:38:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 12:38:30 -0400 |
| commit | 505683675cf0ed903765f160ad633f77ab90a9d4 (patch) | |
| tree | 4008d2e7c80f3d19d917752e1274d293630c7a44 | |
| parent | e4f3b1e74b67fdcdd3034b84997fad7912f182f6 (diff) | |
| parent | 3ad40d647d5e7c320385649e5eb422a5e89e035d (diff) | |
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
| -rw-r--r-- | security/selinux/ss/services.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index f00161ef99ed..6100fc023055 100644 --- 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, | |||
| 2127 | *rule = NULL; | 2127 | *rule = NULL; |
| 2128 | 2128 | ||
| 2129 | if (!ss_initialized) | 2129 | if (!ss_initialized) |
| 2130 | return -ENOTSUPP; | 2130 | return -EOPNOTSUPP; |
| 2131 | 2131 | ||
| 2132 | switch (field) { | 2132 | switch (field) { |
| 2133 | case AUDIT_SUBJ_USER: | 2133 | case AUDIT_SUBJ_USER: |