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

s/foreach/for/g for consistency

Browse source
This commit is contained in:
Richard Hansen 2024-05-29 16:48:00 -04:00
parent d1068bede1
commit a91ca7a199
1 changed files with 114 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

228
ddclient.in
View file

@ -1343,12 +1343,12 @@ sub update_nics {
my %ipv4list = (); my %ipv4list = ();
my %ipv6list = (); my %ipv6list = ();
foreach my $s (sort keys %services) { for my $s (sort keys %services) {
my (@hosts, %ipsv4, %ipsv6) = (); my (@hosts, %ipsv4, %ipsv6) = ();
my $updateable = $services{$s}{'updateable'}; my $updateable = $services{$s}{'updateable'};
my $update = $services{$s}{'update'}; my $update = $services{$s}{'update'};
foreach my $h (sort keys %config) { for my $h (sort keys %config) {
next if $config{$h}{'protocol'} ne lc($s); next if $config{$h}{'protocol'} ne lc($s);
$examined{$h} = 1; $examined{$h} = 1;
# we only do this once per 'use' and argument combination # we only do this once per 'use' and argument combination
@ -1464,7 +1464,7 @@ sub update_nics {
# The new '--usev*' parameters set 'wantipv*' and the new providers set 'ipv*' and 'status-ipv*'. # The new '--usev*' parameters set 'wantipv*' and the new providers set 'ipv*' and 'status-ipv*'.
# To allow gradual transition, we make sure both the old 'status' and 'ip' are being set # To allow gradual transition, we make sure both the old 'status' and 'ip' are being set
# accordingly to what new providers returned in the new 'status-ipv*' and 'ipv*' fields respectively. # accordingly to what new providers returned in the new 'status-ipv*' and 'ipv*' fields respectively.
foreach my $h (@hosts) { for my $h (@hosts) {
$config{$h}{'status'} //= $config{$h}{'status-ipv4'} // $config{$h}{'status-ipv6'}; $config{$h}{'status'} //= $config{$h}{'status-ipv4'} // $config{$h}{'status-ipv6'};
$config{$h}{'ip'} //= $config{$h}{'ipv4'} // $config{$h}{'ipv6'}; $config{$h}{'ip'} //= $config{$h}{'ipv4'} // $config{$h}{'ipv6'};
} }
@ -1472,7 +1472,7 @@ sub update_nics {
runpostscript(join ' ', keys %ipsv4, keys %ipsv6); runpostscript(join ' ', keys %ipsv4, keys %ipsv6);
} }
} }
foreach my $h (sort keys %config) { for my $h (sort keys %config) {
if (!exists $examined{$h}) { if (!exists $examined{$h}) {
failed("%s was not updated because protocol %s is not supported.", failed("%s was not updated because protocol %s is not supported.",
$h, $config{$h}{'protocol'} // '<undefined>'); $h, $config{$h}{'protocol'} // '<undefined>');
@ -1515,7 +1515,7 @@ sub write_cache {
my ($file) = @_; my ($file) = @_;
## merge the updated host entries into the cache. ## merge the updated host entries into the cache.
foreach my $h (keys %config) { for my $h (keys %config) {
if (!exists $cache{$h} || $config{$h}{'update'}) { if (!exists $cache{$h} || $config{$h}{'update'}) {
map { defined($config{$h}{$_}) ? ($cache{$h}{$_} = $config{$h}{$_}) : () } @{$config{$h}{'cacheable'}}; map { defined($config{$h}{$_}) ? ($cache{$h}{$_} = $config{$h}{$_}) : () } @{$config{$h}{'cacheable'}};
} else { } else {
@ -1525,7 +1525,7 @@ sub write_cache {
## construct the cache file. ## construct the cache file.
my $cache = ""; my $cache = "";
foreach my $h (sort keys %cache) { for my $h (sort keys %cache) {
my $opt = join(',', map { "$_=" . ($cache{$h}{$_} // '') } sort keys %{$cache{$h}}); my $opt = join(',', map { "$_=" . ($cache{$h}{$_} // '') } sort keys %{$cache{$h}});
$cache .= sprintf "%s%s%s\n", $opt, ($opt ? ' ' : ''), $h; $cache .= sprintf "%s%s%s\n", $opt, ($opt ? ' ' : ''), $h;
@ -1573,9 +1573,9 @@ sub read_cache {
$saved_cache = _read_config($config, $globals, "##\\s*$program-$version\\s*", $file); $saved_cache = _read_config($config, $globals, "##\\s*$program-$version\\s*", $file);
%opt = %saved; %opt = %saved;
foreach my $h (keys %cache) { for my $h (keys %cache) {
if (exists $config->{$h}) { if (exists $config->{$h}) {
foreach (qw(atime mtime wtime ip status)) { for (qw(atime mtime wtime ip status)) {
$config->{$h}{$_} = $cache{$h}{$_} if exists $cache{$h}{$_}; $config->{$h}{$_} = $cache{$h}{$_} if exists $cache{$h}{$_};
} }
} }
@ -1757,7 +1757,7 @@ sub _read_config {
my @args = split; my @args = split;
## verify that keywords are valid...and check the value ## verify that keywords are valid...and check the value
foreach my $k (keys %locals) { for my $k (keys %locals) {
# Handle '_env' keyword suffix # Handle '_env' keyword suffix
if ($k =~ /(.*)_env$/) if ($k =~ /(.*)_env$/)
{ {
@ -1810,7 +1810,7 @@ sub _read_config {
$locals{'password'} = $password if defined $password; $locals{'password'} = $password if defined $password;
## allow {host} to be a comma separated list of hosts ## allow {host} to be a comma separated list of hosts
foreach my $h (split_by_comma($host)) { for my $h (split_by_comma($host)) {
if ($config{$h}) { if ($config{$h}) {
## host already defined, merging configs ## host already defined, merging configs
$config{$h} = {%locals, %{$config{$h}}}; $config{$h} = {%locals, %{$config{$h}}};
@ -1878,7 +1878,7 @@ sub init_config {
if (exists $opt{'options'} && defined $opt{'options'}) { if (exists $opt{'options'} && defined $opt{'options'}) {
## collect cmdline configuration options. ## collect cmdline configuration options.
my %options = (); my %options = ();
foreach my $opt (split_by_comma($opt{'options'})) { for my $opt (split_by_comma($opt{'options'})) {
my ($name, $var) = split /\s*=\s*/, $opt; my ($name, $var) = split /\s*=\s*/, $opt;
if ($name eq 'fw-banlocal' || $name eq 'if-skip') { if ($name eq 'fw-banlocal' || $name eq 'if-skip') {
warning("'$name' is deprecated and does nothing"); warning("'$name' is deprecated and does nothing");
@ -1889,20 +1889,20 @@ sub init_config {
## determine hosts specified with --host ## determine hosts specified with --host
my @hosts = (); my @hosts = ();
if (exists $opt{'host'}) { if (exists $opt{'host'}) {
foreach my $h (split_by_comma($opt{'host'})) { for my $h (split_by_comma($opt{'host'})) {
push @hosts, $h; push @hosts, $h;
} }
} }
## and those in --options=... ## and those in --options=...
if (exists $options{'host'}) { if (exists $options{'host'}) {
foreach my $h (split_by_comma($options{'host'})) { for my $h (split_by_comma($options{'host'})) {
push @hosts, $h; push @hosts, $h;
} }
delete $options{'host'}; delete $options{'host'};
} }
## merge options into host definitions or globals ## merge options into host definitions or globals
if (@hosts) { if (@hosts) {
foreach my $h (@hosts) { for my $h (@hosts) {
$config{$h} = {%{$config{$h}}, %options}; $config{$h} = {%{$config{$h}}, %options};
} }
$opt{'host'} = join(',', @hosts); $opt{'host'} = join(',', @hosts);
@ -1912,7 +1912,7 @@ sub init_config {
} }
## override global options with those on the command-line. ## override global options with those on the command-line.
foreach my $o (keys %opt) { for my $o (keys %opt) {
if (defined $opt{$o} && exists $variables{'global-defaults'}{$o}) { if (defined $opt{$o} && exists $variables{'global-defaults'}{$o}) {
$globals{$o} = $opt{$o}; $globals{$o} = $opt{$o};
} }
@ -1939,9 +1939,9 @@ sub init_config {
map { delete $config{$_} unless exists $hosts{$_} } keys %config; map { delete $config{$_} unless exists $hosts{$_} } keys %config;
## collect the cacheable variables. ## collect the cacheable variables.
foreach my $proto (keys %services) { for my $proto (keys %services) {
my @cacheable = (); my @cacheable = ();
foreach my $k (keys %{$services{$proto}{'variables'}}) { for my $k (keys %{$services{$proto}{'variables'}}) {
push @cacheable, $k if $services{$proto}{'variables'}{$k}{'cache'}; push @cacheable, $k if $services{$proto}{'variables'}{$k}{'cache'};
} }
$services{$proto}{'cacheable'} = [ @cacheable ]; $services{$proto}{'cacheable'} = [ @cacheable ];
@ -1950,7 +1950,7 @@ sub init_config {
## sanity check.. ## sanity check..
## make sure config entries have all defaults and they meet minimums ## make sure config entries have all defaults and they meet minimums
## first the globals... ## first the globals...
foreach my $k (keys %globals) { for my $k (keys %globals) {
# Make sure any _env suffixed variables look at their original entry # Make sure any _env suffixed variables look at their original entry
$k = $1 if $k =~ /^(.*)_env$/; $k = $1 if $k =~ /^(.*)_env$/;
@ -1966,7 +1966,7 @@ sub init_config {
## now the host definitions... ## now the host definitions...
HOST: HOST:
foreach my $h (keys %config) { for my $h (keys %config) {
my $proto; my $proto;
$proto = $config{$h}{'protocol'}; $proto = $config{$h}{'protocol'};
$proto = opt('protocol') if !defined($proto); $proto = opt('protocol') if !defined($proto);
@ -1982,7 +1982,7 @@ sub init_config {
my $svars = $services{$proto}{'variables'}; my $svars = $services{$proto}{'variables'};
my $conf = { 'protocol' => $proto }; my $conf = { 'protocol' => $proto };
foreach my $k (keys %$svars) { for my $k (keys %$svars) {
# Make sure any _env suffixed variables look at their original entry # Make sure any _env suffixed variables look at their original entry
$k = $1 if $k =~ /^(.*)_env$/; $k = $1 if $k =~ /^(.*)_env$/;
@ -2010,7 +2010,7 @@ sub process_args {
my @spec = (); my @spec = ();
my $usage = ""; my $usage = "";
foreach (@_) { for (@_) {
if (ref $_) { if (ref $_) {
my ($key, $specifier, $arg_usage) = @$_; my ($key, $specifier, $arg_usage) = @$_;
my $value = default($key); my $value = default($key);
@ -2068,14 +2068,14 @@ sub test_possible_ip {
`command -v ifconfig >/dev/null && ifconfig -a`) if $? || !@ifs; `command -v ifconfig >/dev/null && ifconfig -a`) if $? || !@ifs;
@ifs = () if $?; @ifs = () if $?;
warning("failed to get list of interfaces") if !@ifs; warning("failed to get list of interfaces") if !@ifs;
foreach my $if (@ifs) { for my $if (@ifs) {
local $opt{'if'} = $if; local $opt{'if'} = $if;
printf "use=if, if=%s address is %s\n", opt('if'), get_ip('if') // 'NOT FOUND'; printf "use=if, if=%s address is %s\n", opt('if'), get_ip('if') // 'NOT FOUND';
} }
} }
if (opt('fw')) { if (opt('fw')) {
if (opt('fw') !~ m%/%) { if (opt('fw') !~ m%/%) {
foreach my $fw (sort keys %builtinfw) { for my $fw (sort keys %builtinfw) {
local $opt{'use'} = $fw; local $opt{'use'} = $fw;
printf "use=%s address is %s\n", $fw, get_ip($fw) // 'NOT FOUND'; printf "use=%s address is %s\n", $fw, get_ip($fw) // 'NOT FOUND';
} }
@ -2087,7 +2087,7 @@ sub test_possible_ip {
} }
{ {
local $opt{'use'} = 'web'; local $opt{'use'} = 'web';
foreach my $web (sort keys %builtinweb) { for my $web (sort keys %builtinweb) {
local $opt{'web'} = $web; local $opt{'web'} = $web;
printf "use=web, web=%s address is %s\n", $web, get_ip('web') // 'NOT FOUND'; printf "use=web, web=%s address is %s\n", $web, get_ip('web') // 'NOT FOUND';
} }
@ -2113,14 +2113,14 @@ sub test_possible_ip {
`command -v ifconfig >/dev/null && ifconfig -a`) if $? || !@ifs; `command -v ifconfig >/dev/null && ifconfig -a`) if $? || !@ifs;
@ifs = () if $?; @ifs = () if $?;
warning("failed to get list of interfaces") if !@ifs; warning("failed to get list of interfaces") if !@ifs;
foreach my $if (@ifs) { for my $if (@ifs) {
local $opt{'ifv4'} = $if; local $opt{'ifv4'} = $if;
printf "use=ifv4, ifv4=%s address is %s\n", opt('ifv4'), get_ipv4('ifv4') // 'NOT FOUND'; printf "use=ifv4, ifv4=%s address is %s\n", opt('ifv4'), get_ipv4('ifv4') // 'NOT FOUND';
} }
} }
{ {
local $opt{'usev4'} = 'webv4'; local $opt{'usev4'} = 'webv4';
foreach my $web (sort keys %builtinweb) { for my $web (sort keys %builtinweb) {
local $opt{'webv4'} = $web; local $opt{'webv4'} = $web;
printf "use=webv4, webv4=$web address is %s\n", get_ipv4('webv4') // 'NOT FOUND' printf "use=webv4, webv4=$web address is %s\n", get_ipv4('webv4') // 'NOT FOUND'
if ($web !~ "6") ## Don't bother if web site only supports IPv6; if ($web !~ "6") ## Don't bother if web site only supports IPv6;
@ -2147,14 +2147,14 @@ sub test_possible_ip {
`command -v ifconfig >/dev/null && ifconfig -a`) if $? || !@ifs; `command -v ifconfig >/dev/null && ifconfig -a`) if $? || !@ifs;
@ifs = () if $?; @ifs = () if $?;
warning("failed to get list of interfaces") if !@ifs; warning("failed to get list of interfaces") if !@ifs;
foreach my $if (@ifs) { for my $if (@ifs) {
local $opt{'ifv6'} = $if; local $opt{'ifv6'} = $if;
printf "use=ifv6, ifv6=%s address is %s\n", opt('ifv6'), get_ipv6('ifv6') // 'NOT FOUND'; printf "use=ifv6, ifv6=%s address is %s\n", opt('ifv6'), get_ipv6('ifv6') // 'NOT FOUND';
} }
} }
{ {
local $opt{'usev6'} = 'webv6'; local $opt{'usev6'} = 'webv6';
foreach my $web (sort keys %builtinweb) { for my $web (sort keys %builtinweb) {
local $opt{'webv6'} = $web; local $opt{'webv6'} = $web;
printf "use=webv6, webv6=$web address is %s\n", get_ipv6('webv6') // 'NOT FOUND' printf "use=webv6, webv6=$web address is %s\n", get_ipv6('webv6') // 'NOT FOUND'
if ($web !~ "4"); ## Don't bother if web site only supports IPv4 if ($web !~ "4"); ## Don't bother if web site only supports IPv4
@ -2247,7 +2247,7 @@ sub _print_hash {
if (!defined($ptr)) { if (!defined($ptr)) {
$value = "<undefined>"; $value = "<undefined>";
} elsif (ref $ptr eq 'HASH') { } elsif (ref $ptr eq 'HASH') {
foreach my $key (sort keys %$ptr) { for my $key (sort keys %$ptr) {
if (($key eq "login") || ($key eq "password")) { if (($key eq "login") || ($key eq "password")) {
$value = "<redacted>"; $value = "<redacted>";
} else { } else {
@ -2366,14 +2366,14 @@ sub opt {
} }
sub min { sub min {
my $min = shift; my $min = shift;
foreach my $arg (@_) { for my $arg (@_) {
$min = $arg if $arg < $min; $min = $arg if $arg < $min;
} }
return $min; return $min;
} }
sub max { sub max {
my $max = shift; my $max = shift;
foreach my $arg (@_) { for my $arg (@_) {
$max = $arg if $arg > $max; $max = $arg if $arg > $max;
} }
return $max; return $max;
@ -2386,10 +2386,10 @@ sub ynu {
return $no if !($value // ''); return $no if !($value // '');
return $yes if $value eq '1'; return $yes if $value eq '1';
foreach (qw(yes true)) { for (qw(yes true)) {
return $yes if $_ =~ /^$value/i; return $yes if $_ =~ /^$value/i;
} }
foreach (qw(no false)) { for (qw(no false)) {
return $no if $_ =~ /^$value/i; return $no if $_ =~ /^$value/i;
} }
return $undef; return $undef;
@ -2765,7 +2765,7 @@ sub geturl {
# Each header line is added individually # Each header line is added individually
@header_lines = split('\n', $headers); @header_lines = split('\n', $headers);
$_ = "header=\"".escape_curl_param($_).'"' foreach (@header_lines); $_ = "header=\"".escape_curl_param($_).'"' for (@header_lines);
push(@curlopt, @header_lines); push(@curlopt, @header_lines);
# Add in the data if any was provided (for POST/PATCH) # Add in the data if any was provided (for POST/PATCH)
@ -2780,7 +2780,7 @@ sub geturl {
# don't include ${url} as that might expose login credentials # don't include ${url} as that might expose login credentials
$0 = sprintf("%s - Curl system cmd sending to %s", $program, "${protocol}://${server}"); $0 = sprintf("%s - Curl system cmd sending to %s", $program, "${protocol}://${server}");
verbose("SENDING:", "Curl system cmd to %s", "${protocol}://${server}"); verbose("SENDING:", "Curl system cmd to %s", "${protocol}://${server}");
verbose("SENDING:", "%s", $_) foreach (@curlopt); verbose("SENDING:", "%s", $_) for (@curlopt);
$reply = curl_cmd(@curlopt); $reply = curl_cmd(@curlopt);
verbose("RECEIVE:", "%s", $reply // "<undefined>"); verbose("RECEIVE:", "%s", $reply // "<undefined>");
@ -3079,7 +3079,7 @@ sub get_default_interface {
debug("Default routes found for IPv%s :\n%s", $ipver, join("\n",@list)); debug("Default routes found for IPv%s :\n%s", $ipver, join("\n",@list));
# now check each interface to make sure it is global (not loopback). # now check each interface to make sure it is global (not loopback).
foreach my $line (@list) { for my $line (@list) {
## Interface will be after "dev" or the last word in the line. Must accept blank spaces ## Interface will be after "dev" or the last word in the line. Must accept blank spaces
## at the end. Interface name may not have any whitespace or forward slash. ## at the end. Interface name may not have any whitespace or forward slash.
$line =~ /\bdev\b\s*\K[^\s\/]+|\b[^\s\/]+(?=[\s\/]*$)/; $line =~ /\bdev\b\s*\K[^\s\/]+|\b[^\s\/]+(?=[\s\/]*$)/;
@ -3426,7 +3426,7 @@ sub group_hosts_by {
my %attrs = (map({ ($_ => 1) } @$attributes), 'wantip' => 1); my %attrs = (map({ ($_ => 1) } @$attributes), 'wantip' => 1);
my @attrs = sort(keys(%attrs)); my @attrs = sort(keys(%attrs));
my %groups = (); my %groups = ();
foreach my $h (@$hosts) { for my $h (@$hosts) {
my $sig = join(',', map({ sprintf("%s=%s", $_, $config{$h}{$_} // '') } @attrs)); my $sig = join(',', map({ sprintf("%s=%s", $_, $config{$h}{$_} // '') } @attrs));
push @{$groups{$sig}}, $h; push @{$groups{$sig}}, $h;
} }
@ -3442,7 +3442,7 @@ sub encode_www_form_urlencoded {
my $must_encode = qr'[<>"#%{}|\\^~\[\]`;/?:=&+]'; my $must_encode = qr'[<>"#%{}|\\^~\[\]`;/?:=&+]';
my $encoded; my $encoded;
my $i = 0; my $i = 0;
foreach my $k (keys %$formdata) { for my $k (keys %$formdata) {
my $kenc = $k; my $kenc = $k;
my $venc = $formdata->{$k}; my $venc = $formdata->{$k};
@ -3468,7 +3468,7 @@ sub encode_www_form_urlencoded {
sub nic_examples { sub nic_examples {
my $examples = ""; my $examples = "";
my $separator = ""; my $separator = "";
foreach my $s (sort keys %services) { for my $s (sort keys %services) {
my $subr = $services{$s}{'examples'}; my $subr = $services{$s}{'examples'};
my $example; my $example;
@ -3852,7 +3852,7 @@ EoEXAMPLE
sub nic_dyndns1_update { sub nic_dyndns1_update {
debug("\nnic_dyndns1_update -------------------"); debug("\nnic_dyndns1_update -------------------");
## update each configured host ## update each configured host
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:", "updating %s", $h); verbose("UPDATE:", "updating %s", $h);
@ -3883,7 +3883,7 @@ sub nic_dyndns1_update {
my @reply = split /\n/, $reply; my @reply = split /\n/, $reply;
my ($title, $return_code, $error_code) = ('', '', ''); my ($title, $return_code, $error_code) = ('', '', '');
foreach my $line (@reply) { for my $line (@reply) {
$title = $1 if $line =~ m%<TITLE>\s*(.*)\s*</TITLE>%i; $title = $1 if $line =~ m%<TITLE>\s*(.*)\s*</TITLE>%i;
$return_code = $1 if $line =~ m%^return\s+code\s*:\s*(.*)\s*$%i; $return_code = $1 if $line =~ m%^return\s+code\s*:\s*(.*)\s*$%i;
$error_code = $1 if $line =~ m%^error\s+code\s*:\s*(.*)\s*$%i; $error_code = $1 if $line =~ m%^error\s+code\s*:\s*(.*)\s*$%i;
@ -4002,14 +4002,14 @@ sub nic_dyndns2_update {
); );
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $hosts = join(',', @hosts); my $hosts = join(',', @hosts);
my $h = $hosts[0]; my $h = $hosts[0];
my $ipv4 = $config{$h}{'wantipv4'}; my $ipv4 = $config{$h}{'wantipv4'};
my $ipv6 = $config{$h}{'wantipv6'}; my $ipv6 = $config{$h}{'wantipv6'};
delete $config{$_}{'wantipv4'} foreach @hosts; delete $config{$_}{'wantipv4'} for @hosts;
delete $config{$_}{'wantipv6'} foreach @hosts; delete $config{$_}{'wantipv6'} for @hosts;
info("setting IPv4 address to %s for %s", $ipv4, $hosts) if $ipv4; info("setting IPv4 address to %s for %s", $ipv4, $hosts) if $ipv4;
info("setting IPv6 address to %s for %s", $ipv6, $hosts) if $ipv6; info("setting IPv6 address to %s for %s", $ipv6, $hosts) if $ipv6;
@ -4059,7 +4059,7 @@ sub nic_dyndns2_update {
my @reply = split /\n/, $reply; my @reply = split /\n/, $reply;
my $state = 'header'; my $state = 'header';
foreach my $line (@reply) { for my $line (@reply) {
if ($state eq 'header') { if ($state eq 'header') {
$state = 'body'; $state = 'body';
@ -4073,13 +4073,13 @@ sub nic_dyndns2_update {
# we can't use the returned IP # we can't use the returned IP
my ($status, $returnedips) = split / /, lc $line; my ($status, $returnedips) = split / /, lc $line;
foreach my $h (@hosts) { for my $h (@hosts) {
$config{$h}{'status-ipv4'} = $status if $ipv4; $config{$h}{'status-ipv4'} = $status if $ipv4;
$config{$h}{'status-ipv6'} = $status if $ipv6; $config{$h}{'status-ipv6'} = $status if $ipv6;
} }
if ($status eq 'good') { if ($status eq 'good') {
foreach my $h (@hosts) { for my $h (@hosts) {
$config{$h}{'ipv4'} = $ipv4 if $ipv4; $config{$h}{'ipv4'} = $ipv4 if $ipv4;
$config{$h}{'ipv6'} = $ipv6 if $ipv6; $config{$h}{'ipv6'} = $ipv6 if $ipv6;
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
@ -4092,7 +4092,7 @@ sub nic_dyndns2_update {
if ($status eq 'nochg') { if ($status eq 'nochg') {
warning("updating %s: %s: %s", $hosts, $status, $errors{$status}); warning("updating %s: %s: %s", $hosts, $status, $errors{$status});
foreach my $h (@hosts) { for my $h (@hosts) {
$config{$h}{'ipv4'} = $ipv4 if $ipv4; $config{$h}{'ipv4'} = $ipv4 if $ipv4;
$config{$h}{'ipv6'} = $ipv6 if $ipv6; $config{$h}{'ipv6'} = $ipv6 if $ipv6;
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
@ -4113,7 +4113,7 @@ sub nic_dyndns2_update {
($scale, $units) = (60*60, 'hours') if $units eq 'h'; ($scale, $units) = (60*60, 'hours') if $units eq 'h';
$sec = $wait * $scale; $sec = $wait * $scale;
foreach my $h (@hosts) { for my $h (@hosts) {
$config{$h}{'wtime'} = $now + $sec; $config{$h}{'wtime'} = $now + $sec;
} }
@ -4173,7 +4173,7 @@ sub nic_dnsexit2_update {
debug("\nnic_dnsexit2_update -------------------"); debug("\nnic_dnsexit2_update -------------------");
## Update each configured host (hosts cannot be grouped on this API) ## Update each configured host (hosts cannot be grouped on this API)
foreach my $h (@_) { for my $h (@_) {
# All the known status # All the known status
my %status = ( my %status = (
'0' => [ 'good', 'Success! Actions got executed successfully.' ], '0' => [ 'good', 'Success! Actions got executed successfully.' ],
@ -4191,7 +4191,7 @@ sub nic_dnsexit2_update {
# Updates for ipv4 and ipv6 need to be combined in a single API call, create Hash of Arrays for tracking # Updates for ipv4 and ipv6 need to be combined in a single API call, create Hash of Arrays for tracking
my %total_payload; my %total_payload;
foreach my $ip ($ipv4, $ipv6){ for my $ip ($ipv4, $ipv6){
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A'; my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A';
@ -4293,7 +4293,7 @@ sub nic_dnsexit2_update {
if ($status eq 'good') { if ($status eq 'good') {
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
my $tracked_ipv; my $tracked_ipv;
foreach $tracked_ipv ( keys %total_payload ){ for $tracked_ipv ( keys %total_payload ){
$config{$h}{"ipv$tracked_ipv"} = $total_payload{$tracked_ipv}{content}; $config{$h}{"ipv$tracked_ipv"} = $total_payload{$tracked_ipv}{content};
$config{$h}{"status-ipv$tracked_ipv"} = 'good'; $config{$h}{"status-ipv$tracked_ipv"} = 'good';
success("%s", $message); success("%s", $message);
@ -4340,14 +4340,14 @@ sub nic_noip_update {
); );
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $hosts = join(',', @hosts); my $hosts = join(',', @hosts);
my $h = $hosts[0]; my $h = $hosts[0];
my $ipv4 = $config{$h}{'wantipv4'}; my $ipv4 = $config{$h}{'wantipv4'};
my $ipv6 = $config{$h}{'wantipv6'}; my $ipv6 = $config{$h}{'wantipv6'};
delete $config{$_}{'wantipv4'} foreach @hosts; delete $config{$_}{'wantipv4'} for @hosts;
delete $config{$_}{'wantipv6'} foreach @hosts; delete $config{$_}{'wantipv6'} for @hosts;
info("setting IPv4 address to %s for %s", $ipv4, $hosts) if $ipv4; info("setting IPv4 address to %s for %s", $ipv4, $hosts) if $ipv4;
info("setting IPv6 address to %s for %s", $ipv6, $hosts) if $ipv6; info("setting IPv6 address to %s for %s", $ipv6, $hosts) if $ipv6;
@ -4374,7 +4374,7 @@ sub nic_noip_update {
my @reply = split /\n/, $reply; my @reply = split /\n/, $reply;
my $state = 'header'; my $state = 'header';
foreach my $line (@reply) { for my $line (@reply) {
if ($state eq 'header') { if ($state eq 'header') {
$state = 'body'; $state = 'body';
@ -4387,7 +4387,7 @@ sub nic_noip_update {
my ($status, $returnedips) = split / /, lc $line; my ($status, $returnedips) = split / /, lc $line;
my $h = shift @hosts; my $h = shift @hosts;
foreach my $ip (split_by_comma($returnedips)) { for my $ip (split_by_comma($returnedips)) {
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
$config{$h}{"status-ipv$ipv"} = $status; $config{$h}{"status-ipv$ipv"} = $status;
@ -4395,7 +4395,7 @@ sub nic_noip_update {
if ($status eq 'good') { if ($status eq 'good') {
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
foreach my $ip (split_by_comma($returnedips)) { for my $ip (split_by_comma($returnedips)) {
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
$config{$h}{"ipv$ipv"} = $ip; $config{$h}{"ipv$ipv"} = $ip;
@ -4406,7 +4406,7 @@ sub nic_noip_update {
if ($status eq 'nochg') { if ($status eq 'nochg') {
warning("updating %s: %s: %s", $h, $status, $errors{$status}); warning("updating %s: %s: %s", $h, $status, $errors{$status});
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
foreach my $ip (split_by_comma($returnedips)) { for my $ip (split_by_comma($returnedips)) {
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
$config{$h}{"ipv$ipv"} = $ip; $config{$h}{"ipv$ipv"} = $ip;
@ -4499,7 +4499,7 @@ EoEXAMPLE
sub nic_dslreports1_update { sub nic_dslreports1_update {
debug("\nnic_dslreports1_update -------------------"); debug("\nnic_dslreports1_update -------------------");
## update each configured host ## update each configured host
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:", "updating %s", $h); verbose("UPDATE:", "updating %s", $h);
@ -4524,7 +4524,7 @@ sub nic_dslreports1_update {
my @reply = split /\n/, $reply; my @reply = split /\n/, $reply;
my $return_code = ''; my $return_code = '';
foreach my $line (@reply) { for my $line (@reply) {
$return_code = $1 if $line =~ m%^return\s+code\s*:\s*(.*)\s*$%i; $return_code = $1 if $line =~ m%^return\s+code\s*:\s*(.*)\s*$%i;
} }
@ -4581,7 +4581,7 @@ sub nic_domeneshop_update {
## update each configured host ## update each configured host
## should improve to update in one pass ## should improve to update in one pass
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("Setting IP address to %s for %s", $ip, $h); info("Setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:", "Updating %s", $h); verbose("UPDATE:", "Updating %s", $h);
@ -4676,12 +4676,12 @@ sub nic_zoneedit1_update {
my %groups = group_hosts_by([ @_ ], [ qw(login password server zone) ]); my %groups = group_hosts_by([ @_ ], [ qw(login password server zone) ]);
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $hosts = join(',', @hosts); my $hosts = join(',', @hosts);
my $h = $hosts[0]; my $h = $hosts[0];
my $ip = $config{$h}{'wantip'}; my $ip = $config{$h}{'wantip'};
delete $config{$_}{'wantip'} foreach @hosts; delete $config{$_}{'wantip'} for @hosts;
info("setting IP address to %s for %s", $ip, $hosts); info("setting IP address to %s for %s", $ip, $hosts);
verbose("UPDATE:", "updating %s", $hosts); verbose("UPDATE:", "updating %s", $hosts);
@ -4705,7 +4705,7 @@ sub nic_zoneedit1_update {
next if !header_ok($hosts, $reply); next if !header_ok($hosts, $reply);
my @reply = split /\n/, $reply; my @reply = split /\n/, $reply;
foreach my $line (@reply) { for my $line (@reply) {
if ($h && $line =~ /^[^<]*<(SUCCESS|ERROR)\s+([^>]+)>(.*)/) { if ($h && $line =~ /^[^<]*<(SUCCESS|ERROR)\s+([^>]+)>(.*)/) {
my ($status, $assignments, $rest) = ($1, $2, $3); my ($status, $assignments, $rest) = ($1, $2, $3);
my ($left, %var) = parse_assignments($assignments); my ($left, %var) = parse_assignments($assignments);
@ -4823,14 +4823,14 @@ sub nic_easydns_update {
); );
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $hosts = join(',', @hosts); my $hosts = join(',', @hosts);
my $h = $hosts[0]; my $h = $hosts[0];
my $ipv4 = $config{$h}{'wantipv4'}; my $ipv4 = $config{$h}{'wantipv4'};
my $ipv6 = $config{$h}{'wantipv6'}; my $ipv6 = $config{$h}{'wantipv6'};
delete $config{$_}{'wantipv4'} foreach @hosts; delete $config{$_}{'wantipv4'} for @hosts;
delete $config{$_}{'wantipv6'} foreach @hosts; delete $config{$_}{'wantipv6'} for @hosts;
info("setting IP address to %s %s for %s", $ipv4, $ipv6, $hosts); info("setting IP address to %s %s for %s", $ipv4, $ipv6, $hosts);
verbose("UPDATE:", "updating %s", $hosts); verbose("UPDATE:", "updating %s", $hosts);
@ -4842,7 +4842,7 @@ sub nic_easydns_update {
$url .= "hostname=$hosts"; $url .= "hostname=$hosts";
$url .= "&myip="; $url .= "&myip=";
$url .= $ipv4 if $ipv4; $url .= $ipv4 if $ipv4;
foreach my $ipv6a ($ipv6) { for my $ipv6a ($ipv6) {
$url .= "&myip="; $url .= "&myip=";
$url .= $ipv6a $url .= $ipv6a
} }
@ -4867,7 +4867,7 @@ sub nic_easydns_update {
my @reply = split /\n/, $reply; my @reply = split /\n/, $reply;
my $state = 'header'; my $state = 'header';
foreach my $line (@reply) { for my $line (@reply) {
if ($state eq 'header') { if ($state eq 'header') {
$state = 'body'; $state = 'body';
@ -4958,7 +4958,7 @@ sub nic_namecheap_update {
debug("\nnic_namecheap1_update -------------------"); debug("\nnic_namecheap1_update -------------------");
## update each configured host ## update each configured host
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:", "updating %s", $h); verbose("UPDATE:", "updating %s", $h);
@ -5150,7 +5150,7 @@ sub nic_nfsn_update {
debug("\nnic_nfsn_update -------------------"); debug("\nnic_nfsn_update -------------------");
## update each configured host ## update each configured host
foreach my $h (@_) { for my $h (@_) {
my $zone = $config{$h}{'zone'}; my $zone = $config{$h}{'zone'};
my $name; my $name;
@ -5264,7 +5264,7 @@ EoEXAMPLE
sub nic_njalla_update { sub nic_njalla_update {
debug("\nnic_njalla_update -------------------"); debug("\nnic_njalla_update -------------------");
foreach my $h (@_) { for my $h (@_) {
# Read input params # Read input params
my $ipv4 = delete $config{$h}{'wantipv4'}; my $ipv4 = delete $config{$h}{'wantipv4'};
my $ipv6 = delete $config{$h}{'wantipv6'}; my $ipv6 = delete $config{$h}{'wantipv6'};
@ -5274,7 +5274,7 @@ sub nic_njalla_update {
# Build url # Build url
my $url = "https://$config{$h}{'server'}/update/?h=$h&k=$config{$h}{'password'}"; my $url = "https://$config{$h}{'server'}/update/?h=$h&k=$config{$h}{'password'}";
my $auto = 1; my $auto = 1;
foreach my $ip ($ipv4, $ipv6) { for my $ip ($ipv4, $ipv6) {
next if (!$ip); next if (!$ip);
$auto = 0; $auto = 0;
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
@ -5375,7 +5375,7 @@ sub nic_sitelutions_update {
debug("\nnic_sitelutions_update -------------------"); debug("\nnic_sitelutions_update -------------------");
## update each configured host ## update each configured host
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:", "updating %s", $h); verbose("UPDATE:", "updating %s", $h);
@ -5498,7 +5498,7 @@ sub nic_freedns_update {
$record_list_error = "failed to get record list from $url_tmpl"; $record_list_error = "failed to get record list from $url_tmpl";
} }
foreach my $h (@_) { for my $h (@_) {
next if (!$h); next if (!$h);
my $ipv4 = delete $config{$h}{'wantipv4'}; my $ipv4 = delete $config{$h}{'wantipv4'};
my $ipv6 = delete $config{$h}{'wantipv6'}; my $ipv6 = delete $config{$h}{'wantipv6'};
@ -5511,7 +5511,7 @@ sub nic_freedns_update {
} }
# IPv4 and IPv6 handling are similar enough to do in a loop... # IPv4 and IPv6 handling are similar enough to do in a loop...
foreach my $ip ($ipv4, $ipv6) { for my $ip ($ipv4, $ipv6) {
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A'; my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A';
@ -5594,7 +5594,7 @@ EoEXAMPLE
###################################################################### ######################################################################
sub nic_1984_update { sub nic_1984_update {
debug("\nnic_1984_update -------------------"); debug("\nnic_1984_update -------------------");
foreach my $host (@_) { for my $host (@_) {
my $ip = delete $config{$host}{'wantip'}; my $ip = delete $config{$host}{'wantip'};
info("setting IP address to %s for %s", $ip, $host); info("setting IP address to %s for %s", $ip, $host);
verbose("UPDATE:", "updating %s", $host); verbose("UPDATE:", "updating %s", $host);
@ -5678,7 +5678,7 @@ sub nic_changeip_update {
debug("\nnic_changeip_update -------------------"); debug("\nnic_changeip_update -------------------");
## update each configured host ## update each configured host
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:", "updating %s", $h); verbose("UPDATE:", "updating %s", $h);
@ -5763,7 +5763,7 @@ sub nic_godaddy_update {
my %groups = group_hosts_by([ @_ ], [ qw(server login password zone) ]); my %groups = group_hosts_by([ @_ ], [ qw(server login password zone) ]);
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
# Update each set configured host. # Update each set configured host.
@ -5774,7 +5774,7 @@ sub nic_godaddy_update {
my $zone = $config{$host}{'zone'}; my $zone = $config{$host}{'zone'};
(my $hostname = $host) =~ s/\.\Q$zone\E$//; (my $hostname = $host) =~ s/\.\Q$zone\E$//;
foreach my $ip ($ipv4, $ipv6) { for my $ip ($ipv4, $ipv6) {
next if (!$ip); next if (!$ip);
info("%s.%s -- Setting IP address to %s.", $hostname, $zone, $ip); info("%s.%s -- Setting IP address to %s.", $hostname, $zone, $ip);
@ -5900,7 +5900,7 @@ sub nic_googledomains_update {
my %groups = group_hosts_by([ @_ ], [ qw(server login password) ]); my %groups = group_hosts_by([ @_ ], [ qw(server login password) ]);
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $key = $hosts[0]; my $key = $hosts[0];
my $ip = $config{$key}{'wantip'}; my $ip = $config{$key}{'wantip'};
@ -5985,10 +5985,10 @@ sub nic_mythicdyn_update {
debug("\nnic_mythicdyn_update --------------------"); debug("\nnic_mythicdyn_update --------------------");
# Update each configured host. # Update each configured host.
foreach my $h (@_) { for my $h (@_) {
info("%s -- Setting IP address.", $h); info("%s -- Setting IP address.", $h);
foreach my $mythver ('4','6') { for my $mythver ('4','6') {
my $ip = $config{$h}{"wantipv$mythver"}; my $ip = $config{$h}{"wantipv$mythver"};
if (defined($ip)) { if (defined($ip)) {
@ -6080,7 +6080,7 @@ sub nic_nsupdate_update {
my %groups = group_hosts_by([ @_ ], [ qw(login password server zone) ]); my %groups = group_hosts_by([ @_ ], [ qw(login password server zone) ]);
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $hosts = join(',', @hosts); my $hosts = join(',', @hosts);
my $h = $hosts[0]; my $h = $hosts[0];
@ -6092,8 +6092,8 @@ sub nic_nsupdate_update {
my $zone = $config{$h}{'zone'}; my $zone = $config{$h}{'zone'};
my $ipv4 = $config{$h}{'wantipv4'}; my $ipv4 = $config{$h}{'wantipv4'};
my $ipv6 = $config{$h}{'wantipv6'}; my $ipv6 = $config{$h}{'wantipv6'};
delete $config{$_}{'wantipv4'} foreach @hosts; delete $config{$_}{'wantipv4'} for @hosts;
delete $config{$_}{'wantipv6'} foreach @hosts; delete $config{$_}{'wantipv6'} for @hosts;
info("setting IPv4 address to %s for %s", $ipv4, $hosts) if ($ipv4); info("setting IPv4 address to %s for %s", $ipv4, $hosts) if ($ipv4);
info("setting IPv6 address to %s for %s", $ipv6, $hosts) if ($ipv6); info("setting IPv6 address to %s for %s", $ipv6, $hosts) if ($ipv6);
@ -6104,8 +6104,8 @@ sub nic_nsupdate_update {
server $server server $server
zone $zone. zone $zone.
EoINSTR1 EoINSTR1
foreach (@hosts) { for (@hosts) {
foreach my $ip ($ipv4, $ipv6) { for my $ip ($ipv4, $ipv6) {
next if (!$ip); next if (!$ip);
my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A'; my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A';
$instructions .= <<"EoINSTR2"; $instructions .= <<"EoINSTR2";
@ -6125,9 +6125,9 @@ EoINSTR4
my $status = pipecmd($command, $instructions); my $status = pipecmd($command, $instructions);
if ($status eq 1) { if ($status eq 1) {
foreach (@hosts) { for (@hosts) {
$config{$_}{'mtime'} = $now; $config{$_}{'mtime'} = $now;
foreach my $ip ($ipv4, $ipv6) { for my $ip ($ipv4, $ipv6) {
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
$config{$_}{"ipv$ipv"} = $ip; $config{$_}{"ipv$ipv"} = $ip;
@ -6136,7 +6136,7 @@ EoINSTR4
} }
} }
} else { } else {
foreach (@hosts) { for (@hosts) {
failed("updating %s", $_); failed("updating %s", $_);
} }
} }
@ -6197,7 +6197,7 @@ sub nic_cloudflare_update {
my %groups = group_hosts_by([ @_ ], [ qw(ssh login password server wildcard mx backupmx zone) ]); my %groups = group_hosts_by([ @_ ], [ qw(ssh login password server wildcard mx backupmx zone) ]);
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $hosts = join(',', @hosts); my $hosts = join(',', @hosts);
my $key = $hosts[0]; my $key = $hosts[0];
@ -6248,7 +6248,7 @@ sub nic_cloudflare_update {
# IPv4 and IPv6 handling are similar enough to do in a loop... # IPv4 and IPv6 handling are similar enough to do in a loop...
foreach my $ip ($ipv4, $ipv6) { for my $ip ($ipv4, $ipv6) {
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A'; my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A';
@ -6345,7 +6345,7 @@ sub nic_hetzner_update {
my %groups = group_hosts_by([ @_ ], [ qw(ssh login password server wildcard mx backupmx zone) ]); my %groups = group_hosts_by([ @_ ], [ qw(ssh login password server wildcard mx backupmx zone) ]);
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $hosts = join(',', @hosts); my $hosts = join(',', @hosts);
my $key = $hosts[0]; my $key = $hosts[0];
@ -6391,7 +6391,7 @@ sub nic_hetzner_update {
# IPv4 and IPv6 handling are similar enough to do in a loop... # IPv4 and IPv6 handling are similar enough to do in a loop...
foreach my $ip ($ipv4, $ipv6) { for my $ip ($ipv4, $ipv6) {
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A'; my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A';
@ -6502,7 +6502,7 @@ sub nic_yandex_update {
my %groups = group_hosts_by([ @_ ], [ qw(server login pasword) ]); my %groups = group_hosts_by([ @_ ], [ qw(server login pasword) ]);
## update each set of hosts that had similar configurations ## update each set of hosts that had similar configurations
foreach my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $key = $hosts[0]; my $key = $hosts[0];
my $ip = $config{$key}{'wantip'}; my $ip = $config{$key}{'wantip'};
@ -6617,7 +6617,7 @@ sub nic_duckdns_update {
## update each configured host ## update each configured host
## should improve to update in one pass ## should improve to update in one pass
foreach my $h (@_) { for my $h (@_) {
my $ipv4 = delete $config{$h}{'wantipv4'}; my $ipv4 = delete $config{$h}{'wantipv4'};
my $ipv6 = delete $config{$h}{'wantipv6'}; my $ipv6 = delete $config{$h}{'wantipv6'};
info("setting IPv4 address to %s for %s", $ipv4, $h) if $ipv4; info("setting IPv4 address to %s for %s", $ipv4, $h) if $ipv4;
@ -6648,7 +6648,7 @@ sub nic_duckdns_update {
my $state = 'noresult'; my $state = 'noresult';
my $line = ''; my $line = '';
foreach $line (@reply) { for $line (@reply) {
if ($line eq 'OK') { if ($line eq 'OK') {
$config{$h}{'ipv4'} = $ipv4 if $ipv4; $config{$h}{'ipv4'} = $ipv4 if $ipv4;
$config{$h}{'ipv6'} = $ipv6 if $ipv6; $config{$h}{'ipv6'} = $ipv6 if $ipv6;
@ -6707,7 +6707,7 @@ EoEXAMPLE
sub nic_freemyip_update { sub nic_freemyip_update {
debug("\nnic_freemyip_update -------------------"); debug("\nnic_freemyip_update -------------------");
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:", "updating %s", $h); verbose("UPDATE:", "updating %s", $h);
@ -6864,7 +6864,7 @@ sub nic_woima_update {
my $state = 'header'; my $state = 'header';
my $returnedip = $ip; my $returnedip = $ip;
foreach my $line (@reply) { for my $line (@reply) {
if ($state eq 'header') { if ($state eq 'header') {
$state = 'body'; $state = 'body';
@ -6950,7 +6950,7 @@ sub nic_dondominio_update {
## update each configured host ## update each configured host
## should improve to update in one pass ## should improve to update in one pass
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:", "updating %s", $h); verbose("UPDATE:", "updating %s", $h);
@ -7040,7 +7040,7 @@ sub nic_dnsmadeeasy_update {
## update each configured host ## update each configured host
## should improve to update in one pass ## should improve to update in one pass
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("Setting IP address to %s for %s", $ip, $h); info("Setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:", "Updating %s", $h); verbose("UPDATE:", "Updating %s", $h);
@ -7114,7 +7114,7 @@ sub nic_ovh_update {
## update each configured host ## update each configured host
## should improve to update in one pass ## should improve to update in one pass
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:","updating %s", $h); verbose("UPDATE:","updating %s", $h);
@ -7235,7 +7235,7 @@ EoEXAMPLE
sub nic_porkbun_update { sub nic_porkbun_update {
debug("\nnic_porkbun_update -------------------"); debug("\nnic_porkbun_update -------------------");
foreach my $host (@_) { for my $host (@_) {
my ($sub_domain, $domain); my ($sub_domain, $domain);
if ($config{$host}{'root-domain'} ne '') { if ($config{$host}{'root-domain'} ne '') {
# Process 'root-domain' option # Process 'root-domain' option
@ -7262,7 +7262,7 @@ sub nic_porkbun_update {
} }
info("subdomain %s, root domain %s", $sub_domain, $domain) if $sub_domain ne ''; info("subdomain %s, root domain %s", $sub_domain, $domain) if $sub_domain ne '';
foreach my $ipv ('ipv4', 'ipv6') { for my $ipv ('ipv4', 'ipv6') {
my $ip = delete $config{$host}{"want$ipv"}; my $ip = delete $config{$host}{"want$ipv"};
if (!$ip) { if (!$ip) {
next; next;
@ -7547,8 +7547,8 @@ EoEXAMPLE
sub nic_gandi_update { sub nic_gandi_update {
debug("\nnic_gandi_update -------------------"); debug("\nnic_gandi_update -------------------");
# Update each set configured host. # Update each set configured host.
foreach my $h (@_) { for my $h (@_) {
foreach my $ipv ('ipv4', 'ipv6') { for my $ipv ('ipv4', 'ipv6') {
my $ip = delete $config{$h}{"want$ipv"}; my $ip = delete $config{$h}{"want$ipv"};
if(!$ip) { if(!$ip) {
next; next;
@ -7676,7 +7676,7 @@ sub nic_keysystems_update {
## update each configured host ## update each configured host
## should improve to update in one pass ## should improve to update in one pass
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("KEYSYSTEMS setting IP address to %s for %s", $ip, $h); info("KEYSYSTEMS setting IP address to %s for %s", $ip, $h);
@ -7812,7 +7812,7 @@ EoEXAMPLE
sub nic_enom_update { sub nic_enom_update {
debug("\nenom_update -------------------"); debug("\nenom_update -------------------");
## update each configured host ## update each configured host
foreach my $h (@_) { for my $h (@_) {
my $ip = delete $config{$h}{'wantip'}; my $ip = delete $config{$h}{'wantip'};
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:","updating %s", $h); verbose("UPDATE:","updating %s", $h);
@ -7956,7 +7956,7 @@ sub nic_digitalocean_update_one {
sub nic_digitalocean_update { sub nic_digitalocean_update {
debug("\nnic_digitalocean_update -------------------"); debug("\nnic_digitalocean_update -------------------");
foreach my $h (@_) { for my $h (@_) {
my $ipv4 = delete $config{$h}{'wantipv4'}; my $ipv4 = delete $config{$h}{'wantipv4'};
my $ipv6 = delete $config{$h}{'wantipv6'}; my $ipv6 = delete $config{$h}{'wantipv6'};
@ -8024,9 +8024,9 @@ EoEXAMPLE
sub nic_infomaniak_update { sub nic_infomaniak_update {
debug("\nnic_infomaniak_update -------------------"); debug("\nnic_infomaniak_update -------------------");
foreach my $h (@_) { for my $h (@_) {
INFOMANIAK_IP_LOOP: INFOMANIAK_IP_LOOP:
foreach my $v (4, 6) { for my $v (4, 6) {
my $ip = delete $config{$h}{"wantipv$v"}; my $ip = delete $config{$h}{"wantipv$v"};
if (!defined $ip) { if (!defined $ip) {
@ -8062,7 +8062,7 @@ sub nic_infomaniak_update {
my $reply; my $reply;
foreach my $url ($url1, $url2) { for my $url ($url1, $url2) {
info("trying update with %s", $url); info("trying update with %s", $url);
$reply = geturl(proxy => opt('proxy'), url => $url); $reply = geturl(proxy => opt('proxy'), url => $url);
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {