From 9b5b7a6ae3d8a3f7e31a607c0113d382fab356e3 Mon Sep 17 00:00:00 2001
From: Kilian Cavalotti <kilian@stanford.edu>
Date: Fri, 24 Feb 2017 15:11:55 -0800
Subject: [PATCH] PasswordUtils.pm: don't crypt already hashed passwords

---
 xCAT-server/lib/perl/xCAT/PasswordUtils.pm | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/PasswordUtils.pm b/xCAT-server/lib/perl/xCAT/PasswordUtils.pm
index d9647deec..e17ac14a5 100644
--- a/xCAT-server/lib/perl/xCAT/PasswordUtils.pm
+++ b/xCAT-server/lib/perl/xCAT/PasswordUtils.pm
@@ -149,16 +149,21 @@ sub crypt_system_password {
             "ERROR: Unable to get password from database table $table, key=$key");
         return undef;
     }
-    $cryptmethod = $data->{'cryptmethod'};
-    if (!$cryptmethod) {
-        # Use sha256 crypt method by default
-        $result = crypt($password, $CRYPT_METHOD{'sha256'} . xCAT::Utils::genpassword(8));
-    } elsif( defined($CRYPT_METHOD{$cryptmethod})) {
-        $result = crypt($password,
-            $CRYPT_METHOD{$cryptmethod} . xCAT::Utils::genpassword(8));
+    if (($password =~ /^\$1\$/) || ($password =~ /^\$5\$/) || ($password =~ /^\$6\$/)) {
+        # $password is already hashed
+        $result = $password;
     } else {
-        xCAT::MsgUtils->message("S", "Unsupported crypt method $cryptmethod");
-        return undef;
+        $cryptmethod = $data->{'cryptmethod'};
+        if (!$cryptmethod) {
+            # Use sha256 crypt method by default
+            $result = crypt($password, $CRYPT_METHOD{'sha256'} . xCAT::Utils::genpassword(8));
+        } elsif( defined($CRYPT_METHOD{$cryptmethod})) {
+            $result = crypt($password,
+                $CRYPT_METHOD{$cryptmethod} . xCAT::Utils::genpassword(8));
+        } else {
+            xCAT::MsgUtils->message("S", "Unsupported crypt method $cryptmethod");
+            return undef;
+        }
     }
     return $result;
 }