From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Tue, 22 Mar 2005 14:31:19 +0000 (+0000)
Subject: The VOMS API seems (sometimes?) to not use the X509_USER_PROXY environment
X-Git-Tag: glite-security-proxyrenewal_R_1_0_10~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a6642161912149bed10d027a088ef0d86d634751;p=jra1mw.git

The VOMS API seems (sometimes?) to not use the X509_USER_PROXY environment
variable so X509_USER_CERT and X509_USER_KEY are set too
---

diff --git a/org.glite.security.proxyrenewal/src/voms.c b/org.glite.security.proxyrenewal/src/voms.c
index f8f7129..f570fd4 100644
--- a/org.glite.security.proxyrenewal/src/voms.c
+++ b/org.glite.security.proxyrenewal/src/voms.c
@@ -194,8 +194,12 @@ renew_voms_certs(const char *cur_file, const char *renewed_file, const char *new
    size_t buf_len = 0;
    X509_EXTENSION *extension = NULL;
    char *old_env_proxy = getenv("X509_USER_PROXY");
+   char *old_env_cert = getenv("X509_USER_CERT");
+   char *old_env_key = getenv("X509_USER_KEY");
 
    setenv("X509_USER_PROXY", cur_file, 1);
+   setenv("X509_USER_CERT", renewed_file, 1);
+   setenv("X509_USER_KEY", renewed_file, 1);
 
    ret = load_proxy(cur_file, &cert, NULL, &chain, &cur_proxy);
    if (ret)
@@ -261,6 +265,10 @@ renew_voms_certs(const char *cur_file, const char *renewed_file, const char *new
 end:
    (old_env_proxy) ? setenv("X509_USER_PROXY", old_env_proxy, 1) :
       		     unsetenv("X509_USER_PROXY");
+   (old_env_cert) ? setenv("X509_USER_CERT", old_env_cert, 1) :
+                    unsetenv("X509_USER_CERT");
+   (old_env_key) ? setenv("X509_USER_KEY", old_env_key, 1) :
+                   unsetenv("X509_USER_KEY");
 
    if (cert)
       X509_free(cert);