From 8782186f6be4be3fc6c1aca3786ef1ae7d2b973e Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Tue, 24 Jan 2017 16:05:01 -0500
Subject: [PATCH] check if there is "-l" options

---
 perl-xCAT/xCAT/DSHCLI.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index 0c98e7908..8121f475d 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -980,8 +980,8 @@ sub fork_fanout_dsh
       = @_;
 
     #get username and passeword for switches 
-    if (($$options{'devicetype'} =~ /EthSwitch/) {
-        ($$options{'devicetype'} =~ /IBSwitch/) ){
+    if (($$options{'devicetype'} =~ /EthSwitch/) || 
+        (($$options{'devicetype'} =~ /IBSwitch/) && !($$options{'user'})) ){
         if (@$targets_waiting > 0) {
             if ($ENV{'DSH_REMOTE_PASSWORD'}) {
                 foreach my $t (keys(%$resolved_targets)) {