More IPv6 friendly conversions

diff --git a/qmailadmin/save_defroute.cgi b/qmailadmin/save_defroute.cgi
index b8f363f..d94aff9 100755 (executable)
--- a/qmailadmin/save_defroute.cgi
+++ b/qmailadmin/save_defroute.cgi
@@ -12,9 +12,8 @@ if ($old && $in{'direct'}) {
        &delete_route($old);
        }
 else {
-       gethostbyname($in{'defroute'}) ||
-               &check_ipaddress($in{'defroute'}) ||
-                       &error(&text('rsave_eto', $in{'defroute'}));
+       &to_ipaddress($in{'defroute'}) || &to_ip6address($in{'defroute'}) ||
+               &error(&text('rsave_eto', $in{'defroute'}));
        if ($old) {
                &modify_route($old, { 'from' => '',
                                      'to' => $in{'defroute'} } );

diff --git a/qmailadmin/save_route.cgi b/qmailadmin/save_route.cgi
index 38bfd60..514636d 100755 (executable)
--- a/qmailadmin/save_route.cgi
+++ b/qmailadmin/save_route.cgi
@@ -18,8 +18,8 @@ else {
        # saving or creating .. check inputs
        $in{'from'} =~ /^[A-Za-z0-9\.\-]+$/ ||
                &error(&text('rsave_efrom', $in{'from'}));
-       $in{'to_def'} || gethostbyname($in{'to'}) ||
-               &check_ipaddress($in{'to'}) ||
+       $in{'to_def'} ||
+           &to_ipaddress($in{'to'}) || &to_ip6address($in{'to'}) ||
                        &error(&text('rsave_eto', $in{'to'}));
        $in{'port_def'} || $in{'port'} =~ /^\d+$/ ||
                &error(&text('rsave_eport', $in{'port'}));

diff --git a/sentry/save_hostsentry.cgi b/sentry/save_hostsentry.cgi
index 2b8d9eb..b67b985 100755 (executable)
--- a/sentry/save_hostsentry.cgi
+++ b/sentry/save_hostsentry.cgi
@@ -21,7 +21,7 @@ if (defined($in{'foreign'})) {
 if (defined($in{'multiple'})) {
        @multiple = split(/\s+/, $in{'multiple'});
        foreach $m (@multiple) {
-               gethostbyname($m) || &check_ipaddress($m) ||
+               &to_ipaddress($m) ||
                        &error(&text('hostsentry_emultiple', $m));
                }
        }

diff --git a/sentry/save_portsentry.cgi b/sentry/save_portsentry.cgi
index 8505db5..3c82de1 100755 (executable)
--- a/sentry/save_portsentry.cgi
+++ b/sentry/save_portsentry.cgi
@@ -54,7 +54,7 @@ if (defined($in{'ignore'})) {
        $in{'ignore'} =~ s/\r//g;
        $in{'ignore'} =~ s/\n*$/\n/;
        foreach $h (split(/\s+/, $in{'ignore'})) {
-               gethostbyname($h) || &check_ipaddress($h) ||
+               &to_ipaddress($h) ||
                  ($h =~ /^([0-9\.]+)\/(\d+)/ && &check_ipaddress($1)) ||
                        &error(&text('portsentry_eignore', $h));
                }

diff --git a/zones/create_zone.cgi b/zones/create_zone.cgi
index 7f7cee4..dad5436 100755 (executable)
--- a/zones/create_zone.cgi
+++ b/zones/create_zone.cgi
@@ -81,7 +81,7 @@ if ($in{'cfg'}) {
                        [ "none", [ 'hostname' => $hostname ] ] ]);
                }
        else {
-               gethostbyname($hostname) ||
+               &to_ipaddress($hostname) ||
                        $form->validate_redirect("create_form.cgi",
                            [ [ "hostname", $text{'create_eresolvname'} ] ]);
                push(@sysidcfg, [ 'network_interface' =>