From a6c67acba52b4440585c01b051bb28025ddb0d4d Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 8 Mar 2006 09:46:26 +0000 Subject: [PATCH] Updated FAI release/class selection git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2823 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_servKolab.inc | 3 ++- plugins/admin/systems/class_workstationStartup.inc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc index 3303af3ff..d2e5eb0b6 100644 --- a/plugins/admin/systems/class_servKolab.inc +++ b/plugins/admin/systems/class_servKolab.inc @@ -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); } diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc index 11f02446b..7da87990b 100644 --- a/plugins/admin/systems/class_workstationStartup.inc +++ b/plugins/admin/systems/class_workstationStartup.inc @@ -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 = ""; -- 2.30.2