chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: remove "*" from domains list
[elogind.git]
/
src
/
network
/
networkd-network.c
diff --git
a/src/network/networkd-network.c
b/src/network/networkd-network.c
index bbc5d279e942035e188c1560795eb8e6b604ab4b..6f0d1a16899b12a2732e13459f041ca2ca3aed3f 100644
(file)
--- a/
src/network/networkd-network.c
+++ b/
src/network/networkd-network.c
@@
-351,6
+351,7
@@
int config_parse_domains(const char *unit,
const char *rvalue,
void *data,
void *userdata) {
const char *rvalue,
void *data,
void *userdata) {
+ Network *network = userdata;
char ***domains = data;
char **domain;
int r;
char ***domains = data;
char **domain;
int r;
@@
-361,11
+362,16
@@
int config_parse_domains(const char *unit,
return r;
strv_uniq(*domains);
return r;
strv_uniq(*domains);
+ network->wildcard_domain = !!strv_find(*domains, "*");
STRV_FOREACH(domain, *domains)
STRV_FOREACH(domain, *domains)
- if (is_localhost(*domain) || !hostname_is_valid(*domain)
)
+ if (is_localhost(*domain) || !hostname_is_valid(*domain)
|| streq(*domain, "*")) {
strv_remove(*domains, *domain);
strv_remove(*domains, *domain);
+ /* We removed one entry, make sure we don't skip the next one */
+ domain--;
+ }
+
return 0;
}
return 0;
}