mirror of
https://github.com/webmin/webmin.git
synced 2026-05-04 22:30:33 +01:00
No-address fixes
This commit is contained in:
@@ -44,6 +44,7 @@ ifcs_range=Range $1
|
||||
ifcs_static2=Static configuration
|
||||
ifcs_static3=IPv6 enabled
|
||||
ifcs_noaddress=No address configured
|
||||
ifcs_nonetmask=None
|
||||
ifcs_mode=IPv4 address
|
||||
ifcs_mode6=IPv6 addresses
|
||||
ifcs_address6=IPv6 address
|
||||
|
||||
@@ -209,8 +209,9 @@ foreach $a (@boot) {
|
||||
$a->{'dhcp'} ? $text{'ifcs_dhcp'} :
|
||||
$a->{'address'} ? &html_escape($a->{'address'}) :
|
||||
$text{'ifcs_noaddress'});
|
||||
push(@cols, $a->{'netmask'} ? &html_escape($a->{'netmask'})
|
||||
: $text{'ifcs_auto'});
|
||||
push(@cols, $a->{'netmask'} ? &html_escape($a->{'netmask'}) :
|
||||
!$a->{'address'} ? $text{'ifcs_nonetmask'} :
|
||||
$text{'ifcs_auto'});
|
||||
if (&supports_address6()) {
|
||||
push(@cols, $a->{'auto6'} ? $text{'ifcs_auto6'} :
|
||||
join("<br>\n", map { &html_escape($_) }
|
||||
|
||||
@@ -117,7 +117,7 @@ while($f = readdir(CONF)) {
|
||||
$b->{'address6'} = [ map { $_->[0] } @ip6s ];
|
||||
$b->{'netmask6'} = [ map { $_->[1] } @ip6s ];
|
||||
}
|
||||
elsif ($conf{'IPV6INIT'}) {
|
||||
elsif (lc($conf{'IPV6INIT'}) eq 'yes') {
|
||||
$b->{'auto6'} = 1;
|
||||
}
|
||||
$b->{'edit'} = ($b->{'name'} !~ /^ppp|irlan/);
|
||||
|
||||
Reference in New Issue
Block a user