summaryrefslogtreecommitdiff
path: root/include/linux/selinux.h
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2006-09-25 23:31:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 08:48:52 -0700
commit9a2f44f01a67a6ecca71515af999895b45a2aeb0 (patch)
treebadb3047f9a80013ad0d00a413f6ca038ba3f3ce /include/linux/selinux.h
parent1a70cd40cb291c25b67ec0da715a49d76719329d (diff)
downloadlwn-9a2f44f01a67a6ecca71515af999895b45a2aeb0.tar.gz
lwn-9a2f44f01a67a6ecca71515af999895b45a2aeb0.zip
[PATCH] selinux: replace ctxid with sid in selinux_audit_rule_match interface
Replace ctxid with sid in selinux_audit_rule_match interface for consistency with other interfaces. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: James Morris <jmorris@namei.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/selinux.h')
-rw-r--r--include/linux/selinux.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/selinux.h b/include/linux/selinux.h
index df9098de4c99..d1b7ca6c1c57 100644
--- a/include/linux/selinux.h
+++ b/include/linux/selinux.h
@@ -46,7 +46,7 @@ void selinux_audit_rule_free(struct selinux_audit_rule *rule);
/**
* selinux_audit_rule_match - determine if a context ID matches a rule.
- * @ctxid: the context ID to check
+ * @sid: the context ID to check
* @field: the field this rule refers to
* @op: the operater the rule uses
* @rule: pointer to the audit rule to check against
@@ -55,7 +55,7 @@ void selinux_audit_rule_free(struct selinux_audit_rule *rule);
* Returns 1 if the context id matches the rule, 0 if it does not, and
* -errno on failure.
*/
-int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
+int selinux_audit_rule_match(u32 sid, u32 field, u32 op,
struct selinux_audit_rule *rule,
struct audit_context *actx);
@@ -144,7 +144,7 @@ static inline void selinux_audit_rule_free(struct selinux_audit_rule *rule)
return;
}
-static inline int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
+static inline int selinux_audit_rule_match(u32 sid, u32 field, u32 op,
struct selinux_audit_rule *rule,
struct audit_context *actx)
{