summaryrefslogtreecommitdiff
path: root/src/resolve
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-03-23 21:31:14 +0100
committerLennart Poettering <lennart@poettering.net>2018-05-24 17:01:57 +0200
commit1a5a177eafa72adfd40916be05f35b71011014b0 (patch)
treedf4d3504ef6ea99aaf75f9cce66a3dc3127fc296 /src/resolve
parente2047ba9ed68aa223715f25e156aeb0665c884ce (diff)
downloadsystemd-1a5a177eafa72adfd40916be05f35b71011014b0.tar.gz
fileio: accept FILE* in addition to path in parse_env_file()
Most our other parsing functions do this, let's do this here too, internally we accept that anyway. Also, the closely related load_env_file() and load_env_file_pairs() also do this, so let's be systematic.
Diffstat (limited to 'src/resolve')
-rw-r--r--src/resolve/resolved-link.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index f2552a11de..a0eedd86d3 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -1202,7 +1202,7 @@ int link_load_user(Link *l) {
if (l->is_managed)
return 0; /* if the device is managed, then networkd is our configuration source, not the bus API */
- r = parse_env_file(l->state_file, NEWLINE,
+ r = parse_env_file(NULL, l->state_file, NEWLINE,
"LLMNR", &llmnr,
"MDNS", &mdns,
"DNSSEC", &dnssec,