summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-20 21:34:25 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-20 21:34:25 +0200
commit84b00965b7c2d0fb41c061895a85b383cbc1c89d (patch)
tree64a97abe2d20e6aaff225aedee90c71a14cb0983
parent2cc59dbfe08e92496b242aed3f2b3cf130beb203 (diff)
hostname: properly deal with unset hostname in fedora configuration
-rw-r--r--fixme3
-rw-r--r--src/hostname-setup.c5
2 files changed, 4 insertions, 4 deletions
diff --git a/fixme b/fixme
index 3a17c629ca..40e8bd3db5 100644
--- a/fixme
+++ b/fixme
@@ -38,6 +38,7 @@
* place /etc/inittab with explaining blurb.
* In command lines, support both "$FOO" and $FOO
+
* /etc must always take precedence even if we follow symlinks!
* vielleicht implizit immer auf syslog dependen?
@@ -48,8 +49,6 @@
* set_put(), hashmap_put() return values checken. i.e. == 0 macht kein free()!
-* crash on missing hostname
-
* fix merging in .swap units
* pahole
diff --git a/src/hostname-setup.c b/src/hostname-setup.c
index 24e0f9d9fe..e0257166d8 100644
--- a/src/hostname-setup.c
+++ b/src/hostname-setup.c
@@ -101,10 +101,11 @@ static int read_hostname(char **hn) {
}
*hn = k;
- break;
+ r = 0;
+ goto finish;
}
- r = 0;
+ r = -ENOENT;
finish:
fclose(f);