Merge branch 'hostnamectl-dot-v2'

Manual merge of https://github.com/systemd/systemd/pull/751.

diff --cc .gitignore
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc src/basic/util.c
Simple merge

diff --cc src/basic/util.h
Simple merge

diff --cc src/firstboot/firstboot.c
index c526a85b056f3a338584be60dbd5c484098b33d0,01a3d38746a0b6318d1f66594d93a6f6c5735b78..e2a1c00a75dd210af69be7924daf5b56a7ac50ac
--- 1/src/firstboot/firstboot.c
--- 2/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@@ -777,8 -786,8 +778,9 @@@ static int parse_argv(int argc, char *a
                                  return -EINVAL;
                          }
  
 -                        if (free_and_strdup(&arg_hostname, optarg) < 0)
+                         hostname_cleanup(optarg);
 +                        r = free_and_strdup(&arg_hostname, optarg);
 +                        if (r < 0)
                                  return log_oom();
  
                          break;

diff --cc src/import/pull-dkr.c
Simple merge

diff --cc src/journal/journalctl.c
Simple merge

diff --cc src/libsystemd-network/sd-dhcp-lease.c
Simple merge

diff --cc src/locale/localed.c
Simple merge

diff --cc src/network/networkd-network.c
Simple merge

diff --cc src/nspawn/nspawn.c
Simple merge

diff --cc src/test/test-hostname-util.c
index 0000000000000000000000000000000000000000,08be3f7bf2fdc911bce7ed3b8dc1de5e7f982c79..6f5ef2615e30ad6a78b3b01616fde2e469bcd644
mode 000000,100644..100644
--- /dev/null
--- 2/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@@ -1,0 -1,163 +1,159 @@@
 -        free(hostname);
 -        hostname = NULL;
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ 
+ /***
+   This file is part of systemd.
+ 
+   Copyright 2010 Lennart Poettering
+   Copyright 2013 Thomas H.P. Andersen
+   Copyright 2015 Zbigniew Jędrzejewski-Szmek
+ 
+   systemd is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by
+   the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+ 
+   systemd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
+ 
+   You should have received a copy of the GNU Lesser General Public License
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+ 
+ #include "util.h"
+ #include "fileio.h"
+ #include "hostname-util.h"
+ 
+ static void test_hostname_is_valid(void) {
+         assert_se(hostname_is_valid("foobar", false));
+         assert_se(hostname_is_valid("foobar.com", false));
+         assert_se(!hostname_is_valid("foobar.com.", false));
+         assert_se(hostname_is_valid("fooBAR", false));
+         assert_se(hostname_is_valid("fooBAR.com", false));
+         assert_se(!hostname_is_valid("fooBAR.", false));
+         assert_se(!hostname_is_valid("fooBAR.com.", false));
+         assert_se(!hostname_is_valid("fööbar", false));
+         assert_se(!hostname_is_valid("", false));
+         assert_se(!hostname_is_valid(".", false));
+         assert_se(!hostname_is_valid("..", false));
+         assert_se(!hostname_is_valid("foobar.", false));
+         assert_se(!hostname_is_valid(".foobar", false));
+         assert_se(!hostname_is_valid("foo..bar", false));
+         assert_se(!hostname_is_valid("foo.bar..", false));
+         assert_se(!hostname_is_valid("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", false));
+ 
+         assert_se(hostname_is_valid("foobar", true));
+         assert_se(hostname_is_valid("foobar.com", true));
+         assert_se(hostname_is_valid("foobar.com.", true));
+         assert_se(hostname_is_valid("fooBAR", true));
+         assert_se(hostname_is_valid("fooBAR.com", true));
+         assert_se(!hostname_is_valid("fooBAR.", true));
+         assert_se(hostname_is_valid("fooBAR.com.", true));
+         assert_se(!hostname_is_valid("fööbar", true));
+         assert_se(!hostname_is_valid("", true));
+         assert_se(!hostname_is_valid(".", true));
+         assert_se(!hostname_is_valid("..", true));
+         assert_se(!hostname_is_valid("foobar.", true));
+         assert_se(!hostname_is_valid(".foobar", true));
+         assert_se(!hostname_is_valid("foo..bar", true));
+         assert_se(!hostname_is_valid("foo.bar..", true));
+         assert_se(!hostname_is_valid("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", true));
+ }
+ 
+ static void test_hostname_cleanup(void) {
+         char *s;
+ 
+         s = strdupa("foobar");
+         assert_se(streq(hostname_cleanup(s), "foobar"));
+         s = strdupa("foobar.com");
+         assert_se(streq(hostname_cleanup(s), "foobar.com"));
+         s = strdupa("foobar.com.");
+         assert_se(streq(hostname_cleanup(s), "foobar.com"));
+         s = strdupa("fooBAR");
+         assert_se(streq(hostname_cleanup(s), "fooBAR"));
+         s = strdupa("fooBAR.com");
+         assert_se(streq(hostname_cleanup(s), "fooBAR.com"));
+         s = strdupa("fooBAR.");
+         assert_se(streq(hostname_cleanup(s), "fooBAR"));
+         s = strdupa("fooBAR.com.");
+         assert_se(streq(hostname_cleanup(s), "fooBAR.com"));
+         s = strdupa("fööbar");
+         assert_se(streq(hostname_cleanup(s), "fbar"));
+         s = strdupa("");
+         assert_se(isempty(hostname_cleanup(s)));
+         s = strdupa(".");
+         assert_se(isempty(hostname_cleanup(s)));
+         s = strdupa("..");
+         assert_se(isempty(hostname_cleanup(s)));
+         s = strdupa("foobar.");
+         assert_se(streq(hostname_cleanup(s), "foobar"));
+         s = strdupa(".foobar");
+         assert_se(streq(hostname_cleanup(s), "foobar"));
+         s = strdupa("foo..bar");
+         assert_se(streq(hostname_cleanup(s), "foo.bar"));
+         s = strdupa("foo.bar..");
+         assert_se(streq(hostname_cleanup(s), "foo.bar"));
+         s = strdupa("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+         assert_se(streq(hostname_cleanup(s), "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"));
+ }
+ 
+ static void test_read_hostname_config(void) {
+         char path[] = "/tmp/hostname.XXXXXX";
+         char *hostname;
+         int fd;
+ 
+         fd = mkostemp_safe(path, O_RDWR|O_CLOEXEC);
+         assert(fd > 0);
+         close(fd);
+ 
+         /* simple hostname */
+         write_string_file(path, "foo", WRITE_STRING_FILE_CREATE);
+         assert_se(read_hostname_config(path, &hostname) == 0);
+         assert_se(streq(hostname, "foo"));
 -        free(hostname);
 -        hostname = NULL;
++        hostname = mfree(hostname);
+ 
+         /* with comment */
+         write_string_file(path, "# comment\nfoo", WRITE_STRING_FILE_CREATE);
+         assert_se(read_hostname_config(path, &hostname) == 0);
+         assert_se(hostname);
+         assert_se(streq(hostname, "foo"));
 -        free(hostname);
 -        hostname = NULL;
++        hostname = mfree(hostname);
+ 
+         /* with comment and extra whitespace */
+         write_string_file(path, "# comment\n\n foo ", WRITE_STRING_FILE_CREATE);
+         assert_se(read_hostname_config(path, &hostname) == 0);
+         assert_se(hostname);
+         assert_se(streq(hostname, "foo"));
 -        free(hostname);
 -        hostname = NULL;
++        hostname = mfree(hostname);
+ 
+         /* cleans up name */
+         write_string_file(path, "!foo/bar.com", WRITE_STRING_FILE_CREATE);
+         assert_se(read_hostname_config(path, &hostname) == 0);
+         assert_se(hostname);
+         assert_se(streq(hostname, "foobar.com"));
++        hostname = mfree(hostname);
+ 
+         /* no value set */
+         hostname = (char*) 0x1234;
+         write_string_file(path, "# nothing here\n", WRITE_STRING_FILE_CREATE);
+         assert_se(read_hostname_config(path, &hostname) == -ENOENT);
+         assert_se(hostname == (char*) 0x1234);  /* does not touch argument on error */
+ 
+         /* nonexisting file */
+         assert_se(read_hostname_config("/non/existing", &hostname) == -ENOENT);
+         assert_se(hostname == (char*) 0x1234);  /* does not touch argument on error */
+ 
+         unlink(path);
+ }
+ 
+ int main(int argc, char *argv[]) {
+         log_parse_environment();
+         log_open();
+ 
+         test_hostname_is_valid();
+         test_hostname_cleanup();
+         test_read_hostname_config();
+ 
+         return 0;
+ }

diff --cc src/test/test-util.c
Simple merge