X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-address.c;h=ce85109d22dd13684929b7af912ebdbbf8774b10;hb=d9130355ee0530117518ff24354bdd552d030238;hp=e595cd6e94682f10f403ff452a7fe73733e42816;hpb=0b1831c20c4d30077b6560b2b7d88bdb220d5cef;p=elogind.git diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index e595cd6e9..ce85109d2 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -482,7 +482,7 @@ int config_parse_address(const char *unit, r = safe_atou(e + 1, &i); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Interface prefix length is invalid, ignoring assignment: %s", e + 1); + "Prefix length is invalid, ignoring assignment: %s", e + 1); return 0; } @@ -499,6 +499,15 @@ int config_parse_address(const char *unit, return 0; } + if (!e && f == AF_INET) { + r = in_addr_default_prefixlen(&buffer.in, &n->prefixlen); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Prefix length not specified, and a default one can not be deduced for '%s', ignoring assignment", address); + return 0; + } + } + if (n->family != AF_UNSPEC && f != n->family) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Address is incompatible, ignoring assignment: %s", address);