From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Mon, 4 Apr 2005 14:42:05 +0000 (+0000)
Subject: Refuse to process invalid or nonexisting proxies
X-Git-Tag: glite-security-proxyrenewal_R_1_0_13~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bf2e437ef717ff36a79cf262e197b7bca02e3966;p=jra1mw.git

Refuse to process invalid or nonexisting proxies
---

diff --git a/org.glite.security.proxyrenewal/project/version.properties b/org.glite.security.proxyrenewal/project/version.properties
index c744014..b0ca9c7 100644
--- a/org.glite.security.proxyrenewal/project/version.properties
+++ b/org.glite.security.proxyrenewal/project/version.properties
@@ -1,4 +1,4 @@
 
-module.version = 1.0.11
+module.version = 1.0.12
 module.age = 1
 				
diff --git a/org.glite.security.proxyrenewal/src/renew.c b/org.glite.security.proxyrenewal/src/renew.c
index c14b6c0..39113cc 100644
--- a/org.glite.security.proxyrenewal/src/renew.c
+++ b/org.glite.security.proxyrenewal/src/renew.c
@@ -30,6 +30,7 @@ load_proxy(const char *cur_file, X509 **cert, EVP_PKEY **priv_key,
 {
    globus_result_t result;
    globus_gsi_cred_handle_t proxy = NULL;
+   int ret;
 
    result = globus_gsi_cred_handle_init(&proxy, NULL);
    if (result) {
@@ -71,10 +72,14 @@ load_proxy(const char *cur_file, X509 **cert, EVP_PKEY **priv_key,
       *cur_proxy = proxy;
       proxy = NULL;
    }
+
+   ret = 0;
    
 end:
+   if (result)
+      ret = EDG_WLPR_ERROR_GENERIC;
 
-   return 0;
+   return ret;
 }
 
 static void