From c3c370a7e95987ec55b3441e6ff5fcd218ff5bb0 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Wed, 7 Jan 2015 15:59:53 -0500 Subject: Fix error in compiling without SELinux Fixes: #131 Signed-off-by: Simo Sorce --- proxy/src/gp_selinux.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/proxy/src/gp_selinux.h b/proxy/src/gp_selinux.h index 693a124..f53da5a 100644 --- a/proxy/src/gp_selinux.h +++ b/proxy/src/gp_selinux.h @@ -48,9 +48,9 @@ #define SELINUX_CTX void * #define SEC_CTX void * -void *SELINUX_context_new(const char *str) { return NULL; } -#define SELINUX_context_free(x) (x) = NULL; -const char *SELINUX_context_dummy_get(void *) { return NULL; } +#define SELINUX_context_new(x) NULL +#define SELINUX_context_free(x) (x) = NULL +#define SELINUX_context_dummy_get(x) "" #define SELINUX_context_str SELINUX_context_dummy_get #define SELINUX_context_type_get SELINUX_context_dummy_get #define SELINUX_context_user_get SELINUX_context_dummy_get @@ -58,13 +58,12 @@ const char *SELINUX_context_dummy_get(void *) { return NULL; } #define SELINUX_context_range_get SELINUX_context_dummy_get #include -int SELINUX_getpeercon(int fd, SEC_CTX *con) -{ - *con = NULL; - errno = ENOTSUP; - return -1; -} -#define SELINUX_freecon(x) (x) = NULL; +#define SELINUX_getpeercon(x, y) -1; do { \ + *(y) = NULL; \ + errno = ENOTSUP; \ +} while(0) + +#define SELINUX_freecon(x) (x) = NULL #endif /* done HAVE_SELINUX */ -- cgit