diff options
author | Venkat Yekkirala <vyekkirala@TrustedCS.com> | 2006-12-12 14:02:41 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2007-01-08 17:32:51 -0500 |
commit | 0efc61eaee5471acd7399c8536feff280b4966dd (patch) | |
tree | c57dbd32f8a318082ba4f35092b5679d23cfb184 /security/selinux/ss/services.c | |
parent | bf81b46482c0fa8ea638e409d39768ea92a6b0f0 (diff) |
selinux: Delete mls_copy_context
This deletes mls_copy_context() in favor of mls_context_cpy() and
replaces mls_scopy_context() with mls_context_cpy_low().
Signed-off-by: Venkat Yekkirala <vyekkirala@TrustedCS.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/ss/services.c')
-rw-r--r-- | security/selinux/ss/services.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index ee0581557966..372eaade3ca6 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -1916,11 +1916,10 @@ int security_sid_mls_copy(u32 sid, u32 mls_sid, u32 *new_sid) | |||
1916 | newcon.user = context1->user; | 1916 | newcon.user = context1->user; |
1917 | newcon.role = context1->role; | 1917 | newcon.role = context1->role; |
1918 | newcon.type = context1->type; | 1918 | newcon.type = context1->type; |
1919 | rc = mls_copy_context(&newcon, context2); | 1919 | rc = mls_context_cpy(&newcon, context2); |
1920 | if (rc) | 1920 | if (rc) |
1921 | goto out_unlock; | 1921 | goto out_unlock; |
1922 | 1922 | ||
1923 | |||
1924 | /* Check the validity of the new context. */ | 1923 | /* Check the validity of the new context. */ |
1925 | if (!policydb_context_isvalid(&policydb, &newcon)) { | 1924 | if (!policydb_context_isvalid(&policydb, &newcon)) { |
1926 | rc = convert_context_handle_invalid_context(&newcon); | 1925 | rc = convert_context_handle_invalid_context(&newcon); |