summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--src/libelogind/sd-daemon/sd-daemon.c2
-rw-r--r--src/shared/clean-ipc.c8
3 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 66a5e3e9a..351dda27e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,8 +287,8 @@ AC_CHECK_HEADERS([linux/btrfs.h], [], [])
AC_CHECK_HEADERS([linux/memfd.h], [], [])
# unconditionally pull-in librt with old glibc versions
-AC_SEARCH_LIBS([clock_gettime], [rt], [], [])
-AC_SEARCH_LIBS([mq_unlink], [rt], [], [])
+dnl AC_SEARCH_LIBS([clock_gettime], [rt], [], [])
+dnl AC_SEARCH_LIBS([mq_unlink], [rt], [], [])
AC_ARG_WITH([libcap],
AS_HELP_STRING([--with-libcap=DIR], [Prefix for libcap]),
diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index 9a696cd22..d4e0da61d 100644
--- a/src/libelogind/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <stddef.h>
#include <limits.h>
-#include <mqueue.h>
+//#include <mqueue.h>
#include "util.h"
#include "path-util.h"
diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 48b10865d..95d6c4219 100644
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
-#include <mqueue.h>
+//#include <mqueue.h>
#include "util.h"
#include "formats-util.h"
@@ -277,6 +277,8 @@ static int clean_posix_shm(uid_t uid) {
return clean_posix_shm_internal(dir, uid);
}
+/// UNNEEDED by elogind
+#if 0
static int clean_posix_mq(uid_t uid) {
_cleanup_closedir_ DIR *dir = NULL;
struct dirent *de;
@@ -328,6 +330,7 @@ fail:
log_warning_errno(errno, "Failed to read /dev/mqueue: %m");
return -errno;
}
+#endif // 0
int clean_ipc(uid_t uid) {
int ret = 0, r;
@@ -352,9 +355,12 @@ int clean_ipc(uid_t uid) {
if (r < 0)
ret = r;
+/// elogind does not use mq_open anywhere
+#if 0
r = clean_posix_mq(uid);
if (r < 0)
ret = r;
+#endif // 0
return ret;
}