From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 14 Mar 2019 11:43:53 +0000 (+0100)
Subject: util: move dbus specific definition into bus-internal.h
X-Git-Tag: v242-rc1~130^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47094ce0671c5d112dc716953c48339e0041324a;p=thirdparty%2Fsystemd.git

util: move dbus specific definition into bus-internal.h

It shouldn't be defined globally, since it's pretty much an
implementation detail of DBus.
---

diff --git a/src/basic/def.h b/src/basic/def.h
index 196778fcf94..c354c706a74 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -21,11 +21,6 @@
 #define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
 #define SIGNALS_IGNORE SIGPIPE
 
-/* Note that we use the new /run prefix here (instead of /var/run) since we require them to be aliases and that way we
- * become independent of /var being mounted */
-#define DEFAULT_SYSTEM_BUS_ADDRESS "unix:path=/run/dbus/system_bus_socket"
-#define DEFAULT_USER_BUS_ADDRESS_FMT "unix:path=%s/bus"
-
 #define NOTIFY_FD_MAX 768
 #define NOTIFY_BUFFER_MAX PIPE_BUF
 
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 63f14047583..c73860fb65e 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -16,6 +16,11 @@
 #include "socket-util.h"
 #include "util.h"
 
+/* Note that we use the new /run prefix here (instead of /var/run) since we require them to be aliases and
+ * that way we become independent of /var being mounted */
+#define DEFAULT_SYSTEM_BUS_ADDRESS "unix:path=/run/dbus/system_bus_socket"
+#define DEFAULT_USER_BUS_ADDRESS_FMT "unix:path=%s/bus"
+
 struct reply_callback {
         sd_bus_message_handler_t callback;
         usec_t timeout_usec; /* this is a relative timeout until we reach the BUS_HELLO state, and an absolute one right after */
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index 8c90141ad9b..864b358eb98 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -15,9 +15,9 @@
 #include "audit-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
+#include "bus-internal.h"
 #include "bus-util.h"
 #include "cgroup-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"