diff options
| author | Thomas Blume <Thomas.Blume@suse.com> | 2016-02-29 10:19:01 +0100 |
|---|---|---|
| committer | Thomas Blume <Thomas.Blume@suse.com> | 2016-02-29 10:19:01 +0100 |
| commit | 46e1a2278116e2f5067c35127ccbd8589335f734 (patch) | |
| tree | f62e1626a38c0ebfc64982e46b1bb8a2632664b7 /src/basic/hostname-util.c | |
| parent | Merge pull request #2746 from daurnimator/patch-1 (diff) | |
| download | systemd-46e1a2278116e2f5067c35127ccbd8589335f734.tar.xz systemd-46e1a2278116e2f5067c35127ccbd8589335f734.zip | |
shorten hostname before checking for trailing dot
Shortening can lead to a hostname that has a trailing dot.
Therefore it should be done before checking from trailing dots.
Diffstat (limited to 'src/basic/hostname-util.c')
| -rw-r--r-- | src/basic/hostname-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c index 3cd2f2c872..5a7ee87a20 100644 --- a/src/basic/hostname-util.c +++ b/src/basic/hostname-util.c @@ -150,6 +150,8 @@ char* hostname_cleanup(char *s) { assert(s); + strshorten(s, HOST_NAME_MAX); + for (p = s, d = s, dot = true; *p; p++) { if (*p == '.') { if (dot) @@ -169,8 +171,6 @@ char* hostname_cleanup(char *s) { else *d = 0; - strshorten(s, HOST_NAME_MAX); - return s; } |