From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 20 Jul 2010 19:34:25 +0000 (+0200)
Subject: hostname: properly deal with unset hostname in fedora configuration
X-Git-Tag: v4~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=84b00965b7c2d0fb41c061895a85b383cbc1c89d;ds=sidebyside

hostname: properly deal with unset hostname in fedora configuration
---

diff --git a/fixme b/fixme
index 3a17c629c..40e8bd3db 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 24e0f9d9f..e0257166d 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);