chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: introduce the new /machine/ tree in the cgroup tree and move containers there
[elogind.git]
/
src
/
libsystemd-bus
/
sd-bus.c
diff --git
a/src/libsystemd-bus/sd-bus.c
b/src/libsystemd-bus/sd-bus.c
index f2dd81235facba6e4a2f2fe2fa0c00fd216558fc..c7511c32d2ee648d2d129222683cd89ca28be11a 100644
(file)
--- a/
src/libsystemd-bus/sd-bus.c
+++ b/
src/libsystemd-bus/sd-bus.c
@@
-31,6
+31,7
@@
#include "macro.h"
#include "strv.h"
#include "set.h"
#include "macro.h"
#include "strv.h"
#include "set.h"
+#include "missing.h"
#include "sd-bus.h"
#include "bus-internal.h"
#include "sd-bus.h"
#include "bus-internal.h"
@@
-841,7
+842,7
@@
int sd_bus_open_system(sd_bus **ret) {
if (r < 0)
return r;
if (r < 0)
return r;
- e = getenv("DBUS_SYSTEM_BUS_ADDRESS");
+ e =
secure_
getenv("DBUS_SYSTEM_BUS_ADDRESS");
if (e) {
r = sd_bus_set_address(b, e);
if (r < 0)
if (e) {
r = sd_bus_set_address(b, e);
if (r < 0)
@@
-879,13
+880,13
@@
int sd_bus_open_user(sd_bus **ret) {
if (r < 0)
return r;
if (r < 0)
return r;
- e = getenv("DBUS_SESSION_BUS_ADDRESS");
+ e =
secure_
getenv("DBUS_SESSION_BUS_ADDRESS");
if (e) {
r = sd_bus_set_address(b, e);
if (r < 0)
goto fail;
} else {
if (e) {
r = sd_bus_set_address(b, e);
if (r < 0)
goto fail;
} else {
- e = getenv("XDG_RUNTIME_DIR");
+ e =
secure_
getenv("XDG_RUNTIME_DIR");
if (!e) {
r = -ENOENT;
goto fail;
if (!e) {
r = -ENOENT;
goto fail;