chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
aa3c5cf
)
hostnamed: pretty_string_is_safe() already exists in string_has_cc(), so use that
author
Lennart Poettering
<lennart@poettering.net>
Fri, 22 Mar 2013 17:01:26 +0000
(18:01 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 22 Mar 2013 17:01:26 +0000
(18:01 +0100)
src/hostname/hostnamed.c
patch
|
blob
|
history
diff --git
a/src/hostname/hostnamed.c
b/src/hostname/hostnamed.c
index 25e154b224870f1e54feb531a20e869fe7f9c3d8..859b5a07845400ce1bd86523f642422415802d53 100644
(file)
--- a/
src/hostname/hostnamed.c
+++ b/
src/hostname/hostnamed.c
@@
-159,19
+159,6
@@
static bool valid_chassis(const char *chassis) {
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;
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);
* 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);
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);