Commit cec4ead9 authored by Lennart Poettering's avatar Lennart Poettering

util: make sure result of hostname_cleanup() passes hostname_is_valid()

parent ed85d9a5
......@@ -3837,19 +3837,24 @@ bool hostname_is_valid(const char *s) {
char* hostname_cleanup(char *s) {
char *p, *d;
bool dot;
for (p = s, d = s, dot = true; *p; p++) {
if (*p == '.') {
if (dot || p[1] == 0)
continue;
for (p = s, d = s; *p; p++)
if ((*p >= 'a' && *p <= 'z') ||
(*p >= 'A' && *p <= 'Z') ||
(*p >= '0' && *p <= '9') ||
*p == '-' ||
*p == '_' ||
*p == '.')
dot = true;
} else
dot = false;
if (hostname_valid_char(*p))
*(d++) = *p;
}
*d = 0;
strshorten(s, HOST_NAME_MAX);
return s;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment