diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-30 16:12:46 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-01-02 19:45:47 -0500 |
| commit | ab9001a1e3dc6e60d0cdf53363dc5d18dcc382fd (patch) | |
| tree | cc00815e489ca4cf52aa8264491b9b5c3b6cbbd2 /src/bus-proxyd | |
| parent | da13d4d20f8ca12e86863abbae5ed47bca936828 (diff) | |
Move bus path definitions to def.h
Diffstat (limited to 'src/bus-proxyd')
| -rw-r--r-- | src/bus-proxyd/bus-proxyd.c | 14 |
1 files changed, 3 insertions, 11 deletions
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; |