From 6f3e2fb2f08f7923af5fcf22980ef17c2b01408d Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 27 Feb 2013 15:19:08 +0000
Subject: [PATCH] Revert "Have xCAT support ssl parameter settings in site
 table"

This reverts commit 7f18ae6d6f3437984fbffdd8064a1e56e6560969.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15269 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/sbin/xcatd | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index fa2751f17..785849550 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -943,12 +943,6 @@ until ($quit) {
     $SIG{CHLD} = \&generic_reaper; #THROTTLE
     $listener->close;
 
-    populate_site_hash();
-    my %extrasslargs;
-    if ($::XCATSITEVALS{xcatsslversion}) { $extrasslargs{SSL_version} = $::XCATSITEVALS{xcatsslversion}; }
-    if ($::XCATSITEVALS{xcatsslciphers}) { $extrasslargs{SSL_cipher_list} = $::XCATSITEVALS{xcatsslciphers}; }
-	use Data::Dumper;
-
     $SIG{ALRM} = sub { $ssltimeout = 1; die; }; 
     eval {
       alarm(10);
@@ -957,8 +951,7 @@ until ($quit) {
       SSL_cert_file=>$xcatdir."/cert/server-cred.pem",
       SSL_ca_file=>$xcatdir."/cert/ca.pem",
       SSL_server=>1,
-      SSL_verify_mode=> 1,
-      %extrasslargs,
+      SSL_verify_mode=> 1
       );
       alarm(0);
     };
@@ -980,6 +973,7 @@ until ($quit) {
     } else {
       $peername=undef;
     }
+    populate_site_hash();
     
 if ($inet6support) {
     $peerhost = gethostbyaddr($connection->peeraddr,AF_INET6);