aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2006-09-26 02:31:57 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 11:48:52 -0400
commit1a70cd40cb291c25b67ec0da715a49d76719329d (patch)
treeffb4c6cd3f7ef1b92822ebbda11bd2b035c2bc86 /include/linux
parent62bac0185ad3dfef11d9602980445c54d45199c6 (diff)
[PATCH] selinux: rename selinux_ctxid_to_string
Rename selinux_ctxid_to_string to selinux_sid_to_string to be consistent 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')
-rw-r--r--include/linux/selinux.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/selinux.h b/include/linux/selinux.h
index 79e4707ca772..df9098de4c99 100644
--- a/include/linux/selinux.h
+++ b/include/linux/selinux.h
@@ -70,8 +70,8 @@ int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
70void selinux_audit_set_callback(int (*callback)(void)); 70void selinux_audit_set_callback(int (*callback)(void));
71 71
72/** 72/**
73 * selinux_ctxid_to_string - map a security context ID to a string 73 * selinux_sid_to_string - map a security context ID to a string
74 * @ctxid: security context ID to be converted. 74 * @sid: security context ID to be converted.
75 * @ctx: address of context string to be returned 75 * @ctx: address of context string to be returned
76 * @ctxlen: length of returned context string. 76 * @ctxlen: length of returned context string.
77 * 77 *
@@ -79,7 +79,7 @@ void selinux_audit_set_callback(int (*callback)(void));
79 * string will be allocated internally, and the caller must call 79 * string will be allocated internally, and the caller must call
80 * kfree() on it after use. 80 * kfree() on it after use.
81 */ 81 */
82int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen); 82int selinux_sid_to_string(u32 sid, char **ctx, u32 *ctxlen);
83 83
84/** 84/**
85 * selinux_get_inode_sid - get the inode's security context ID 85 * selinux_get_inode_sid - get the inode's security context ID
@@ -156,7 +156,7 @@ static inline void selinux_audit_set_callback(int (*callback)(void))
156 return; 156 return;
157} 157}
158 158
159static inline int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen) 159static inline int selinux_sid_to_string(u32 sid, char **ctx, u32 *ctxlen)
160{ 160{
161 *ctx = NULL; 161 *ctx = NULL;
162 *ctxlen = 0; 162 *ctxlen = 0;