aboutsummaryrefslogtreecommitdiffstats
path: root/libselinux/src/get_initial_context.c
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2014-02-19 09:16:17 -0500
committerStephen Smalley <sds@tycho.nsa.gov>2014-02-19 16:11:48 -0500
commit9eb9c9327563014ad6a807814e7975424642d5b9 (patch)
tree050b6180a59af9ee7622c80171d734f319c178f0 /libselinux/src/get_initial_context.c
parent1cb368636bdaf465cd63178a0692db38865e943b (diff)
downloadandroid_external_selinux-9eb9c9327563014ad6a807814e7975424642d5b9.tar.gz
android_external_selinux-9eb9c9327563014ad6a807814e7975424642d5b9.tar.bz2
android_external_selinux-9eb9c9327563014ad6a807814e7975424642d5b9.zip
Get rid of security_context_t and fix const declarations.
In attempting to enable building various part of Android with -Wall -Werror, we found that the const security_context_t declarations in libselinux are incorrect; const char * was intended, but const security_context_t translates to char * const and triggers warnings on passing const char * from the caller. Easiest fix is to replace them all with const char *. And while we are at it, just get rid of all usage of security_context_t itself as it adds no value - there is no true encapsulation of the security context strings and callers already directly use string functions on them. typedef left to permit building legacy users until such a time as all are updated. This is a port of Change-Id I2f9df7bb9f575f76024c3e5f5b660345da2931a7 from Android, augmented to deal with all of the other code in upstream libselinux and updating the man pages too. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'libselinux/src/get_initial_context.c')
-rw-r--r--libselinux/src/get_initial_context.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libselinux/src/get_initial_context.c b/libselinux/src/get_initial_context.c
index 16764354..522ed78f 100644
--- a/libselinux/src/get_initial_context.c
+++ b/libselinux/src/get_initial_context.c
@@ -11,7 +11,7 @@
#define SELINUX_INITCON_DIR "/initial_contexts/"
-int security_get_initial_context_raw(const char * name, security_context_t * con)
+int security_get_initial_context_raw(const char * name, char ** con)
{
char path[PATH_MAX];
char *buf;
@@ -55,10 +55,10 @@ int security_get_initial_context_raw(const char * name, security_context_t * con
hidden_def(security_get_initial_context_raw)
-int security_get_initial_context(const char * name, security_context_t * con)
+int security_get_initial_context(const char * name, char ** con)
{
int ret;
- security_context_t rcon;
+ char * rcon;
ret = security_get_initial_context_raw(name, &rcon);
if (!ret) {