From 5a21746fe80e31e684bb3d65cde80b22bddb0de7 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 26 Feb 2013 21:11:54 +0000
Subject: [PATCH] Have xCAT support ssl parameter settings in site table
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15265 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
xCAT-server/sbin/xcatd | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 785849550..fa2751f17 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -943,6 +943,12 @@ 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);
@@ -951,7 +957,8 @@ until ($quit) {
SSL_cert_file=>$xcatdir."/cert/server-cred.pem",
SSL_ca_file=>$xcatdir."/cert/ca.pem",
SSL_server=>1,
- SSL_verify_mode=> 1
+ SSL_verify_mode=> 1,
+ %extrasslargs,
);
alarm(0);
};
@@ -973,7 +980,6 @@ until ($quit) {
} else {
$peername=undef;
}
- populate_site_hash();
if ($inet6support) {
$peerhost = gethostbyaddr($connection->peeraddr,AF_INET6);