Merge branch 'next' into for-linus

[linux-2.6.git] / security / smack / smack_lsm.c

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 6bfaba6177c25e94a090e2bf447113261c094502..0278bc08304440df4af600670312e7bd3bce764c 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2691,7 +2691,7 @@ static int smack_audit_rule_init(u32 field, u32 op, char *rulestr, void **vrule)
        if (field != AUDIT_SUBJ_USER && field != AUDIT_OBJ_USER)
                return -EINVAL;
 
        if (field != AUDIT_SUBJ_USER && field != AUDIT_OBJ_USER)
                return -EINVAL;
 

-       if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL)
+       if (op != Audit_equal && op != Audit_not_equal)

                return -EINVAL;
 
        *rule = smk_import(rulestr, 0);
                return -EINVAL;
 
        *rule = smk_import(rulestr, 0);


@@ -2755,9 +2755,9 @@ static int smack_audit_rule_match(u32 secid, u32 field, u32 op, void *vrule,
         * both pointers will point to the same smack_known
         * label.
         */
         * both pointers will point to the same smack_known
         * label.
         */

-       if (op == AUDIT_EQUAL)
+       if (op == Audit_equal)

                return (rule == smack);
                return (rule == smack);

-       if (op == AUDIT_NOT_EQUAL)
+       if (op == Audit_not_equal)

                return (rule != smack);
 
        return 0;
                return (rule != smack);
 
        return 0;