summaryrefslogtreecommitdiff
path: root/src/libsystemd-network/network-internal.c
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-11-23 22:19:26 +0100
committerLennart Poettering <lennart@poettering.net>2018-12-10 14:25:28 +0100
commit8217ed5ec34e58ef791bcf9637e301aba608b711 (patch)
tree1987286a501bc34555b0025436c575f79a886bd2 /src/libsystemd-network/network-internal.c
parent1d4c6f5befbc35e71f424c7e8a69c85a5a2272d5 (diff)
downloadsystemd-8217ed5ec34e58ef791bcf9637e301aba608b711.tar.gz
systemd-8217ed5ec34e58ef791bcf9637e301aba608b711.tar.bz2
systemd-8217ed5ec34e58ef791bcf9637e301aba608b711.zip
network: fix handling of uninitialized and zero IAID setting
An earlier commit 0e408b82b (dhcp6-client: handle IAID with value zero) introduced a flag to sd_dhcp6_client to distinguish between an unset IAID and a value set to zero. However, that was not sufficient and broke leaving the setting uninitialized in networkd configuration. The configuration parsing also must distinguish between the default, unset value and an explict zero configuration. Fixes: 0e408b82b8bd7675234cf58009475d4f4c0a491a
Diffstat (limited to 'src/libsystemd-network/network-internal.c')
-rw-r--r--src/libsystemd-network/network-internal.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index d35e3e2ce1..b3b134d650 100644
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -371,36 +371,6 @@ int config_parse_hwaddrs(const char *unit,
return 0;
}
-int config_parse_iaid(const char *unit,
- const char *filename,
- unsigned line,
- const char *section,
- unsigned section_line,
- const char *lvalue,
- int ltype,
- const char *rvalue,
- void *data,
- void *userdata) {
- uint32_t iaid;
- int r;
-
- assert(filename);
- assert(lvalue);
- assert(rvalue);
- assert(data);
-
- r = safe_atou32(rvalue, &iaid);
- if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, r,
- "Unable to read IAID, ignoring assignment: %s", rvalue);
- return 0;
- }
-
- *((uint32_t *)data) = iaid;
-
- return 0;
-}
-
int config_parse_bridge_port_priority(
const char *unit,
const char *filename,