From 58015df28ebdb3672436ae236254bbc8d7ca269e Mon Sep 17 00:00:00 2001
From: daniceexi <wxp@cn.ibm.com>
Date: Fri, 13 Feb 2015 03:31:30 -0500
Subject: [PATCH] Temporarily removed the autoset sslversion to TLSv1 in 2.9
 since it's not stable. But customer can enable it manually

---
 xCAT-client/xCAT-client.spec |  3 ++-
 xCAT-server/sbin/xcatconfig  | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec
index 116e4d369..d0a716eca 100644
--- a/xCAT-client/xCAT-client.spec
+++ b/xCAT-client/xCAT-client.spec
@@ -298,7 +298,8 @@ EOF
 if [ -r /etc/SuSE-release ]; then
   ver=`grep 'VERSION' /etc/SuSE-release | awk -F= '{print $2}' | sed 's/ //g'`
   if [ "$ver" = "11" ]; then
-    echo 'export XCATSSLVER=TLSv1' >> /etc/profile.d/xcat.sh
+    echo
+    #echo 'export XCATSSLVER=TLSv1' >> /etc/profile.d/xcat.sh
   fi
 fi
 
diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index 3dcc2c344..6a4f785cf 100755
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -1250,7 +1250,7 @@ sub initDB
         $chtabcmds .= "$::XCATROOT/sbin/chtab key=cleanupxcatpost site.value=no;";
         $chtabcmds .= "$::XCATROOT/sbin/chtab key=dhcplease site.value=43200;";
         $chtabcmds .= "$::XCATROOT/sbin/chtab key=auditnosyslog site.value=0;";
-        $chtabcmds .= "$::XCATROOT/sbin/chtab key=xcatsslversion site.value=TLSv1;";
+        #$chtabcmds .= "$::XCATROOT/sbin/chtab key=xcatsslversion site.value=TLSv1;";
         #$chtabcmds .= "$::XCATROOT/sbin/chtab key=useflowcontrol site.value=yes;"; # need to fix 4031
 
         if ($::osname eq 'AIX')
@@ -1507,11 +1507,11 @@ sub initDB
 
         # add default value to site.xcatsslversion
         $cmds = "$::XCATROOT/sbin/chtab key=xcatsslversion site.value=TLSv1;";
-        $outref = xCAT::Utils->runcmd("$cmds", 0);
-        if ($::RUNCMD_RC != 0)
-        {
-            xCAT::MsgUtils->message('E',"Could not add default value for site.xcatsslversion.");
-        }
+        #$outref = xCAT::Utils->runcmd("$cmds", 0);
+        #if ($::RUNCMD_RC != 0)
+        #{
+        #    xCAT::MsgUtils->message('E',"Could not add default value for site.xcatsslversion.");
+        #}