- Error messages in newer files are logged using edg_wlpr_Log() not just

  printed out to stderr
- Make sure all temporary files are removed

diff --git a/org.glite.security.proxyrenewal/src/renew.c b/org.glite.security.proxyrenewal/src/renew.c
index c327280..d29abbf 100644 (file)
--- a/org.glite.security.proxyrenewal/src/renew.c
+++ b/org.glite.security.proxyrenewal/src/renew.c
@@ -161,14 +161,14 @@ renew_proxy(proxy_record *record, char *basename, char **new_proxy)
                                server_response, tmp_proxy);
    if (ret == 1) {
       ret = EDG_WLPR_ERROR_MYPROXY;
-      edg_wlpr_Log(LOG_ERR, "Error contacting MyProxy server for proxy %s",
-                  repository_file);
+      edg_wlpr_Log(LOG_ERR, "Error contacting MyProxy server for proxy %s: %s",
+                  repository_file, verror_get_string());
       goto end;
    }
 
    renewed_proxy = tmp_proxy;
 
-   if (voms_enabled) {
+   if (voms_enabled && record.voms_exts) {
       char tmp_voms_proxy[FILENAME_MAX];
       int tmp_voms_fd;
       
@@ -183,8 +183,10 @@ renew_proxy(proxy_record *record, char *basename, char **new_proxy)
       }
 
       ret = renew_voms_certs(repository_file, tmp_voms_proxy);
-      if (ret)
+      if (ret) {
+        unlink(tmp_voms_proxy);
         goto end;
+      }
 
       renewed_proxy = tmp_voms_proxy;
    }

diff --git a/org.glite.security.proxyrenewal/src/voms.c b/org.glite.security.proxyrenewal/src/voms.c
index e9cf837..b8de46b 100644 (file)
--- a/org.glite.security.proxyrenewal/src/voms.c
+++ b/org.glite.security.proxyrenewal/src/voms.c
@@ -27,39 +27,39 @@ generate_proxy(globus_gsi_cred_handle_t cur_proxy,
 
    result = globus_gsi_proxy_handle_init(&proxy_handle, NULL);
    if (result) {
-      fprintf(stderr, "globus_gsi_proxy_handle_init() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "globus_gsi_proxy_handle_init() failed\n");
       goto end;
    }
 
    result = globus_gsi_cred_get_key(cur_proxy, &cur_proxy_priv_key);
    if (result) {
-      fprintf(stderr, "globus_gsi_cred_get_key() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "globus_gsi_cred_get_key() failed\n");
       goto end;
    }
 
    /* Create and sign a new proxy */
    result = globus_gsi_cred_get_cert_type(cur_proxy, &proxy_type);
    if (result) {
-      fprintf(stderr, "globus_gsi_cred_get_cert_type() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "globus_gsi_cred_get_cert_type() failed\n");
       goto end;
    }
 
    result = globus_gsi_proxy_handle_set_type(proxy_handle, proxy_type);
    if (result) {
-      fprintf(stderr, "globus_gsi_proxy_handle_set_type() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "globus_gsi_proxy_handle_set_type() failed\n");
       goto end;
    }
 
    result = globus_gsi_proxy_create_signed(proxy_handle, cur_proxy, &proxy);
    if (result) {
-      fprintf(stderr, "globus_gsi_proxy_handle_init() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "globus_gsi_proxy_handle_init() failed\n");
       goto end;
    }
 
    /* Get the new proxy */
    result = globus_gsi_cred_get_cert(proxy, &new_cert);
    if (result) {
-      fprintf(stderr, "globus_gsi_cred_get_cert() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "globus_gsi_cred_get_cert() failed\n");
       goto end;
    }
 
@@ -79,7 +79,7 @@ generate_proxy(globus_gsi_cred_handle_t cur_proxy,
    /* And put the cert back, older one is unallocated by the function */
    result = globus_gsi_cred_set_cert(proxy, voms_cert);
    if (result) {
-      fprintf(stderr, "globus_gsi_cred_set_cert() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "globus_gsi_cred_set_cert() failed\n");
       goto end;
    }
 
@@ -100,7 +100,7 @@ my_VOMS_Export(void *buf, int buf_len, X509_EXTENSION **extension)
    p = pp = buf;
    ac = d2i_AC(NULL, &p, buf_len+1);
    if (ac == NULL) {
-      fprintf(stderr, "d2i_AC() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "d2i_AC() failed\n");
       return 1;
    }
 
@@ -122,14 +122,14 @@ create_voms_command(struct vomsdata *vd, struct voms **voms_cert, char **command
    for (i = 2; i < argc; i++) {
       ret = VOMS_Ordering(argv[i], vd, &voms_error);
       if (ret == 0) {
-        fprintf(stderr, "VOMS_Ordering() failed\n"); 
+        edg_wlpr_Log(LOG_ERROR, "VOMS_Ordering() failed\n"); 
         return 1;
       }
    }
 #endif
 
    if (voms_cert == NULL || *voms_cert == NULL || (*voms_cert)->std == NULL) {
-      fprintf(stderr, "Invalid VOMS certificate\n");
+      edg_wlpr_Log(LOG_ERROR, "Invalid VOMS certificate\n");
       return 1;
    }
 
@@ -156,7 +156,7 @@ renew_voms_cert(struct vomsdata *vd, struct voms **voms_cert,
    voms_contacts = VOMS_FindByVO(vd, (*voms_cert)->voname, vomsconf, NULL, &voms_error);
 
    if (voms_contacts == NULL) {
-      fprintf(stderr, "VOMS_FindByVO() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "VOMS_FindByVO() failed\n");
       return 1;
    }
 
@@ -168,7 +168,7 @@ renew_voms_cert(struct vomsdata *vd, struct voms **voms_cert,
                         (void**) buf, buf_len, &voms_version,
                         vd, &voms_error);
    if (ret == 0) {
-      fprintf(stderr, "VOMS_Contact() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "VOMS_Contact() failed\n");
       return 1;
    }
 
@@ -202,7 +202,7 @@ renew_voms_certs(const char *cur_file, const char *new_file)
 
    vd = VOMS_Init(NULL, NULL);
    if (vd == NULL) {
-      fprintf(stderr, "VOMS_Init() failed\n");
+      edg_wlpr_Log(LOG_ERROR, "VOMS_Init() failed\n");
       return 1;
    }
 
@@ -210,11 +210,13 @@ renew_voms_certs(const char *cur_file, const char *new_file)
    if (ret == 0) {
       if (voms_err == VERR_NOEXT) {
         /* no VOMS cred, no problem; continue */
-        fprintf(stderr, "No VOMS attributes found in proxy %s\n", cur_file);
+        /* XXX this part shouldn't be reachable, this call is only called
+         * if the proxy does contain VOMS attributes */
+        edg_wlpr_Log(LOG_ERROR, "No VOMS attributes found in proxy %s\n", cur_file);
         ret = 0;
         goto end;
       } else {
-        fprintf(stderr, "Cannot get VOMS certificate(s) from proxy");
+        edg_wlpr_Log(LOG_ERROR, "Cannot get VOMS certificate(s) from proxy");
         ret = 1;
         goto end;
       }
@@ -279,7 +281,7 @@ main(int argc, char *argv[])
 
    if (globus_module_activate(GLOBUS_GSI_PROXY_MODULE) != GLOBUS_SUCCESS ||
        globus_module_activate(GLOBUS_GSI_CERT_UTILS_MODULE) != GLOBUS_SUCCESS) {
-       fprintf(stderr, "[%d]: Unable to initialize Globus modules\n", getpid());
+       edg_wlpr_Log(LOG_ERROR, "[%d]: Unable to initialize Globus modules\n", getpid());
        return 1;
    }