diff options
| -rw-r--r-- | lib/portability.h | 3 | ||||
| -rw-r--r-- | toys/posix/id.c | 21 |
2 files changed, 14 insertions, 10 deletions
diff --git a/lib/portability.h b/lib/portability.h index 67ac5b58..4097defa 100644 --- a/lib/portability.h +++ b/lib/portability.h @@ -239,4 +239,7 @@ pid_t xfork(void); #if CFG_TOYBOX_SELINUX #include <selinux/selinux.h> +#else +#define is_selinux_enabled() 0 +int getcon(void* con); #endif diff --git a/toys/posix/id.c b/toys/posix/id.c index 4e1ec8cb..353aa041 100644 --- a/toys/posix/id.c +++ b/toys/posix/id.c @@ -146,17 +146,18 @@ void do_id(char *username) } } -#if CFG_TOYBOX_SELINUX - char *context = NULL; - if (is_selinux_enabled() < 1) { - if (TT.do_Z) - error_exit("SELinux disabled"); - } else if (getcon(&context) == 0) { - if (!TT.do_Z) xputc(' '); - printf("context=%s", context); + if (CFG_TOYBOX_SELINUX) { + char *context = NULL; + + if (is_selinux_enabled() < 1) { + if (TT.do_Z) + error_exit("SELinux disabled"); + } else if (getcon(&context) == 0) { + if (!TT.do_Z) xputc(' '); + printf("context=%s", context); + } + if (CFG_TOYBOX_FREE) free(context); } - if (CFG_TOYBOX_FREE) free(context); -#endif xputc('\n'); } |