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>

1 files changed, 9 insertions, 9 deletions

diff --git a/libselinux/src/compute_relabel.c b/libselinux/src/compute_relabel.c
index 656f00af..4615aee4 100644
--- a/libselinux/src/compute_relabel.c
+++ b/libselinux/src/compute_relabel.c
@@ -10,10 +10,10 @@
 #include "policy.h"
 #include "mapping.h"
 
-int security_compute_relabel_raw(const security_context_t scon,
-				 const security_context_t tcon,
+int security_compute_relabel_raw(const char * scon,
+				 const char * tcon,
 				 security_class_t tclass,
-				 security_context_t * newcon)
+				 char ** newcon)
 {
 	char path[PATH_MAX];
 	char *buf;
@@ -62,15 +62,15 @@ int security_compute_relabel_raw(const security_context_t scon,
 
 hidden_def(security_compute_relabel_raw)
 
-int security_compute_relabel(const security_context_t scon,
-			     const security_context_t tcon,
+int security_compute_relabel(const char * scon,
+			     const char * tcon,
 			     security_class_t tclass,
-			     security_context_t * newcon)
+			     char ** newcon)
 {
 	int ret;
-	security_context_t rscon;
-	security_context_t rtcon;
-	security_context_t rnewcon;
+	char * rscon;
+	char * rtcon;
+	char * rnewcon;
 
 	if (selinux_trans_to_raw_context(scon, &rscon))
 		return -1;