Code

Updated kerberos URI dependencies
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 4 Dec 2008 08:10:33 +0000 (08:10 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 4 Dec 2008 08:10:33 +0000 (08:10 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13159 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_password-methods-MIT.inc

index 9c9218a683698e622d46e8c445323c9a397f147b..f41b114257e1cc56e5e4a4e673595b43a8b5e002 100644 (file)
@@ -111,7 +111,7 @@ class passwordMethodMIT extends passwordMethod
     /* No config object given, this may be the case 
        if there is only a is_available() request triggered.
      */
-    if(!is_object($config) || !$this->is_available()){
+    if(!is_object($config)){
       return;
     }  
 
@@ -284,14 +284,16 @@ class passwordMethodMIT extends passwordMethod
     $cache = session::get("MIT_PRINCIPAL_CACHE");
     if(!isset($cache[$server])){
       $o = new gosaSupportDaemon();
-      $tmp = $o->krb5_list_principals($server);
-      if($o->is_error()){
-        $this->si_error     = TRUE;
-        $this->si_error_msg = sprintf(_("Cannot load principals from server '%s'!"),$server).":&nbsp;<br>".$o->get_error(); 
-        msg_dialog::display(_("Service infrastructure"),msgPool::siError($o->get_error()),ERROR_DIALOG);
-        return(array());
-      }else{
-        $cache[$server] = $tmp;
+      if($o->is_configured()){
+        $tmp = $o->krb5_list_principals($server);
+        if($o->is_error()){
+          $this->si_error     = TRUE;
+          $this->si_error_msg = sprintf(_("Cannot load principals from server '%s'!"),$server).":&nbsp;<br>".$o->get_error(); 
+          msg_dialog::display(_("Service infrastructure"),msgPool::siError($o->get_error()),ERROR_DIALOG);
+          return(array());
+        }else{
+          $cache[$server] = $tmp;
+        }
       }
       session::set("MIT_PRINCIPAL_CACHE",$cache);
     }
@@ -339,6 +341,7 @@ class passwordMethodMIT extends passwordMethod
   {
   
     $o = new gosaSupportDaemon(FALSE);
+
     if(count($this->server_list) && $o->connect() && $o->is_configured()){
       return TRUE; 
     }