SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26014 from yuwata/network-l2tp-fixes

Browse Source 
network: L2TP fixlets
This commit is contained in:
Luca Boccassi
2023-01-11 09:32:50 +00:00
committed by GitHub
parent c8add4c2e8 bf4a5ac804
commit fae081492e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/netdev/l2tp-tunnel.c
+5 -5
View File
@@ -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;
}