From ab9001a1e3dc6e60d0cdf53363dc5d18dcc382fd Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 30 Dec 2013 16:12:46 -0500 Subject: Move bus path definitions to def.h --- src/bus-proxyd/bus-proxyd.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/bus-proxyd') diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index fa52a387b6..28e8b44ccd 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -40,17 +40,9 @@ #include "bus-util.h" #include "build.h" #include "strv.h" +#include "def.h" -#define UNIX_BUS_PATH "unix:path=/run/dbus/system_bus_socket" -#define KERNEL_BUS_PATH "kernel:path=/dev/kdbus/0-system/bus" - -#ifdef ENABLE_KDBUS -# define DEFAULT_BUS_PATH KERNEL_BUS_PATH ";" UNIX_BUS_PATH -#else -# define DEFAULT_BUS_PATH UNIX_BUS_PATH -#endif - -static const char *arg_address = DEFAULT_BUS_PATH; +static const char *arg_address = DEFAULT_SYSTEM_BUS_PATH; static char *arg_command_line_buffer = NULL; static int help(void) { @@ -60,7 +52,7 @@ static int help(void) { " -h --help Show this help\n" " --version Show package version\n" " --address=ADDRESS Connect to the bus specified by ADDRESS\n" - " (default: " DEFAULT_BUS_PATH ")\n", + " (default: " DEFAULT_SYSTEM_BUS_PATH ")\n", program_invocation_short_name); return 0; -- cgit v1.2.3-54-g00ecf