X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostname%2Fhostnamed.c;h=6a43aeb840c36ab8d2903ce86418b62c8cd1c10f;hp=0437e33a664c18016ab0319552ebe088c15719a5;hb=ac4c8d6da8b5ebc35f02c9c6cb7595be7b134a05;hpb=0b429ab7fca2aa139ffbeeac8bdcfbbd21cc1a60

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 0437e33a6..6a43aeb84 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -553,7 +553,8 @@ static DBusHandlerResult hostname_message_handler(
                                  * safe than sorry */
                                 if (k == PROP_ICON_NAME && !filename_is_safe(name))
                                         return bus_send_error_reply(connection, message, NULL, -EINVAL);
-                                if (k == PROP_PRETTY_HOSTNAME && string_has_cc(name))
+                                if (k == PROP_PRETTY_HOSTNAME &&
+                                    (string_has_cc(name) || chars_intersect(name, "\t")))
                                         return bus_send_error_reply(connection, message, NULL, -EINVAL);
                                 if (k == PROP_CHASSIS && !valid_chassis(name))
                                         return bus_send_error_reply(connection, message, NULL, -EINVAL);