projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ec9efbd
5fe7a0a
)
Merge pull request #10897 from keszybz/etc-fstab-parsing
author
Lennart Poettering
<lennart@poettering.net>
Mon, 10 Dec 2018 11:31:30 +0000
(12:31 +0100)
committer
GitHub
<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
patch
|
diff1
|
diff2
|
blob
|
history
src/resolve/resolved-bus.c
patch
|
diff1
|
diff2
|
blob
|
history
src/resolve/resolved-manager.c
patch
|
diff1
|
diff2
|
blob
|
history
src/resolve/test-resolved-etc-hosts.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/network/networkd-network.c
Simple merge
diff --cc
src/resolve/resolved-bus.c
Simple merge
diff --cc
src/resolve/resolved-manager.c
Simple merge
diff --cc
src/resolve/test-resolved-etc-hosts.c
index
6130a03
,
27e67df
..
dbff889
---
1
/
src/resolve/test-resolved-etc-hosts.c
---
2
/
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;
}