summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-09-14 01:31:41 +0200
committerLennart Poettering <lennart@poettering.net>2010-09-14 01:31:41 +0200
commit83a95334c9e1841595f5eef20938dbd0e1ad7f76 (patch)
treeeec4dd5f0813162f889edd7c87f26b4b188c3ae5
parent3c4e3e1a9b5d4ffc13f61cc6510d67deb702fb6b (diff)
socket: fix output of TCP congestion options
-rw-r--r--src/socket.c2
-rw-r--r--src/unit.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/socket.c b/src/socket.c
index 34068b9192..da85ca7e8b 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -385,7 +385,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
prefix, s->directory_mode,
prefix, yes_no(s->keep_alive),
prefix, yes_no(s->free_bind),
- prefix, s->tcp_congestion);
+ prefix, strna(s->tcp_congestion));
if (s->control_pid > 0)
fprintf(f,
diff --git a/src/unit.c b/src/unit.c
index d28a0a8cf7..ca15c257e8 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -440,6 +440,7 @@ static void merge_dependencies(Unit *u, Unit *other, UnitDependency d) {
assert(other);
assert(d < _UNIT_DEPENDENCY_MAX);
+ /* Fix backwards pointers */
SET_FOREACH(back, other->meta.dependencies[d], i) {
UnitDependency k;