picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: fix how we generate lists in link_save() 

https://bugs.freedesktop.org/show_bug.cgi?id=82721
This commit is contained in:
Lennart Poettering 2014-08-18 18:59:48 +02:00
parent 8aa209ee14
commit ea352b409e
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/network/networkd-link.c
View File

@ -1721,14 +1721,17 @@ int link_save(Link *link) {
admin_state, oper_state);
if (link->network) {
char **address;
char **domain;
char **address, **domain;
bool space;
fputs("DNS=", f);
STRV_FOREACH(address, link->network->dns)
fprintf(f, "%s%s", *address,
(address + 1 ? " " : ""));
space = false;
STRV_FOREACH(address, link->network->dns) {
if (space)
fputc(' ', f);
fputs(*address, f);
space = true;
}
if (link->network->dhcp_dns &&
link->dhcp_lease) {
@ -1736,19 +1739,22 @@ int link_save(Link *link) {
r = sd_dhcp_lease_get_dns(link->dhcp_lease, &addresses);
if (r > 0) {
if (space)
fputc(' ', f);
serialize_in_addrs(f, addresses, r);
if (link->network->dns)
fputs(" ", f);
}
}
fputs("\n", f);
fprintf(f, "NTP=");
STRV_FOREACH(address, link->network->ntp)
fprintf(f, "%s%s", *address,
(address + 1 ? " " : ""));
space = false;
STRV_FOREACH(address, link->network->ntp) {
if (space)
fputc(' ', f);
fputs(*address, f);
space = true;
}
if (link->network->dhcp_ntp &&
link->dhcp_lease) {
@ -1756,19 +1762,22 @@ int link_save(Link *link) {
r = sd_dhcp_lease_get_ntp(link->dhcp_lease, &addresses);
if (r > 0) {
if (space)
fputc(' ', f);
serialize_in_addrs(f, addresses, r);
if (link->network->ntp)
fputs(" ", f);
}
}
fputs("\n", f);
fprintf(f, "DOMAINS=");
STRV_FOREACH(domain, link->network->domains)
fprintf(f, "%s%s", *domain,
(domain + 1 ? " " : ""));
space = false;
STRV_FOREACH(domain, link->network->domains) {
if (space)
fputc(' ', f);
fputs(*domain, f);
space = true;
}
if (link->network->dhcp_domains &&
link->dhcp_lease) {
@ -1776,9 +1785,9 @@ int link_save(Link *link) {
r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname);
if (r >= 0) {
if (space)
fputc(' ', f);
fputs(domainname, f);
if (link->network->domains)
fputs(" ", f);
}
}