X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostname%2Fhostnamed.c;h=859b5a07845400ce1bd86523f642422415802d53;hp=979dcfdc7f42442a2f9c485a3e1123eedd8e5794;hb=737732a41e5702540f51c760bebd3b8152c04727;hpb=ebe5d6d0d05d1f17c96315c42f8d9bcf5e13ba9d

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 979dcfdc7..859b5a078 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -159,19 +159,6 @@ static bool valid_chassis(const char *chassis) {
                         chassis);
 }
 
-static bool pretty_string_is_safe(const char *p) {
-	const char *t;
-
-	assert(p);
-
-	for (t = p; *t; t++) {
-		if (*t >= '\0' && *t < ' ')
-			return false;
-	}
-
-	return true;
-}
-
 static const char* fallback_chassis(void) {
         int r;
         char *type;
@@ -566,7 +553,7 @@ 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 && !pretty_string_is_safe(name))
+                                if (k == PROP_PRETTY_HOSTNAME && string_has_cc(name))
                                         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);
@@ -605,7 +592,7 @@ static DBusHandlerResult hostname_message_handler(
         if (!reply)
                 goto oom;
 
-        if (!dbus_connection_send(connection, reply, NULL))
+        if (!bus_maybe_send_reply(connection, message, reply))
                 goto oom;
 
         dbus_message_unref(reply);