Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix use=ip when ip is set to an IPv4 address

Browse source 
Before, with `use=ip,ip=1.2.3.4`, `get_ip` would return `undef` and
print a warning:

  WARNING:  found neither ipv4 nor ipv6 address
This commit is contained in:
Richard Hansen 2020-06-16 22:59:51 -04:00
parent 2f26ed5969
commit 99a60995c4
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.md
View file

@ -11,6 +11,8 @@ repository history](https://github.com/ddclient/ddclient/commits/master).
### Bug fixes
* Fixed a regression introduced in v3.9.0 that caused
`use=ip,ip=<ipv4-address>` to fail.
* "true" is now accepted as a boolean value.
### Compatibility and dependency changes

4
ddclient
View file

@ -2287,7 +2287,9 @@ sub get_ip {
$skip =~ s/ /\\s/is;
$reply =~ s/^.*?${skip}//is;
}
if ($reply =~ /^.*?\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b.*/is) {
if (defined($ip)) {
# no need to parse $reply
} elsif ($reply =~ /^.*?\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b.*/is) {
$ip = $1;
$ip = un_zero_pad($ip);
$ip = filter_local($ip) if opt('fw-banlocal', $h);