shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-31 01:47:15 +03:00
Code

hostnamed: pretty_string_is_safe() already exists in string_has_cc(), so use that

Browse Source
This commit is contained in:
Lennart Poettering 2013-03-22 18:01:26 +01:00
parent aa3c5cf8ee
commit 737732a41e
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hostname/hostnamed.c
View File

@ -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);