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

Remove ancient check for old old BIND versions https://github.com/webmin/webmin/issues/1167

Browse Source
This commit is contained in:
Jamie Cameron
2020-02-29 16:23:32 -08:00
parent 19e00b1be6
commit aab3c255fc
4 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bind8/bind8-lib.pl
View File

@@ -1597,16 +1597,8 @@ if (($opts = &find("options", $conf)) &&
return 1;
}
# check_bind_8()
# Returns the --help output if non BIND 8/9, or undef if is
sub check_bind_8
{
my $fflag = $gconfig{'os_type'} eq 'windows' ? '-f' : '';
my $out = `$config{'named_path'} -help $fflag 2>&1`;
return $out !~ /\[-f\]/ && $out !~ /\[-f\|/ ? $out : undef;
}
my $get_chroot_cache;
# get_chroot()
# Returns the chroot directory BIND is running under
sub get_chroot

12
bind8/index.cgi
View File

@@ -30,18 +30,6 @@ if (!-x $config{'named_path'}) {
exit;
}
# Check if BIND is the right version.. Only BIND 8/9 offers the -f option
# Is there a better way to do this?
if (my $out = &check_bind_8()) {
&ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0,
&help_search_link("bind", "doc", "google"));
print "<p>",&text('index_eversion', "<tt>$config{'named_path'}</tt>",
"/dnsadmin/", "<tt>$config{'named_path'} -help</tt>",
"<pre>$out</pre>"),"<p>\n";
&ui_print_footer("/", $text{"index"});
exit;
}
# Try to get the version number, and save for later calls
my $bind_version = &get_bind_version();
if ($bind_version && $bind_version =~ /^(\d+\.\d+)\./) {

1
bind8/install_check.pl
View File

@@ -12,7 +12,6 @@ do 'bind8-lib.pl';
sub is_installed
{
return 0 if (!-x $config{'named_path'});
return 0 if (&check_bind_8());
if ($_[0]) {
return 2 if (-r &make_chroot($config{'named_conf'}) &&
&is_config_valid());

1
bind8/lang/en
View File

@@ -1,6 +1,5 @@
index_title=BIND DNS Server
index_enamed=The BIND DNS server $1 could not be found on your system. Maybe it is not installed, or your <a href='$2'>BIND module configuration</a> is incorrect.
index_eversion=The server executable $1 does not appear to be BIND 8 or 9. Maybe your should use the <a href='$2'>BIND 4 module</a> instead. Output from the command $3 was : $4
index_eempty=The primary configuration file for BIND $1 does not exist, or is not valid. Create it?
index_local=Setup nameserver for internal non-internet use only
index_download=Setup as an internet name server, and download root server information