summaryrefslogtreecommitdiff
path: root/src/network
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/network
parent4306d66f594722a2fe44b034d3c68bfb864c6a76 (diff)
parent90365b043ab6a0d8100e0c37dea4ca9d6fdb4695 (diff)
Merge branch 'hostnamectl-dot-v2'
Manual merge of https://github.com/systemd/systemd/pull/751.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkd-network.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index e3593fc0ea..3f7e77da3e 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -839,14 +839,14 @@ int config_parse_hostname(const char *unit,
if (r < 0)
return r;
- if (!hostname_is_valid(hn)) {
+ if (!hostname_is_valid(hn, true)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, "hostname is not valid, ignoring assignment: %s", rvalue);
free(hn);
return 0;
}
- *hostname = hn;
+ *hostname = hostname_cleanup(hn);
return 0;
}