From: Kay Sievers <kay@vrfy.org>
Date: Wed, 6 Nov 2013 12:38:28 +0000 (+0100)
Subject: Revert "hostnamed: prevent it from crashing if the chassis is unknown"
X-Git-Tag: v209~1622
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6c8ea34fd945103e2f998403fea68bb0006e8057;ds=sidebyside

Revert "hostnamed: prevent it from crashing if the chassis is unknown"

This reverts commit 95b015de3849d8d8d03d9441ae1682a04c38833b.

"bus: handle serialization of NULL strings" (cd6f997f71c3aba16aa08226d423d14cbc787f82)
should fix this issue.
---

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index ece5d1d41..0854bc412 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -360,9 +360,6 @@ static int property_get_chassis(
         else
                 name = c->data[PROP_CHASSIS];
 
-        if(!name)
-                name = "";
-
         r = sd_bus_message_append(reply, "s", name);
         if (r < 0)
                 return r;