diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/shared/selinux-util.c | 15 |
2 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index dfa71e44d2..01b8ca006b 100644 --- a/configure.ac +++ b/configure.ac @@ -223,6 +223,9 @@ else fi AC_SUBST(sushell) +# selinux-util.c uses struct mallinfo which is not available for all C libraries (musl). +AC_CHECK_FUNCS([mallinfo]) + # ------------------------------------------------------------------------------ AC_CHECK_DECL([unshare], diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c index 756215e8ef..4e0866be5f 100644 --- a/src/shared/selinux-util.c +++ b/src/shared/selinux-util.c @@ -67,7 +67,10 @@ int mac_selinux_init(const char *prefix) { #ifdef HAVE_SELINUX usec_t before_timestamp, after_timestamp; + +#ifdef HAVE_MALLINFO struct mallinfo before_mallinfo, after_mallinfo; +#endif if (!mac_selinux_use()) return 0; @@ -75,7 +78,10 @@ int mac_selinux_init(const char *prefix) { if (label_hnd) return 0; +#ifdef HAVE_MALLINFO before_mallinfo = mallinfo(); +#endif + before_timestamp = now(CLOCK_MONOTONIC); if (prefix) { @@ -92,9 +98,14 @@ int mac_selinux_init(const char *prefix) { r = security_getenforce() == 1 ? -errno : 0; } else { char timespan[FORMAT_TIMESPAN_MAX]; + +#ifdef HAVE_MALLINFO int l; +#endif after_timestamp = now(CLOCK_MONOTONIC); + +#ifdef HAVE_MALLINFO after_mallinfo = mallinfo(); l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0; @@ -102,6 +113,10 @@ int mac_selinux_init(const char *prefix) { log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.", format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0), (l+1023)/1024); +#else + log_debug("Successfully loaded SELinux database in %s", + format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0)); +#endif } #endif |