arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Have xCAT support ssl parameter settings in site table"

Browse Source 
This reverts commit 7f18ae6d6f.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15269 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-02-27 15:19:08 +00:00
parent 7f18ae6d6f
commit 6f3e2fb2f0
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/sbin/xcatd
View File

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