From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 19 Oct 2007 12:24:37 +0000 (+0000)
Subject: Updated serial check
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5d26776d28d6c94e7d792f4bc750fab9c993463a;p=gosa.git

Updated serial check


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7599 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/include/class_password-methods-heimdal.inc b/include/class_password-methods-heimdal.inc
index f136aa6e0..fb0874747 100644
--- a/include/class_password-methods-heimdal.inc
+++ b/include/class_password-methods-heimdal.inc
@@ -21,6 +21,7 @@
 
 class passwordMethodheimdal extends passwordMethod
 {
+
 	function passwordMethodheimdal(&$config)  
 	{
     $this->config= $config;
@@ -31,6 +32,9 @@ class passwordMethodheimdal extends passwordMethod
 	{
     # Check if heimdal information is available
     # in configuration and return true/false
+    #
+    # In particular, we need the hook to feed kadmin
+    #
     return true;
 	}
 
@@ -55,6 +59,7 @@ class passwordMethodheimdal extends passwordMethod
   function set_password()
   {
     # Add or modify kerberos entry below $this->dn
+
   }
 
 
diff --git a/plugins/admin/devices/class_deviceGeneric.inc b/plugins/admin/devices/class_deviceGeneric.inc
index f583e3f9e..46d582145 100644
--- a/plugins/admin/devices/class_deviceGeneric.inc
+++ b/plugins/admin/devices/class_deviceGeneric.inc
@@ -76,7 +76,7 @@ class deviceGeneric extends plugin
     }
 
     /* Skip serial check if vendor and product id are given */
-    if(preg_match("/^[0-9a-z]+$/i",$this->dev_id)){
+    if(preg_match("/^\s+$/i",$this->dev_id)){
       $message[]=_("Please specify a valid iSerial.");
     }
     if(empty($this->serial) || !$this->is_2byteHex($this->serial)){