diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-06-22 17:16:03 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-06-22 17:16:03 +0200 |
| commit | 86f210e9c914ba12477d4b2e7fa6f5cfa196a324 (patch) | |
| tree | dce357d070f98e916be8861d669f9127b0719629 /src/machine/machine-dbus.c | |
| parent | e3bff60a6ef3419af32552b54bf19331e59c01c9 (diff) | |
| download | systemd-86f210e9c914ba12477d4b2e7fa6f5cfa196a324.tar.gz | |
Imported Upstream version 221
Diffstat (limited to 'src/machine/machine-dbus.c')
| -rw-r--r-- | src/machine/machine-dbus.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 0892479a9a..7813a0bcc7 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -24,8 +24,8 @@ #include <sys/mount.h> /* When we include libgen.h because we need dirname() we immediately - * undefine basename() since libgen.h defines it as a macro to the XDG - * version which is really broken. */ + * undefine basename() since libgen.h defines it as a macro to the POSIX + * version which is really broken. We prefer GNU basename(). */ #include <libgen.h> #undef basename @@ -509,11 +509,7 @@ int bus_machine_method_open_login(sd_bus_message *message, void *userdata, sd_bu if (r < 0) return r; -#ifdef ENABLE_KDBUS # define ADDRESS_FMT "x-machine-kernel:pid=%1$" PID_PRI ";x-machine-unix:pid=%1$" PID_PRI -#else -# define ADDRESS_FMT "x-machine-unix:pid=%1$" PID_PRI -#endif if (asprintf(&address, ADDRESS_FMT, m->leader) < 0) return log_oom(); |