Merge pull request #11569 from yuwata/first-step-11307

util-lib: warn if address is specified without prefix length
This commit is contained in:
Lennart Poettering
2019-01-29 11:25:55 +01:00
committed by GitHub
7 changed files with 106 additions and 97 deletions
+9 -1
View File
@@ -748,7 +748,15 @@ int config_parse_address(const char *unit,
return r;
/* Address=address/prefixlen */
r = in_addr_default_prefix_from_string_auto(rvalue, &f, &buffer, &prefixlen);
r = in_addr_prefix_from_string_auto_internal(rvalue, PREFIXLEN_REFUSE, &f, &buffer, &prefixlen);
if (r == -ENOANO) {
log_syntax(unit, LOG_ERR, filename, line, r,
"An address '%s' is specified without prefix length. "
"The behavior of parsing addresses without prefix length will be changed in the future release. "
"Please specify prefix length explicitly.", rvalue);
r = in_addr_prefix_from_string_auto_internal(rvalue, PREFIXLEN_LEGACY, &f, &buffer, &prefixlen);
}
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Invalid address '%s', ignoring assignment: %m", rvalue);
return 0;