Merge pull request #281 from Zentyal/jag/squid-network-depend

Guard against previous version of squid without authenticationMode metho...
zentyal · Apr 12, 2013 · df01981 · df01981
2 parents f978a6b + aab6c39
commit df01981
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/main/network/ChangeLog b/main/network/ChangeLog
@@ -1,3 +1,6 @@
+HEAD
+	+ Guard against previous version of squid without
+	  authenticationMode method
 3.0.4
 	+ Improve addition of localhost as primary resolver when DNS module is
 	  enabled.

diff --git a/main/network/src/EBox/Model/DNSResolver.pm b/main/network/src/EBox/Model/DNSResolver.pm
@@ -150,7 +150,7 @@ sub syncRows
     # as primary resolver instead localhost
     if (EBox::Global->modExists('squid')) {
         my $squid = EBox::Global->modInstance('squid');
-        if ($squid->isEnabled()) {
+        if ($squid->isEnabled() and $squid->can('authenticationMode')) {
             my $mode = $squid->authenticationMode();
             if ($mode eq $squid->AUTH_MODE_EXTERNAL_AD()) {
                 $add = 0;