From 8955e48f0aa400043c193d33ad6c6165c56dade0 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 13 May 2008 18:42:25 +0000
Subject: [PATCH] -Fix p commands to use unified client-cred.pem file

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1376 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client-2.0/bin/pping  | 4 ++--
 xCAT-client-2.0/bin/prsync | 4 ++--
 xCAT-client-2.0/bin/pscp   | 4 ++--
 xCAT-client-2.0/bin/psh    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xCAT-client-2.0/bin/pping b/xCAT-client-2.0/bin/pping
index 13194484f..9d945a290 100755
--- a/xCAT-client-2.0/bin/pping
+++ b/xCAT-client-2.0/bin/pping
@@ -34,8 +34,8 @@ unless (@ARGV) {
 my $noderange = $ARGV[0];
 my $client = IO::Socket::SSL->new(
                 PeerAddr=>$xcathost,
-                SSL_key_file=>$ENV{HOME}."/.xcat/client-key.pem",
-                SSL_cert_file=>$ENV{HOME}."/.xcat/client-cert.pem",
+                SSL_key_file=>$ENV{HOME}."/.xcat/client-cred.pem",
+                SSL_cert_file=>$ENV{HOME}."/.xcat/client-cred.pem",
                 SSL_ca_file => $ENV{HOME}."/.xcat/ca.pem",
                 SSL_use_cert => 1,
                 #SSL_verify_mode => 1,
diff --git a/xCAT-client-2.0/bin/prsync b/xCAT-client-2.0/bin/prsync
index fe7cec55e..ebfcb523f 100755
--- a/xCAT-client-2.0/bin/prsync
+++ b/xCAT-client-2.0/bin/prsync
@@ -35,8 +35,8 @@ unless (@ARGV) {
 (my $noderange,my $destloc) = split(/:/,$ARGV[1]);
 my $client = IO::Socket::SSL->new(
                 PeerAddr=>$xcathost,
-                SSL_key_file=>$ENV{HOME}."/.xcat/client-key.pem",
-                SSL_cert_file=>$ENV{HOME}."/.xcat/client-cert.pem",
+                SSL_key_file=>$ENV{HOME}."/.xcat/client-cred.pem",
+                SSL_cert_file=>$ENV{HOME}."/.xcat/client-cred.pem",
                 SSL_ca_file => $ENV{HOME}."/.xcat/ca.pem",
                 SSL_use_cert => 1,
                 #SSL_verify_mode => 1,
diff --git a/xCAT-client-2.0/bin/pscp b/xCAT-client-2.0/bin/pscp
index 0db720f80..b70fb6ac8 100755
--- a/xCAT-client-2.0/bin/pscp
+++ b/xCAT-client-2.0/bin/pscp
@@ -35,8 +35,8 @@ unless (@ARGV) {
 (my $noderange,my $destloc) = split(/:/,$ARGV[1]);
 my $client = IO::Socket::SSL->new(
                 PeerAddr=>$xcathost,
-                SSL_key_file=>$ENV{HOME}."/.xcat/client-key.pem",
-                SSL_cert_file=>$ENV{HOME}."/.xcat/client-cert.pem",
+                SSL_key_file=>$ENV{HOME}."/.xcat/client-cred.pem",
+                SSL_cert_file=>$ENV{HOME}."/.xcat/client-cred.pem",
                 SSL_ca_file => $ENV{HOME}."/.xcat/ca.pem",
                 SSL_use_cert => 1,
                 #SSL_verify_mode => 1,
diff --git a/xCAT-client-2.0/bin/psh b/xCAT-client-2.0/bin/psh
index a0496943e..82aa6ea5a 100755
--- a/xCAT-client-2.0/bin/psh
+++ b/xCAT-client-2.0/bin/psh
@@ -48,8 +48,8 @@ if ($::NONODECHECK) {
 else {
   my $client = IO::Socket::SSL->new(
                 PeerAddr=>$xcathost,
-                SSL_key_file=>$ENV{HOME}."/.xcat/client-key.pem",
-                SSL_cert_file=>$ENV{HOME}."/.xcat/client-cert.pem",
+                SSL_key_file=>$ENV{HOME}."/.xcat/client-cred.pem",
+                SSL_cert_file=>$ENV{HOME}."/.xcat/client-cred.pem",
                 SSL_ca_file => $ENV{HOME}."/.xcat/ca.pem",
                 SSL_use_cert => 1,
                 #SSL_verify_mode => 1,