chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3acc1da
)
sd-bus: rename default bus address constants, they aren't "paths" but "addresses"
author
Lennart Poettering
<lennart@poettering.net>
Fri, 28 Nov 2014 15:05:43 +0000
(16:05 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 28 Nov 2014 15:17:33 +0000
(16:17 +0100)
src/bus-proxyd/bus-proxyd.c
patch
|
blob
|
history
src/dbus1-generator/dbus1-generator.c
patch
|
blob
|
history
src/libsystemd/sd-bus/bus-util.c
patch
|
blob
|
history
src/libsystemd/sd-bus/sd-bus.c
patch
|
blob
|
history
src/login/pam_systemd.c
patch
|
blob
|
history
src/shared/def.h
patch
|
blob
|
history
diff --git
a/src/bus-proxyd/bus-proxyd.c
b/src/bus-proxyd/bus-proxyd.c
index 45061ad80241e3a09e54048007a2c3bcf20aee34..a66197abe08e5363142392cbbbd2c9051a5fa7b9 100644
(file)
--- a/
src/bus-proxyd/bus-proxyd.c
+++ b/
src/bus-proxyd/bus-proxyd.c
@@
-61,7
+61,7
@@
static int help(void) {
" --configuration=PATH Configuration file or directory\n"
" --machine=MACHINE Connect to specified machine\n"
" --address=ADDRESS Connect to the bus specified by ADDRESS\n"
" --configuration=PATH Configuration file or directory\n"
" --machine=MACHINE Connect to specified machine\n"
" --address=ADDRESS Connect to the bus specified by ADDRESS\n"
- " (default: " DEFAULT_SYSTEM_BUS_
PATH
")\n",
+ " (default: " DEFAULT_SYSTEM_BUS_
ADDRESS
")\n",
program_invocation_short_name);
return 0;
program_invocation_short_name);
return 0;
@@
-166,7
+166,7
@@
static int parse_argv(int argc, char *argv[]) {
}
if (!arg_address) {
}
if (!arg_address) {
- arg_address = strdup(DEFAULT_SYSTEM_BUS_
PATH
);
+ arg_address = strdup(DEFAULT_SYSTEM_BUS_
ADDRESS
);
if (!arg_address)
return log_oom();
}
if (!arg_address)
return log_oom();
}
diff --git
a/src/dbus1-generator/dbus1-generator.c
b/src/dbus1-generator/dbus1-generator.c
index a459c8450f4e6b13e2b4780fe17e366ff01b91a3..5d3b1a856afa8281b1066d427b7348c1f9e46ab6 100644
(file)
--- a/
src/dbus1-generator/dbus1-generator.c
+++ b/
src/dbus1-generator/dbus1-generator.c
@@
-86,7
+86,7
@@
static int create_dbus_files(
fprintf(f, "Environment=DBUS_STARTER_BUS_TYPE=%s\n", type);
if (streq(type, "system"))
fprintf(f, "Environment=DBUS_STARTER_BUS_TYPE=%s\n", type);
if (streq(type, "system"))
- fprintf(f, "Environment=DBUS_STARTER_ADDRESS=" DEFAULT_SYSTEM_BUS_
PATH
"\n");
+ fprintf(f, "Environment=DBUS_STARTER_ADDRESS=" DEFAULT_SYSTEM_BUS_
ADDRESS
"\n");
else if (streq(type, "session")) {
char *run;
else if (streq(type, "session")) {
char *run;
@@
-96,7
+96,7
@@
static int create_dbus_files(
return -EINVAL;
}
return -EINVAL;
}
- fprintf(f, "Environment=DBUS_STARTER_ADDRESS="KERNEL_USER_BUS_
FMT ";" UNIX_USER_BU
S_FMT "\n",
+ fprintf(f, "Environment=DBUS_STARTER_ADDRESS="KERNEL_USER_BUS_
ADDRESS_FMT ";" UNIX_USER_BUS_ADDRES
S_FMT "\n",
getuid(), run);
}
}
getuid(), run);
}
}
diff --git
a/src/libsystemd/sd-bus/bus-util.c
b/src/libsystemd/sd-bus/bus-util.c
index 22a3766a02ced6159f2dcf97ec24df55b920c20d..9fcbfccc02a449df0afee75448d8e33645a926ae 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-util.c
+++ b/
src/libsystemd/sd-bus/bus-util.c
@@
-521,7
+521,7
@@
int bus_open_system_systemd(sd_bus **_bus) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_set_address(bus, KERNEL_SYSTEM_BUS_
PATH
);
+ r = sd_bus_set_address(bus, KERNEL_SYSTEM_BUS_
ADDRESS
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-574,7
+574,7
@@
int bus_open_user_systemd(sd_bus **_bus) {
if (r < 0)
return r;
if (r < 0)
return r;
- if (asprintf(&bus->address, KERNEL_USER_BUS_FMT, getuid()) < 0)
+ if (asprintf(&bus->address, KERNEL_USER_BUS_
ADDRESS_
FMT, getuid()) < 0)
return -ENOMEM;
bus->bus_client = true;
return -ENOMEM;
bus->bus_client = true;
diff --git
a/src/libsystemd/sd-bus/sd-bus.c
b/src/libsystemd/sd-bus/sd-bus.c
index 9ce6bfab8faf9adb4e6a90b9607c0cce2a5d69bf..70dabccf5db7878479250dc8190b5043146ddad2 100644
(file)
--- a/
src/libsystemd/sd-bus/sd-bus.c
+++ b/
src/libsystemd/sd-bus/sd-bus.c
@@
-1119,7
+1119,7
@@
int bus_set_address_system(sd_bus *b) {
if (e)
return sd_bus_set_address(b, e);
if (e)
return sd_bus_set_address(b, e);
- return sd_bus_set_address(b, DEFAULT_SYSTEM_BUS_
PATH
);
+ return sd_bus_set_address(b, DEFAULT_SYSTEM_BUS_
ADDRESS
);
}
_public_ int sd_bus_open_system(sd_bus **ret) {
}
_public_ int sd_bus_open_system(sd_bus **ret) {
@@
-1175,13
+1175,13
@@
int bus_set_address_user(sd_bus *b) {
return -ENOMEM;
#ifdef ENABLE_KDBUS
return -ENOMEM;
#ifdef ENABLE_KDBUS
- (void) asprintf(&b->address, KERNEL_USER_BUS_
FMT ";" UNIX_USER_BU
S_FMT, getuid(), ee);
+ (void) asprintf(&b->address, KERNEL_USER_BUS_
ADDRESS_FMT ";" UNIX_USER_BUS_ADDRES
S_FMT, getuid(), ee);
#else
#else
- (void) asprintf(&b->address, UNIX_USER_BUS_FMT, ee);
+ (void) asprintf(&b->address, UNIX_USER_BUS_
ADDRESS_
FMT, ee);
#endif
} else {
#ifdef ENABLE_KDBUS
#endif
} else {
#ifdef ENABLE_KDBUS
- (void) asprintf(&b->address, KERNEL_USER_BUS_FMT, getuid());
+ (void) asprintf(&b->address, KERNEL_USER_BUS_
ADDRESS_
FMT, getuid());
#else
return -ECONNREFUSED;
#endif
#else
return -ECONNREFUSED;
#endif
diff --git
a/src/login/pam_systemd.c
b/src/login/pam_systemd.c
index 4974c513382722ece7149b23cdb366aeb053dcfd..111e2b7c4c83f2fc1ddb4e129c3a10d1f69af1da 100644
(file)
--- a/
src/login/pam_systemd.c
+++ b/
src/login/pam_systemd.c
@@
-183,8
+183,7
@@
static int export_legacy_dbus_address(
if (access("/sys/fs/kdbus", F_OK) < 0)
return PAM_SUCCESS;
if (access("/sys/fs/kdbus", F_OK) < 0)
return PAM_SUCCESS;
- if (asprintf(&s, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT,
- uid, runtime) < 0) {
+ if (asprintf(&s, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, uid, runtime) < 0) {
pam_syslog(handle, LOG_ERR, "Failed to set bus variable.");
return PAM_BUF_ERR;
}
pam_syslog(handle, LOG_ERR, "Failed to set bus variable.");
return PAM_BUF_ERR;
}
diff --git
a/src/shared/def.h
b/src/shared/def.h
index 98e3e10fb6fd472d9657d66c4f428fc181d14264..96c45a6b723dededf0c59e0b08778d124fd04779 100644
(file)
--- a/
src/shared/def.h
+++ b/
src/shared/def.h
@@
-61,17
+61,17
@@
"/usr/lib/kbd/keymaps/\0"
#endif
"/usr/lib/kbd/keymaps/\0"
#endif
-#define UNIX_SYSTEM_BUS_
PATH
"unix:path=/var/run/dbus/system_bus_socket"
-#define KERNEL_SYSTEM_BUS_
PATH
"kernel:path=/sys/fs/kdbus/0-system/bus"
+#define UNIX_SYSTEM_BUS_
ADDRESS
"unix:path=/var/run/dbus/system_bus_socket"
+#define KERNEL_SYSTEM_BUS_
ADDRESS
"kernel:path=/sys/fs/kdbus/0-system/bus"
#ifdef ENABLE_KDBUS
#ifdef ENABLE_KDBUS
-# define DEFAULT_SYSTEM_BUS_
PATH KERNEL_SYSTEM_BUS_PATH ";" UNIX_SYSTEM_BUS_PATH
+# define DEFAULT_SYSTEM_BUS_
ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS
#else
#else
-# define DEFAULT_SYSTEM_BUS_
PATH UNIX_SYSTEM_BUS_PATH
+# define DEFAULT_SYSTEM_BUS_
ADDRESS UNIX_SYSTEM_BUS_ADDRESS
#endif
#endif
-#define UNIX_USER_BUS_FMT "unix:path=%s/bus"
-#define KERNEL_USER_BUS_FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus"
+#define UNIX_USER_BUS_
ADDRESS_
FMT "unix:path=%s/bus"
+#define KERNEL_USER_BUS_
ADDRESS_
FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus"
#define PLYMOUTH_SOCKET { \
.un.sun_family = AF_UNIX, \
#define PLYMOUTH_SOCKET { \
.un.sun_family = AF_UNIX, \