diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-07 20:19:19 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-07 20:19:19 -0400 |
| commit | 74dd72d559911bd56f9865a273c355e4e2e48fae (patch) | |
| tree | b3b48382a95595b6b9a37cfbc95a2afe5009d61a /src/libsystemd-network/network-internal.c | |
| parent | 3aa131c4cacc3e381d21f061a87da1cddd4963cb (diff) | |
| parent | f38e0cce75ff2ffbd99f7e382ed39c160bb7d799 (diff) | |
Merge pull request #2943 from vinaykul/systemd_duid_review_fixes
DHCP DUID parsing fix, logging fix, man-page fix
Diffstat (limited to 'src/libsystemd-network/network-internal.c')
| -rw-r--r-- | src/libsystemd-network/network-internal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index 0e2d757b2b..99b3a1d01f 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -355,8 +355,9 @@ int config_parse_iaid(const char *unit, r = safe_atou32(rvalue, &iaid); if (r < 0) { - log_syntax(unit, LOG_ERR, filename, line, 0, "Unable to read IAID: %s", rvalue); - return r; + log_syntax(unit, LOG_ERR, filename, line, r, + "Unable to read IAID, ignoring assignment: %s", rvalue); + return 0; } *((uint32_t *)data) = iaid; |