Removed duplicated hash detection

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

diff --git a/include/class_password-methods.inc b/include/class_password-methods.inc
index 6ea694f20cd48cd4d07ca30c9da0e020dd608615..97546decf7b12b173c6ef93a5af86dfd7c527eea 100644 (file)
--- a/include/class_password-methods.inc
+++ b/include/class_password-methods.inc
@@ -113,16 +113,16 @@ function change_password ($dn, $password, $mode=0, $hash= "")
     $deactivated = FALSE;
   }
 
-  // Get current password hash method if available 
-  if($hash == "" && isset($attrs['userPassword'][0]) && preg_match("/[\{\}]/",$attrs['userPassword'][0])){
-    $hash = preg_replace("/^[^\{]*+\{([^\}]*).*$/","\\1",$attrs['userPassword'][0]);
-    $hash = strtolower($hash);
-  }
-
-  // Set encryption type to clear if required 
-  if (!isset($attrs['userPassword'][0]) || $hash == ""){
-    $hash= "clear";
-  }
+#  // Get current password hash method if available 
+#  if($hash == "" && isset($attrs['userPassword'][0]) && preg_match("/[\{\}]/",$attrs['userPassword'][0])){
+#    $hash = preg_replace("/^[^\{]*+\{([^\}]*).*$/","\\1",$attrs['userPassword'][0]);
+#    $hash = strtolower($hash);
+#  }
+
+#  // Set encryption type to clear if required 
+#  if (!isset($attrs['userPassword'][0]) || $hash == ""){
+#    $hash= "clear";
+#  }
 
   // Detect the encryption Method
   if ( (isset($attrs['userPassword'][0]) &&  preg_match ("/^{([^}]+)}(.+)/", $attrs['userPassword'][0], $matches)) ||  $hash != ""){