From d0a33873c378ab6f27b3a3bc82e8c1e9116a4933 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 8 Jun 2006 05:12:42 +0000 Subject: [PATCH] Fixed kerberos git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3693 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_goKrbServer.inc | 19 ++++++++++--------- plugins/admin/systems/goKrbServer.tpl | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc index 34dd98309..f2637b541 100644 --- a/plugins/admin/systems/class_goKrbServer.inc +++ b/plugins/admin/systems/class_goKrbServer.inc @@ -115,15 +115,16 @@ class goKrbServer extends plugin{ function check() { $message = plugin::check(); - foreach (array("goKrbAdmin", "goKrbRealm") as $attr){ - if ($this->$attr == "" || preg_match("/ /", $this->$attr)){ - $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), $attr); - } - } - /* goKrbPassword is a must field, if goKrbServer is used as objectClass */ - if ($this->goKrbPassword == "" ){ - $message[]= sprintf(_("The specified kerberos password is empty."), $attr); - } + /* goKrbPassword is a must field, if goKrbServer is used as objectClass */ + if (empty($this->goKrbPassword)){ + $message[]= sprintf(_("The specified kerberos password is empty."), $attr); + } + if (empty($this->goKrbAdmin)){ + $message[]= sprintf(_("The specified kerberos admin is empty."), $attr); + } + if (empty($this->goKrbRealm)){ + $message[]= sprintf(_("The specified kerberos realm is empty."), $attr); + } return($message); } diff --git a/plugins/admin/systems/goKrbServer.tpl b/plugins/admin/systems/goKrbServer.tpl index 8227b54b9..ed20b8a87 100644 --- a/plugins/admin/systems/goKrbServer.tpl +++ b/plugins/admin/systems/goKrbServer.tpl @@ -1,15 +1,15 @@

{t}Kerberos kadmin access{/t}

- + - + - +
{t}Kerberos Realm{/t}{t}Kerberos Realm{/t}{$must}
{t}Admin user{/t}{t}Admin user{/t}{$must}
{t}Password{/t}{t}Password{/t}{$must}
-- 2.30.2