summaryrefslogtreecommitdiff
path: root/src/basic/hostname-util.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-08-05 21:01:06 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-08-05 21:02:41 -0400
commit73974f6768ef5314a572eb93f5cfc7f0f29c9549 (patch)
treee95c0a5626290c79e7c31ac143e6c75a0f167d9d /src/basic/hostname-util.c
parent4306d66f594722a2fe44b034d3c68bfb864c6a76 (diff)
parent90365b043ab6a0d8100e0c37dea4ca9d6fdb4695 (diff)
Merge branch 'hostnamectl-dot-v2'
Manual merge of https://github.com/systemd/systemd/pull/751.
Diffstat (limited to 'src/basic/hostname-util.c')
-rw-r--r--src/basic/hostname-util.c37
1 files changed, 23 insertions, 14 deletions
diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index e336f269fa..d901a5e82b 100644
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -61,14 +61,22 @@ static bool hostname_valid_char(char c) {
c == '.';
}
-bool hostname_is_valid(const char *s) {
+/**
+ * Check if s looks like a valid host name or fqdn. This does not do
+ * full DNS validation, but only checks if the name is composed of
+ * allowed characters and the length is not above the maximum allowed
+ * by Linux (c.f. dns_name_is_valid()). Trailing dot is allowed if
+ * relax is true and at least two components are present in the name.
+ */
+bool hostname_is_valid(const char *s, bool relax) {
const char *p;
bool dot;
+ unsigned dots = 0;
if (isempty(s))
return false;
- /* Doesn't accept empty hostnames, hostnames with trailing or
+ /* Doesn't accept empty hostnames, hostnames with
* leading dots, and hostnames with multiple dots in a
* sequence. Also ensures that the length stays below
* HOST_NAME_MAX. */
@@ -79,6 +87,7 @@ bool hostname_is_valid(const char *s) {
return false;
dot = true;
+ dots ++;
} else {
if (!hostname_valid_char(*p))
return false;
@@ -87,7 +96,7 @@ bool hostname_is_valid(const char *s) {
}
}
- if (dot)
+ if (dot && (dots < 2 || !relax))
return false;
if (p-s > HOST_NAME_MAX)
@@ -96,7 +105,7 @@ bool hostname_is_valid(const char *s) {
return true;
}
-char* hostname_cleanup(char *s, bool lowercase) {
+char* hostname_cleanup(char *s) {
char *p, *d;
bool dot;
@@ -110,7 +119,7 @@ char* hostname_cleanup(char *s, bool lowercase) {
*(d++) = '.';
dot = true;
} else if (hostname_valid_char(*p)) {
- *(d++) = lowercase ? tolower(*p) : *p;
+ *(d++) = *p;
dot = false;
}
@@ -132,14 +141,14 @@ bool is_localhost(const char *hostname) {
/* This tries to identify local host and domain names
* described in RFC6761 plus the redhatism of .localdomain */
- return streq(hostname, "localhost") ||
- streq(hostname, "localhost.") ||
- streq(hostname, "localdomain.") ||
- streq(hostname, "localdomain") ||
- endswith(hostname, ".localhost") ||
- endswith(hostname, ".localhost.") ||
- endswith(hostname, ".localdomain") ||
- endswith(hostname, ".localdomain.");
+ return strcaseeq(hostname, "localhost") ||
+ strcaseeq(hostname, "localhost.") ||
+ strcaseeq(hostname, "localdomain.") ||
+ strcaseeq(hostname, "localdomain") ||
+ endswith_no_case(hostname, ".localhost") ||
+ endswith_no_case(hostname, ".localhost.") ||
+ endswith_no_case(hostname, ".localdomain") ||
+ endswith_no_case(hostname, ".localdomain.");
}
int sethostname_idempotent(const char *s) {
@@ -176,7 +185,7 @@ int read_hostname_config(const char *path, char **hostname) {
truncate_nl(l);
if (l[0] != '\0' && l[0] != '#') {
/* found line with value */
- name = hostname_cleanup(l, false);
+ name = hostname_cleanup(l);
name = strdup(name);
if (!name)
return -ENOMEM;