diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2014-02-19 09:16:17 -0500 |
|---|---|---|
| committer | Stephen Smalley <sds@tycho.nsa.gov> | 2014-02-19 16:11:48 -0500 |
| commit | 9eb9c9327563014ad6a807814e7975424642d5b9 (patch) | |
| tree | 050b6180a59af9ee7622c80171d734f319c178f0 /libselinux/src/query_user_context.c | |
| parent | 1cb368636bdaf465cd63178a0692db38865e943b (diff) | |
| download | android_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/query_user_context.c')
| -rw-r--r-- | libselinux/src/query_user_context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libselinux/src/query_user_context.c b/libselinux/src/query_user_context.c index dcfc1b0f..b8125c96 100644 --- a/libselinux/src/query_user_context.c +++ b/libselinux/src/query_user_context.c @@ -9,7 +9,7 @@ * to the user. Returns the number (position in the list) of * the user selected context. */ -static int context_menu(security_context_t * list) +static int context_menu(char ** list) { int i; /* array index */ int choice = 0; /* index of the user's choice */ @@ -35,7 +35,7 @@ static int context_menu(security_context_t * list) * default is the first context in the list. Returns 0 on * success, -1 on failure */ -int query_user_context(security_context_t * list, security_context_t * usercon) +int query_user_context(char ** list, char ** usercon) { char response[10]; /* The user's response */ int choice; /* The index in the list of the sid chosen by @@ -103,7 +103,7 @@ static void get_field(const char *fieldstr, char *newfield, int newfieldlen) * context chosen by the user into usercon. Returns 0 * on success. */ -int manual_user_enter_context(const char *user, security_context_t * newcon) +int manual_user_enter_context(const char *user, char ** newcon) { char response[10]; /* Used to get yes or no answers from user */ char role[100]; /* The role requested by the user */ |