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

-Move to single file for certificate and key for simplicity

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1256 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2008-05-02 19:38:44 +00:00
parent 0d7a9ceb23
commit be24ac6b23
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
perl-xCAT-2.0/xCAT/Client.pm
View File

@@ -72,8 +72,8 @@ sub submit_request {
my $keyfile = shift;
my $certfile = shift;
my $cafile = shift;
unless ($keyfile) { $keyfile = $ENV{HOME}."/.xcat/client-key.pem"; }
unless ($certfile) { $certfile = $ENV{HOME}."/.xcat/client-cert.pem"; }
unless ($keyfile) { $keyfile = $ENV{HOME}."/.xcat/client-cred.pem"; }
unless ($certfile) { $certfile = $ENV{HOME}."/.xcat/client-cred.pem"; }
unless ($cafile) { $cafile = $ENV{HOME}."/.xcat/ca.pem"; }
$xCAT::Client::EXITCODE = 0; # clear out exit code before invoking the plugin

4
xCAT-server-2.0/sbin/xcatd
View File

@@ -479,8 +479,8 @@ until ($quit) {
eval {
alarm(10);
$connection = IO::Socket::SSL->start_SSL($cnnection,
SSL_key_file=>$xcatdir."/cert/server-key.pem",
SSL_cert_file=>$xcatdir."/cert/server-cert.pem",
SSL_key_file=>$xcatdir."/cert/server-cred.pem",
SSL_cert_file=>$xcatdir."/cert/server-cred.pem",
SSL_ca_file=>$xcatdir."/cert/ca.pem",
SSL_server=>1,
SSL_verify_mode=> 1