Fixes for Debian

virtualmin · May 27, 2017 · 85c604f · 85c604f
1 parent 32786dd
commit 85c604f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/lib/Virtualmin/Config/LAMP.pm b/lib/Virtualmin/Config/LAMP.pm
@@ -13,13 +13,13 @@ sub new {
 }
 
 sub plugins {
-  return (
+  return [
     "Webmin",  "Apache",  "Bind",    "Dovecot",   "Net",
     "AWStats", "Postfix", "MySQL",   "Firewall",  "Procmail",
     "ProFTPd", "Quotas",  "SASL",    "Shells",    "Status",
     "Upgrade", "Quotas",  "Usermin", "Webalizer", "Virtualmin",
     "Extra",   "ClamAV"
-  );
+  ];
 }
 
 1;
diff --git a/lib/Virtualmin/Config/Plugin/Bind.pm b/lib/Virtualmin/Config/Plugin/Bind.pm
@@ -102,8 +102,13 @@ sub actions {
       foreach my $dir ("listen-on", "listen-on-v6") {
         my @listen = bind8::find($dir, $options->{'members'});
         next if (!@listen);
+        # XXX This is ridiculous.
         next if (!defined($listen[0]->{'values'})
-              && !defined($listen[0]->{'type'}));
+              || !defined($listen[0]->{'values'}->[0])
+              || !defined($listen[0]->{'values'}->[1])
+              || !defined($listen[0]->{'type'})
+              || !defined($listen[0]->{'members'})
+              || !defined($listen[0]->{'members'}->[0]->{'name'}));
         if (
              $listen[0]->{'values'}->[0] eq 'port'
           && $listen[0]->{'values'}->[1] eq '53'

diff --git a/lib/Virtualmin/Config/Plugin/Extra.pm b/lib/Virtualmin/Config/Plugin/Extra.pm
@@ -17,8 +17,8 @@ sub new {
   # inherit from Plugin
   my $self = $class->SUPER::new(
     name     => 'Extra',
-    depends => 'Apache',
-    'Webmin', 'Virtualmin'
+    depends => [ 'Apache',
+    'Webmin', 'Virtualmin' ]
   );
 
   return $self;