IPv6 friendly functions
authorJamie Cameron <jcameron@webmin.com>
Sun, 7 Nov 2010 06:14:56 +0000 (23:14 -0700)
committerJamie Cameron <jcameron@webmin.com>
Sun, 7 Nov 2010 06:14:56 +0000 (23:14 -0700)
pptp-client/save.cgi
pptp-server/save_secret.cgi

index 3367563..4d70d8b 100755 (executable)
@@ -28,7 +28,7 @@ if ($in{'delete'}) {
 else {
        # Validate inputs
        $in{'tunnel'} =~ /\S/ || &error($text{'save_ename'});
-       gethostbyname($in{'server'}) || &error($text{'save_eserver'});
+       &to_ipaddress($in{'server'}) || &error($text{'save_eserver'});
        $in{'login_def'} || $in{'login'} =~ /^\S+$/ ||
                &error($text{'save_elogin'});
        $in{'remote_def'} || $in{'remote'} =~ /^\S+$/ ||
@@ -44,7 +44,7 @@ else {
                push(@routes, "add default dev TUNNEL_DEV");
                }
        elsif ($in{'adddef'} == 2) {
-               gethostbyname($in{'def'}) || &error($text{'save_edef'});
+               &to_ipaddress($in{'def'}) || &error($text{'save_edef'});
                push(@routes, "add default gw ".$in{'def'});
                }
 
index f1164f1..f5114c8 100755 (executable)
@@ -35,7 +35,7 @@ elsif ($in{'ips_mode'} == 1) { $sec{'ips'} = [ "-" ]; }
 elsif ($in{'ips_mode'} == 2) {
        @ips = split(/\s+/, $in{'ips'});
        foreach $ip (@ips) {
-               if (!gethostbyname($ip)) {
+               if (!&to_ipaddress($ip)) {
                        &error(&text('save_secret_enoip', $ip));
                        }
                }