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);