From 3c10a8ed6032346ea9f61a495bf37feb1213bd25 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 8 Sep 2011 11:56:55 +0200 Subject: [PATCH] Bug: Fix wrong return value handling in oneuser (cherry picked from commit 124ba59cf5e663db0929710249de526af38430de) --- src/cli/one_helper/oneuser_helper.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index 1fa41d3c58..f76ace7cc8 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -117,12 +117,11 @@ class OneUserHelper < OpenNebulaHelper::OneHelper begin proxy = File.read(options[:proxy]) - rc = proxy.scan(/(-+BEGIN CERTIFICATE-+\n[^-]*\n-+END CERTIFICATE-+)/) - certs = rc.flatten! + certs = proxy.scan(/(-+BEGIN CERTIFICATE-+\n[^-]*\n-+END CERTIFICATE-+)/) + certs.flatten! rc = proxy.match(/(-+BEGIN RSA PRIVATE KEY-+\n[^-]*\n-+END RSA PRIVATE KEY-+)/) - - key = rc[1] + key= rc[1] auth = X509Auth.new(:certs_pem=>certs, :key_pem=>key) rescue => e