diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 21 | ||||
| -rw-r--r-- | man/systemd.unit.xml | 2 | ||||
| -rw-r--r-- | src/basic/socket-util.c | 6 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote.c | 1 |
5 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index ce2e19b3f9..4bf8362640 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6024,7 +6024,7 @@ git-tag: .PHONY: git-tar git-tar: - git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | xz > systemd-$(VERSION).tar.xz + git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | gzip > systemd-$(VERSION).tar.gz www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd @@ -53,16 +53,17 @@ CHANGES WITH 223: mapped as 'vg-foo-TGID'. Contributions from: Beniamino Galvani, cee1, Christian Hesse, Daniel - Buch, Daniel Mack, daurnimator, David Herrmann, Dimitri John Ledkov, Jan - Alexander Steffens (heftig), Johan Ouwerkerk, Jose Carlos Venegas Munoz, - Kay Sievers, Lennart Poettering, Lidong Zhong, Martin Pitt, Michael - Biebl, Michael Olbrich, Michal Schmidt, Mike Gilbert, Namhyung Kim, Nick - Owens, Peter Hutterer, Richard Maw, Steven Allen, Sungbae Yoo, Susant - Sahani, Thomas Blume, Thomas Hindoe Paaboel Andersen, Tom Gundersen, - Umut Tezduyar Lindskog, Vito Caputo, Vivenzio Pagliari, Zbigniew - Jędrzejewski-Szmek - - -- Berlin, 2015-XX-XX + Buch, Daniel Mack, daurnimator, David Herrmann, Dimitri John Ledkov, + HATAYAMA Daisuke, Ivan Shapovalov, Jan Alexander Steffens (heftig), + Johan Ouwerkerk, Jose Carlos Venegas Munoz, Karel Zak, Kay Sievers, + Lennart Poettering, Lidong Zhong, Martin Pitt, Michael Biebl, Michael + Olbrich, Michal Schmidt, Michal Sekletar, Mike Gilbert, Namhyung Kim, + Nick Owens, Peter Hutterer, Richard Maw, Steven Allen, Sungbae Yoo, + Susant Sahani, Thomas Blume, Thomas Hindoe Paaboel Andersen, Tom + Gundersen, Torstein Husebø, Umut Tezduyar Lindskog, Vito Caputo, + Vivenzio Pagliari, Zbigniew Jędrzejewski-Szmek + + -- Berlin, 2015-07-29 CHANGES WITH 222: diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 0aa1eeac77..407f6d32eb 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -737,7 +737,7 @@ to 0 (job timeouts disabled), except for device units. NB: this timeout is independent from any unit-specific timeout (for example, the timeout set with - <varname>StartTimeoutSec=</varname> in service units) as the + <varname>TimeoutStartSec=</varname> in service units) as the job timeout has no effect on the unit itself, only on the job that might be pending for it. Or in other words: unit-specific timeouts are useful to abort unit state changes, and revert diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index e8bb10dc9b..62f99b322e 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -662,13 +662,13 @@ int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret) r = sockaddr_pretty(&sa->sa, salen, true, true, &ret); if (r < 0) - return log_error_errno(r, "sockadd_pretty() failed: %m"); + return r; log_debug_errno(saved_errno, "getnameinfo(%s) failed: %m", ret); } else { ret = strdup(host); if (!ret) - return log_oom(); + return -ENOMEM; } *_ret = ret; @@ -683,7 +683,7 @@ int getnameinfo_pretty(int fd, char **ret) { assert(ret); if (getsockname(fd, &sa.sa, &salen) < 0) - return log_error_errno(errno, "getsockname(%d) failed: %m", fd); + return -errno; return socknameinfo_pretty(&sa, salen, ret); } diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 1baedf6367..e3bd76051b 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -1114,6 +1114,7 @@ static int accept_connection(const char* type, int fd, r = socknameinfo_pretty(&addr->sockaddr, addr->size, &b); if (r < 0) { + log_error_errno(r, "Resolving hostname failed: %m"); close(fd2); return r; } |