Code

Updated FAI release/class selection
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 8 Mar 2006 09:46:26 +0000 (09:46 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 8 Mar 2006 09:46:26 +0000 (09:46 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2823 594d385d-05f5-0310-b6e9-bd551577e9d8

plugins/admin/systems/class_servKolab.inc
plugins/admin/systems/class_workstationStartup.inc

index 3303af3ff712f6ab0639c677cc146ae016662537..d2e5eb0b637cfe17ca532c086acb261f91928ea3 100644 (file)
@@ -241,9 +241,10 @@ $ldap->modify ($attrs);
       $message[] = _("No SMTP privileged networks set.");
     }
 
-    if(empty($this->postfix_relayhost)) {
+    /*if(empty($this->postfix_relayhost)) {
       $message[] = _("No SMTP smarthost/relayhost set.");
     }
+    */
 
     return ($message);
   }
index 11f02446bca237f1a4c5411952e6922efe84e958..7da87990b0993a3b70ee5dd50c6bb00f1e7573ec 100644 (file)
@@ -220,8 +220,8 @@ class workstartup extends plugin
 
 
     foreach($this->FAIclasses as $class){
-      
-      if(($this->FAIdebianMirror != "auto") && (!preg_match("/ou=".$this->FAIrelease."/",$this->FAIclassInfo[$class]['REST']['dn']))){
+      //  (!preg_match("/ou=".$this->FAIrelease."/",$this->FAIclassInfo[$class]['REST']['dn']))
+      if(($this->FAIdebianMirror != "auto") && (stristr($this->FAIclassInfo[$class]['REST']['dn'],"ou=".$this->FAIrelease) == false)){
         continue;
       }
       $str    = "";