From 41fbf85cb847041fe47765262c8128d828b01a49 Mon Sep 17 00:00:00 2001
From: daniceexi <daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 3 Aug 2012 09:20:28 +0000
Subject: [PATCH] merge 13125 to branch

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13423 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/blade.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index f1f21310a..df709ff48 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -4133,6 +4133,9 @@ sub clicmds {
     $curruser="USERID";
     $currpass = "PASSW0RD";
     $nokeycheck=1;
+  } else {
+       if ($args{curruser}) { $curruser = $args{curruser}; $nokeycheck=1; }
+       if ($args{currpass}) { $currpass = $args{currpass}; $nokeycheck=1; }
   }
   if ($args{nokeycheck}) {
     $nokeycheck=1;