diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-01-11 10:32:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 10:32:50 +0100 |
| commit | fae081492e6ef586b301b78a06caeada39df37e6 (patch) | |
| tree | fd5b655824c1d5857ae86414ba3b3f1ef2c93d6e /src | |
| parent | ukify: Fix tools detection if --tools was not passed (diff) | |
| parent | network/l2tp: parse address or address type from correct string (diff) | |
| download | systemd-fae081492e6ef586b301b78a06caeada39df37e6.tar.xz systemd-fae081492e6ef586b301b78a06caeada39df37e6.zip | |
Merge pull request #26014 from yuwata/network-l2tp-fixes
network: L2TP fixlets
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/netdev/l2tp-tunnel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c index 7d51a619bd..547de2418c 100644 --- a/src/network/netdev/l2tp-tunnel.c +++ b/src/network/netdev/l2tp-tunnel.c @@ -521,7 +521,7 @@ int config_parse_l2tp_tunnel_local_address( return log_oom(); } - type = l2tp_local_address_type_from_string(rvalue); + type = l2tp_local_address_type_from_string(addr_or_type); if (type >= 0) { free_and_replace(t->local_ifname, ifname); t->local_address_type = type; @@ -534,15 +534,15 @@ int config_parse_l2tp_tunnel_local_address( return 0; } - r = in_addr_from_string_auto(rvalue, &f, &a); + r = in_addr_from_string_auto(addr_or_type, &f, &a); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, - "Invalid L2TP Tunnel local address specified, ignoring assignment: %s", rvalue); + "Invalid L2TP Tunnel local address \"%s\" specified, ignoring assignment: %s", addr_or_type, rvalue); return 0; } if (in_addr_is_null(f, &a)) { - log_syntax(unit, LOG_WARNING, filename, line, r, + log_syntax(unit, LOG_WARNING, filename, line, 0, "L2TP Tunnel local address cannot be null, ignoring assignment: %s", rvalue); return 0; } @@ -598,7 +598,7 @@ int config_parse_l2tp_tunnel_remote_address( } if (in_addr_is_null(f, &a)) { - log_syntax(unit, LOG_WARNING, filename, line, r, + log_syntax(unit, LOG_WARNING, filename, line, 0, "L2TP Tunnel remote address cannot be null, ignoring assignment: %s", rvalue); return 0; } |