projects
/
platform
/
upstream
/
dbus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c9033c7
)
sd-daemon: update from upstream
author
Lennart Poettering
<lennart@poettering.net>
Sat, 7 Aug 2010 19:04:59 +0000
(21:04 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 11 Aug 2010 22:08:09 +0000
(
00:08
+0200)
This updates the sd-daemon.[ch] copy from upstream, which makes sure
thet the code compiles even if SOCK_CLOEXEC is not supported.
dbus/sd-daemon.c
patch
|
blob
|
history
diff --git
a/dbus/sd-daemon.c
b/dbus/sd-daemon.c
index
3bb258d
..
1197372
100644
(file)
--- a/
dbus/sd-daemon.c
+++ b/
dbus/sd-daemon.c
@@
-325,7
+325,7
@@
int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
}
int sd_notify(int unset_environment, const char *state) {
-#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
|| !defined(SOCK_CLOEXEC)
return 0;
#else
int fd = -1, r;