]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #10897 from keszybz/etc-fstab-parsing
authorLennart Poettering <lennart@poettering.net>
Mon, 10 Dec 2018 11:31:30 +0000 (12:31 +0100)
committerGitHub <noreply@github.com>
Mon, 10 Dec 2018 11:31:30 +0000 (12:31 +0100)
Forbid dashes in hostnames and /etc/fstab parsing improvements

1  2 
src/network/networkd-network.c
src/resolve/resolved-bus.c
src/resolve/resolved-manager.c
src/resolve/test-resolved-etc-hosts.c

Simple merge
Simple merge
Simple merge
index 6130a036fd0342dd19be5f8211e8ae4acb27c549,27e67df01f01f3e82e06f7468bedef57adf6064f..dbff889e3ead91edc16e82fc547090cce87925f2
  static void test_parse_etc_hosts_system(void) {
          _cleanup_fclose_ FILE *f = NULL;
  
+         log_info("/* %s */", __func__);
          f = fopen("/etc/hosts", "re");
          if (!f) {
 -                assert_se(errno == -ENOENT);
 +                assert_se(errno == ENOENT);
                  return;
          }