From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 4 Feb 2015 12:50:03 +0000 (+0100)
Subject: Provide appropriate DBUS_USER and DBUS_TEST_USER under CMake
X-Git-Tag: dbus-1.9.10~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffa69bcb55aa49d62a21c6ee64f45c779ff11750;p=thirdparty%2Fdbus.git

Provide appropriate DBUS_USER and DBUS_TEST_USER under CMake

[separated out from a larger commit -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88964
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 32250f59d..b997f8b14 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -409,8 +409,6 @@ else (WIN32)
 	set (DBUS_CONSOLE_AUTH_DIR "/var/run/console/")
 endif (WIN32)
 
-set (DBUS_USER )
-
 # This won't work on Windows. It's not meant to - the system bus is
 # meaningless on Windows anyway.
 #
@@ -429,6 +427,7 @@ if (WIN32)
   set (DBUS_SESSION_CONFIG_FILE "etc/dbus-1/session.conf")
   # bus-test expects a non empty string
   set (DBUS_USER "Administrator")
+  set (DBUS_TEST_USER "guest")
 else (WIN32)
   set (DBUS_SESSION_BUS_LISTEN_ADDRESS "unix:tmpdir=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default listening address")
   set (DBUS_SESSION_BUS_CONNECT_ADDRESS "autolaunch:" CACHE STRING "session bus fallback address for clients")
@@ -436,7 +435,8 @@ else (WIN32)
   set (configdir ${sysconfdir}/dbus-1 )
   set (DBUS_SYSTEM_CONFIG_FILE  ${configdir}/system.conf)
   set (DBUS_SESSION_CONFIG_FILE ${configdir}/session.conf)
-  set (DBUS_USER "root")
+  set (DBUS_USER "messagebus")
+  set (DBUS_TEST_USER "nobody")
 endif (WIN32)
 
 set (DBUS_DAEMON_NAME "dbus-daemon" CACHE STRING "The name of the dbus daemon executable")
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index e8b0bc589..f71805286 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -204,6 +204,9 @@
 
 #cmakedefine FD_SETSIZE @FD_SETSIZE@
 
+#cmakedefine DBUS_USER "@DBUS_USER@"
+#cmakedefine DBUS_TEST_USER "@DBUS_TEST_USER@"
+
 // system type defines
 #if defined(_WIN32) || defined(_WIN64) || defined (_WIN32_WCE)
 # define DBUS_WIN