From 888b8707a96369854787351390e52280c991872a Mon Sep 17 00:00:00 2001
From: vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Thu, 25 Aug 2011 17:00:04 +0000
Subject: 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
---
 pki/base/ra/lib/perl/PKI/Conn/CA.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pki')

diff --git a/pki/base/ra/lib/perl/PKI/Conn/CA.pm b/pki/base/ra/lib/perl/PKI/Conn/CA.pm
index 2dd106a8b..f3c8834ed 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-`;
   }
-- 
cgit