summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-08-25 17:00:04 +0000
committervakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-08-25 17:00:04 +0000
commit888b8707a96369854787351390e52280c991872a (patch)
treebed6ac31b0807f660a10b371f3f431533f4fb162
parentc96522984331baa33ff963b87fd18217ece46246 (diff)
downloadpki-888b8707a96369854787351390e52280c991872a.tar.gz
pki-888b8707a96369854787351390e52280c991872a.tar.xz
pki-888b8707a96369854787351390e52280c991872a.zip
Resolves #733065 - User enrollment with RA -- this fails with CA Connection Error
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2174 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/base/ra/lib/perl/PKI/Conn/CA.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/pki/base/ra/lib/perl/PKI/Conn/CA.pm b/pki/base/ra/lib/perl/PKI/Conn/CA.pm
index 2dd106a8..f3c8834e 100644
--- a/pki/base/ra/lib/perl/PKI/Conn/CA.pm
+++ b/pki/base/ra/lib/perl/PKI/Conn/CA.pm
@@ -68,7 +68,7 @@ sub enroll {
my ($host, $port) = split(/:/, $cahostport);
if ($nickname =~ /(.*):(.*)/) {
- $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | cut -c10-`;
+ $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | awk -F: '{print \$2}'`;
} else {
$db_password = `grep \"internal:\" \"$instdir/conf/password.conf\" | cut -c10-`;
}
@@ -175,7 +175,7 @@ sub revoke {
my $cahostport = $cfg->get("conn." . $con_id . ".hostagentport");
if ($nickname =~ /(.*):(.*)/) {
- $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | cut -c10-`;
+ $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | awk -F: '{print \$2}'`;
} else {
$db_password = `grep \"internal:\" \"$instdir/conf/password.conf\" | cut -c10-`;
}
@@ -240,7 +240,7 @@ sub getCertStatus {
my ($host, $port) = split(/:/, $cahostport);
if ($nickname =~ /(.*):(.*)/) {
- $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | cut -c10-`;
+ $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | awk -F: '{print \$2}'`;
} else {
$db_password = `grep \"internal:\" \"$instdir/conf/password.conf\" | cut -c10-`;
}
@@ -295,7 +295,7 @@ sub scep_get_ca_cert {
my ($host, $port) = split(/:/, $cahostport);
if ($nickname =~ /(.*):(.*)/) {
- $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | cut -c10-`;
+ $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | awk -F: '{print \$2}'`;
} else {
$db_password = `grep \"internal:\" \"$instdir/conf/password.conf\" | cut -c10-`;
}
@@ -327,7 +327,7 @@ sub scep_decode {
my ($host, $port) = split(/:/, $cahostport);
if ($nickname =~ /(.*):(.*)/) {
- $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | cut -c10-`;
+ $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | awk -F: '{print \$2}'`;
} else {
$db_password = `grep \"internal:\" \"$instdir/conf/password.conf\" | cut -c10-`;
}
@@ -359,7 +359,7 @@ sub scep_pki_message {
my ($host, $port) = split(/:/, $cahostport);
if ($nickname =~ /(.*):(.*)/) {
- $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | cut -c10-`;
+ $db_password = `grep \"$1:\" \"$instdir/conf/password.conf\" | awk -F: '{print \$2}'`;
} else {
$db_password = `grep \"internal:\" \"$instdir/conf/password.conf\" | cut -c10-`;
}