From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 10 Dec 2018 11:31:30 +0000 (+0100)
Subject: Merge pull request #10897 from keszybz/etc-fstab-parsing
X-Git-Tag: v240~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec68d13789bdbc5b72a070cd3f17b413008fa96e;p=thirdparty%2Fsystemd.git

Merge pull request #10897 from keszybz/etc-fstab-parsing

Forbid dashes in hostnames and /etc/fstab parsing improvements
---

ec68d13789bdbc5b72a070cd3f17b413008fa96e
diff --cc src/resolve/test-resolved-etc-hosts.c
index 6130a036fd0,27e67df01f0..dbff889e3ea
--- a/src/resolve/test-resolved-etc-hosts.c
+++ b/src/resolve/test-resolved-etc-hosts.c
@@@ -9,9 -15,11 +15,11 @@@
  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;
          }