From 0e16c0c1ac475bf477a5ff500fef8ce81c5c09a2 Mon Sep 17 00:00:00 2001
From: yangsbj <yangsbj@cn.ibm.com>
Date: Mon, 14 Jan 2019 03:35:50 -0500
Subject: [PATCH] fix issue PR #5936 resulted in remoteshell failed in
 rhels6.10 #5944

---
 xCAT/postscripts/remoteshell | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index 1a8b1c2b5..378a7e386 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -59,12 +59,14 @@ then
 	logger -t $log_label -p local4.info "remoteshell:  setup /etc/ssh/sshd_config and ssh_config"
 	cp /etc/ssh/sshd_config /etc/ssh/sshd_config.ORIG
         #delete all occurance of the attribute and then add xCAT settings
-        echo "Match all" >>/etc/ssh/sshd_config
-        sed -i '/X11Forwarding /'d /etc/ssh/sshd_config
-        echo "X11Forwarding yes" >>/etc/ssh/sshd_config
         sed -i '/MaxStartups /'d /etc/ssh/sshd_config
         echo "MaxStartups 1024" >>/etc/ssh/sshd_config
 
+        echo "Match Host *" >>/etc/ssh/sshd_config
+        sed -i '/X11Forwarding /'d /etc/ssh/sshd_config
+        echo "X11Forwarding yes" >>/etc/ssh/sshd_config
+
+
     if [ "$SETUPFORPCM" = "1" ]; then
         if [[ $OSVER == sle* ]];then
             sed -i '/PasswordAuthentication /'d /etc/ssh/sshd_config