michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More IPv6 function conversions

Browse Source
This commit is contained in:
Jamie Cameron
2010-11-06 23:32:08 -07:00
parent 0c9146653c
commit 4c450423a9
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ipfw/save_rule.cgi
View File

@@ -158,12 +158,11 @@ else {
$rule->{$s} = "me"; $rule->{$s} = "me";
} }
else { else {
gethostbyname($in{$s}) || &to_ipaddress($in{$s}) ||
&check_ipaddress($in{$s}) ||
($in{$s} =~ /^([0-9\.]+)\/(\d+)$/ && ($in{$s} =~ /^([0-9\.]+)\/(\d+)$/ &&
&check_ipaddress($1)) || &check_ipaddress("$1")) ||
($in{$s} =~ /^([0-9\.]+)\/(\d+)\{([0-9,]+)\}$/ && ($in{$s} =~ /^([0-9\.]+)\/(\d+)\{([0-9,]+)\}$/ &&
&check_ipaddress($1) && &check_ipaddress("$1") &&
$ipfw_version >= 2) || $ipfw_version >= 2) ||
&error($text{'save_e'.$s}); &error($text{'save_e'.$s});
$rule->{$s} = $in{$s}; $rule->{$s} = $in{$s};

2
ipsec/save.cgi
View File

@@ -119,7 +119,7 @@ else {
$conn->{'values'}->{$d} = '%opportunistic'; $conn->{'values'}->{$d} = '%opportunistic';
} }
else { else {
gethostbyname($in{$d}) || &error($text{"save_e${d}"}); &to_ipaddress($in{$d}) || &error($text{"save_e${d}"});
$conn->{'values'}->{$d} = $in{$d}; $conn->{'values'}->{$d} = $in{$d};
} }

3
ldap-client/save_server.cgi
View File

@@ -31,7 +31,8 @@ else {
# Set host and port directives # Set host and port directives
@hosts = split(/\s+/, $in{'host'}); @hosts = split(/\s+/, $in{'host'});
foreach $h (@hosts) { foreach $h (@hosts) {
gethostbyname($h) || &error(&text('server_ehost', $h)); &to_ipaddress($h) || &to_ip6address($h) ||
&error(&text('server_ehost', $h));
} }
@hosts || &error($text{'server_ehosts'}); @hosts || &error($text{'server_ehosts'});
&save_directive($conf, "host", join(" ", @hosts)); &save_directive($conf, "host", join(" ", @hosts));

2
pap/save_secret.cgi
View File

@@ -35,7 +35,7 @@ elsif ($in{'ips_mode'} == 1) { $sec{'ips'} = [ "-" ]; }
elsif ($in{'ips_mode'} == 2) { elsif ($in{'ips_mode'} == 2) {
@ips = split(/\s+/, $in{'ips'}); @ips = split(/\s+/, $in{'ips'});
foreach $ip (@ips) { foreach $ip (@ips) {
if (!gethostbyname($ip)) { if (!&to_ipaddress($ip)) {
&error(&text('save_secret_enoip', $ip)); &error(&text('save_secret_enoip', $ip));
} }
} }

2
postfix/save_master.cgi
View File

@@ -25,7 +25,7 @@ else {
$prog->{'enabled'} = $in{'enabled'}; $prog->{'enabled'} = $in{'enabled'};
$in{'name'} =~ /^\S+$/ || &error($text{'master_ename'}); $in{'name'} =~ /^\S+$/ || &error($text{'master_ename'});
if (!$in{'host_def'}) { if (!$in{'host_def'}) {
gethostbyname($in{'host'}) || &error($text{'master_ehost'}); &to_ipaddress($in{'host'}) || &error($text{'master_ehost'});
$in{'type'} eq 'inet' || &error($text{'master_einet'}); $in{'type'} eq 'inet' || &error($text{'master_einet'});
$prog->{'name'} = $in{'host'}.":".$in{'name'}; $prog->{'name'} = $in{'host'}.":".$in{'name'};
} }