Names of all functions exported by the core library start with a "glite_renewal_...

diff --git a/org.glite.security.proxyrenewal/src/commands.c b/org.glite.security.proxyrenewal/src/commands.c
index a923da4..abc4809 100644 (file)
--- a/org.glite.security.proxyrenewal/src/commands.c
+++ b/org.glite.security.proxyrenewal/src/commands.c
@@ -100,7 +100,7 @@ get_base_filename(glite_renewal_core_context ctx, char *proxy_file, char **basef
 
    assert(basefilename != NULL);
 
-   ret = get_proxy_base_name(ctx, proxy_file, &subject);
+   ret = glite_renewal_get_proxy_base_name(ctx, proxy_file, &subject);
    if (ret)
       goto end;
 
@@ -124,12 +124,12 @@ copy_file_content(glite_renewal_core_context ctx, FILE *in, FILE *out)
    while (1) {
       num = fread(buf, sizeof(*buf), sizeof(buf), in);
       if ((ret = ferror(in))) {
-        edg_wlpr_Log(ctx, LOG_ERR, "Reading failed: %s", strerror(errno));
+        glite_renewal_log(ctx, LOG_ERR, "Reading failed: %s", strerror(errno));
         return ret;
       }
       num = fwrite(buf, sizeof(*buf), num, out);
       if ((ret = ferror(in))) {
-        edg_wlpr_Log(ctx, LOG_ERR, "Writing failed: %s", strerror(errno));
+        glite_renewal_log(ctx, LOG_ERR, "Writing failed: %s", strerror(errno));
         return ret;
       }
       if (feof(in))
@@ -158,7 +158,7 @@ get_delta(glite_renewal_core_context ctx, time_t current_time, time_t start_time
      /* if the proxy is too short, renew it as soon as possible */
 
      if (current_time + condor_limit > end_time ) {
-       edg_wlpr_Log(ctx, LOG_ERR, "Remaining proxy lifetime fell below the value of the Condor limit!");
+       glite_renewal_log(ctx, LOG_ERR, "Remaining proxy lifetime fell below the value of the Condor limit!");
      }
 
      return 0;
@@ -209,14 +209,14 @@ get_times(glite_renewal_core_context ctx, char *proxy_file, proxy_record *record
 
    fd = fopen(proxy_file, "r");
    if (fd == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Opening proxy file %s failed: %s",
+      glite_renewal_log(ctx, LOG_ERR, "Opening proxy file %s failed: %s",
                   proxy_file, strerror(errno));
       return errno;
    }
 
    cert = PEM_read_X509(fd, NULL, NULL, NULL);
    if (cert == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot read X.509 certificate from %s",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot read X.509 certificate from %s",
                   proxy_file);
       ret = -1; /* XXX SSL_ERROR */
       goto end;
@@ -230,7 +230,7 @@ get_times(glite_renewal_core_context ctx, char *proxy_file, proxy_record *record
    ASN1_UTCTIME_free(asn1_time);
    /* if (end_time - RENEWAL_CLOCK_SKEW < current_time) { Too short proxy } */
    if (end_time + RENEWAL_CLOCK_SKEW < current_time) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Expired proxy in %s", proxy_file);
+      glite_renewal_log(ctx, LOG_ERR, "Expired proxy in %s", proxy_file);
       ret = EDG_WLPR_PROXY_EXPIRED;
       goto end;
    }
@@ -249,14 +249,14 @@ get_times(glite_renewal_core_context ctx, char *proxy_file, proxy_record *record
            ERR_clear_error();
            break;
         }
-        edg_wlpr_Log(ctx, LOG_ERR, "Cannot read additional certificates from %s",
+        glite_renewal_log(ctx, LOG_ERR, "Cannot read additional certificates from %s",
                      proxy_file);
         ret = -1; /* XXX SSL_ERROR */
         goto end;
       }
       globus_gsi_cert_utils_make_time(X509_get_notAfter(cert), &tmp_end);
       if (tmp_end + RENEWAL_CLOCK_SKEW < current_time) {
-        edg_wlpr_Log(ctx, LOG_ERR, "Expired proxy in %s", proxy_file);
+        glite_renewal_log(ctx, LOG_ERR, "Expired proxy in %s", proxy_file);
         ret = EDG_WLPR_PROXY_EXPIRED;
         goto end;
       }
@@ -291,7 +291,7 @@ copy_file(glite_renewal_core_context ctx, char *src, char *dst)
 
    from = fopen(src, "r");
    if (from == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot open file %s for reading (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot open file %s for reading (%s)",
                   src, strerror(errno));
       return errno;
    }
@@ -299,7 +299,7 @@ copy_file(glite_renewal_core_context ctx, char *src, char *dst)
    snprintf(tmpfile, sizeof(tmpfile), "%s.XXXXXX", dst);
    tmp_fd = mkstemp(tmpfile);
    if (tmp_fd == -1) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot create temporary file (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot create temporary file (%s)",
                   strerror(errno));
       ret = errno;
       goto end;
@@ -308,7 +308,7 @@ copy_file(glite_renewal_core_context ctx, char *src, char *dst)
 
    tmp_to = fdopen(tmp_fd, "w");
    if (tmp_to == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot associate stream with temporary file (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot associate stream with temporary file (%s)",
                   strerror(errno));
       unlink(tmpfile);
       ret = errno;
@@ -323,7 +323,7 @@ copy_file(glite_renewal_core_context ctx, char *src, char *dst)
 
    ret = rename(tmpfile, dst);
    if (ret) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot replace repository file %s with temporary file (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot replace repository file %s with temporary file (%s)",
                   strerror(errno));
       unlink(tmpfile);
       ret = errno;
@@ -533,7 +533,7 @@ get_record_ext(glite_renewal_core_context ctx, FILE *fd, proxy_record *record, i
         *p = '\0';
       ret = decode_record(ctx, line, &tmp_record);
       if (ret) {
-        edg_wlpr_Log(ctx, LOG_ERR, "Skipping invalid entry at line %d", line_num);
+        glite_renewal_log(ctx, LOG_ERR, "Skipping invalid entry at line %d", line_num);
         continue;
       }
       if (record->suffix >= 0) {
@@ -607,7 +607,7 @@ get_record_ext(glite_renewal_core_context ctx, FILE *fd, proxy_record *record, i
       *last_used_suffix = last_suffix;
 
    if (record->suffix >= 0) {
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Requested suffix %d not found in meta file",
+      glite_renewal_log(ctx, LOG_DEBUG, "Requested suffix %d not found in meta file",
                   record->suffix);
    }
 
@@ -661,7 +661,7 @@ store_record(glite_renewal_core_context ctx, char *basename, proxy_record *recor
         *p = '\0';
       ret = decode_record(ctx, line, &tmp_record);
       if (ret) {
-        edg_wlpr_Log(ctx, LOG_ERR, "Removing invalid entry at line %d in %s", line_num, basename);
+        glite_renewal_log(ctx, LOG_ERR, "Removing invalid entry at line %d in %s", line_num, basename);
         continue;
       }
       if (record->suffix == tmp_record.suffix &&
@@ -725,13 +725,13 @@ open_metafile(glite_renewal_core_context ctx, char *basename, FILE **fd)
    snprintf(meta_filename, sizeof(meta_filename), "%s.data", basename);
    meta_fd = fopen(meta_filename, "a+");
    if (meta_fd == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Opening meta file %s failed (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Opening meta file %s failed (%s)",
                   meta_filename, strerror(errno));
       return errno;
    }
    rewind(meta_fd);
    *fd = meta_fd;
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Using meta file %s", meta_filename);
+   glite_renewal_log(ctx, LOG_DEBUG, "Using meta file %s", meta_filename);
    return 0;
 }
 
@@ -740,12 +740,12 @@ filename_to_response(glite_renewal_core_context ctx, char *filename, edg_wlpr_Re
 {
    response->filenames = malloc(2 * sizeof(*response->filenames));
    if (response->filenames == NULL) {
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Not enough memory");
+      glite_renewal_log(ctx, LOG_DEBUG, "Not enough memory");
       return errno;
    }
    response->filenames[0] = strdup(filename);
    if (response->filenames[0] == NULL) {
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Not enough memory");
+      glite_renewal_log(ctx, LOG_DEBUG, "Not enough memory");
       free(response->filenames);
       return errno;
    }
@@ -789,7 +789,7 @@ check_proxyname(glite_renewal_core_context ctx, char *datafile, char *jobid, cha
 
    meta_fd = fopen(datafile, "r");
    if (meta_fd == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot open meta file %s (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot open meta file %s (%s)",
                   datafile, strerror(errno));
       return errno;
    }
@@ -830,7 +830,7 @@ find_proxyname(glite_renewal_core_context ctx, char *jobid, char **filename)
 
    dir = opendir(repository);
    if (dir == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot open repository directory %s (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot open repository directory %s (%s)",
                   repository, strerror(errno));
       return errno;
    }
@@ -848,7 +848,7 @@ find_proxyname(glite_renewal_core_context ctx, char *jobid, char **filename)
       }
    }
    closedir(dir);
-   edg_wlpr_Log(ctx, LOG_ERR, "Requested proxy is not registered");
+   glite_renewal_log(ctx, LOG_ERR, "Requested proxy is not registered");
    return EDG_WLPR_PROXY_NOT_REGISTERED;
 }
 
@@ -874,11 +874,11 @@ find_voms_cert(glite_renewal_core_context ctx, char *file, int *present)
 
    voms_info = VOMS_Init(vomsdir, cadir);
    if (voms_info == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "check_voms_cert(): Cannot initialize VOMS context (VOMS_Init() failed, probably voms dir was not specified)");
+      glite_renewal_log(ctx, LOG_ERR, "check_voms_cert(): Cannot initialize VOMS context (VOMS_Init() failed, probably voms dir was not specified)");
       return EDG_WLPR_ERROR_VOMS;
    }
 
-   ret = load_proxy(ctx, file, &cert, &privkey, &chain, NULL);
+   ret = glite_renewal_load_proxy(ctx, file, &cert, &privkey, &chain, NULL);
    if (ret) {
       VOMS_Destroy(voms_info);
       return ret;
@@ -912,10 +912,10 @@ register_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_wl
 
    memset(&record, 0, sizeof(record));
    memset(response, 0, sizeof(*response));
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Registration request for %s", request->proxy_filename);
+   glite_renewal_log(ctx, LOG_DEBUG, "Registration request for %s", request->proxy_filename);
 
    if (request->proxy_filename == NULL || request->jobid == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Registration request doesn't contain registration information");
+      glite_renewal_log(ctx, LOG_ERR, "Registration request doesn't contain registration information");
       return; /*  EINVAL; */
    }
    umask(0177);
@@ -959,7 +959,7 @@ register_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_wl
         goto end;
       record.jobids.val[record.jobids.len - 1] = strdup(request->jobid);
       record.unique = request->unique;
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Created a new proxy file in repository (%s)",
+      glite_renewal_log(ctx, LOG_DEBUG, "Created a new proxy file in repository (%s)",
                   filename);
    } else {
       ret = realloc_prd_list(ctx, &record.jobids);
@@ -967,7 +967,7 @@ register_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_wl
         goto end;
       record.jobids.val[record.jobids.len - 1] = strdup(request->jobid);
       snprintf(filename, sizeof(filename), "%s.%d", basename, record.suffix);
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Inremented counter on %s", filename);
+      glite_renewal_log(ctx, LOG_DEBUG, "Inremented counter on %s", filename);
    }
 
    ret = store_record(ctx, basename, &record);
@@ -997,10 +997,10 @@ unregister_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_
    struct stat stat_buf;
 
    memset(&record, 0, sizeof(record));
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Unregistration request for %s", request->jobid);
+   glite_renewal_log(ctx, LOG_DEBUG, "Unregistration request for %s", request->jobid);
 
    if (request->jobid == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Unregistration request doesn't contain needed information");
+      glite_renewal_log(ctx, LOG_ERR, "Unregistration request doesn't contain needed information");
       ret = EINVAL;
       goto end;
    }
@@ -1017,7 +1017,7 @@ unregister_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_
    }
 
    if (strncmp(request->proxy_filename, basename, strlen(basename) != 0)) {
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Requested proxy %s is not from repository",
+      glite_renewal_log(ctx, LOG_DEBUG, "Requested proxy %s is not from repository",
                   request->proxy_filename);
       ret = EDG_WLPR_PROXY_NOT_REGISTERED;
       goto end;
@@ -1025,7 +1025,7 @@ unregister_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_
 
    p = strrchr(request->proxy_filename, '.');
    if (p == NULL) {
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Requested proxy %s is not from repository",
+      glite_renewal_log(ctx, LOG_DEBUG, "Requested proxy %s is not from repository",
                   request->proxy_filename);
       ret = EDG_WLPR_PROXY_NOT_REGISTERED;
       goto end;
@@ -1033,7 +1033,7 @@ unregister_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_
 
    ret = edg_wlpr_DecodeInt(p+1, &record.suffix);
    if (ret) {
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Requested proxy %s is not from repository",
+      glite_renewal_log(ctx, LOG_DEBUG, "Requested proxy %s is not from repository",
                  request->proxy_filename);
       ret = EDG_WLPR_PROXY_NOT_REGISTERED;
       goto end;
@@ -1056,7 +1056,7 @@ unregister_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_
         break;
       }
    if (ret) {
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Requested proxy %s is not registered",
+      glite_renewal_log(ctx, LOG_DEBUG, "Requested proxy %s is not registered",
                   request->proxy_filename);
       goto end;
    }
@@ -1077,7 +1077,7 @@ unregister_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_
 
    ret = stat(request->proxy_filename, &stat_buf);
    if (ret) {
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Cannot stat file %s: (%s)",
+      glite_renewal_log(ctx, LOG_DEBUG, "Cannot stat file %s: (%s)",
                   request->proxy_filename, strerror(errno));
       ret = errno;
       goto end;
@@ -1111,10 +1111,10 @@ get_proxy(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_wlpr_Re
 
    memset(response, 0, sizeof(*response));
 
-   edg_wlpr_Log(ctx, LOG_DEBUG, "GET request for %s", request->jobid);
+   glite_renewal_log(ctx, LOG_DEBUG, "GET request for %s", request->jobid);
    
    if (request->jobid == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "GET request doesn't contain jobid specification");
+      glite_renewal_log(ctx, LOG_ERR, "GET request doesn't contain jobid specification");
       ret = EINVAL;
       goto end;
    }
@@ -1149,7 +1149,7 @@ update_db(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_wlpr_Re
 
    memset(&record, 0, sizeof(record));
 
-   edg_wlpr_Log(ctx, LOG_DEBUG, "UPDATE_DB request for %s", request->proxy_filename);
+   glite_renewal_log(ctx, LOG_DEBUG, "UPDATE_DB request for %s", request->proxy_filename);
 
    chdir(repository);
    basename = request->proxy_filename;
@@ -1157,7 +1157,7 @@ update_db(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_wlpr_Re
    snprintf(datafile, sizeof(datafile), "%s.data", basename);
    fd = fopen(datafile, "r");
    if (fd == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot open meta file %s (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot open meta file %s (%s)",
                   datafile, strerror(errno));
       ret = errno;
       return;
@@ -1166,7 +1166,7 @@ update_db(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_wlpr_Re
    snprintf(tmp_file, sizeof(tmp_file), "%s.XXXXXX", datafile);
    tmp_fd = mkstemp(tmp_file);
    if (tmp_fd < 0) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot create temporary file (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot create temporary file (%s)",
                   strerror(errno));
       ret = errno;
       goto end;
@@ -1218,7 +1218,7 @@ update_db(glite_renewal_core_context ctx, edg_wlpr_Request *request, edg_wlpr_Re
               free_record(ctx, &record);
               record.suffix = suffix;
               record.myproxy_server = server;
-              edg_wlpr_Log(ctx, LOG_WARNING, "Removed expired proxy %s", cur_proxy);
+              glite_renewal_log(ctx, LOG_WARNING, "Removed expired proxy %s", cur_proxy);
            } else
               get_times(ctx, cur_proxy, &record);
         } else {

diff --git a/org.glite.security.proxyrenewal/src/renew.c b/org.glite.security.proxyrenewal/src/renew.c
index 1003dc2..29105d2 100644 (file)
--- a/org.glite.security.proxyrenewal/src/renew.c
+++ b/org.glite.security.proxyrenewal/src/renew.c
@@ -99,7 +99,7 @@ check_renewal(glite_renewal_core_context ctx, char *datafile, int force_renew, i
    strncpy(basename, datafile, sizeof(basename) - 1);
    p = basename + strlen(basename) - strlen(".data");
    if (strcmp(p, ".data") != 0) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Meta filename doesn't end with '.data'");
+      glite_renewal_log(ctx, LOG_ERR, "Meta filename doesn't end with '.data'");
       return;
    }
    *p = '\0';
@@ -109,13 +109,13 @@ check_renewal(glite_renewal_core_context ctx, char *datafile, int force_renew, i
 
    meta_fd = fopen(datafile, "r");
    if (meta_fd == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot open meta file %s (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot open meta file %s (%s)",
                   datafile, strerror(errno));
       return;
    }
 
    current_time = time(NULL);
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Reading metafile %s", datafile);
+   glite_renewal_log(ctx, LOG_DEBUG, "Reading metafile %s", datafile);
 
    while (fgets(line, sizeof(line), meta_fd) != NULL) {
       free_record(ctx, &record);
@@ -158,10 +158,10 @@ check_renewal(glite_renewal_core_context ctx, char *datafile, int force_renew, i
    if (num > 0) {
       ret = edg_wlpr_RequestSend(&request, &response);
       if (ret != 0)
-        edg_wlpr_Log(ctx, LOG_ERR,
+        glite_renewal_log(ctx, LOG_ERR,
                      "Failed to send update request to master (%d)", ret);
       else if (response.response_code != 0)
-        edg_wlpr_Log(ctx, LOG_ERR,
+        glite_renewal_log(ctx, LOG_ERR,
                      "Master failed to update database (%d)", response.response_code);
 
       /* delete all tmp proxy files which may survive */
@@ -188,19 +188,19 @@ int renewal(glite_renewal_core_context ctx, int force_renew, int *num_renewed)
    FILE *fd;
    int num = 0;
 
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Starting renewal process");
+   glite_renewal_log(ctx, LOG_DEBUG, "Starting renewal process");
 
    *num_renewed = 0;
 
    if (chdir(repository)) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot access repository directory %s (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot access repository directory %s (%s)",
                   repository, strerror(errno));
       return errno;
    }
 
    dir = opendir(repository);
    if (dir == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot open repository directory %s (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot open repository directory %s (%s)",
                   repository, strerror(errno));
       return errno;
    }
@@ -213,7 +213,7 @@ int renewal(glite_renewal_core_context ctx, int force_renew, int *num_renewed)
         continue;
       fd = fopen(file->d_name, "r");
       if (fd == NULL) {
-        edg_wlpr_Log(ctx, LOG_ERR, "Cannot open meta file %s (%s)",
+        glite_renewal_log(ctx, LOG_ERR, "Cannot open meta file %s (%s)",
                      file->d_name, strerror(errno));
         continue;
       }
@@ -222,7 +222,7 @@ int renewal(glite_renewal_core_context ctx, int force_renew, int *num_renewed)
       fclose(fd);
    }
    closedir(dir);
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Finishing renewal process");
+   glite_renewal_log(ctx, LOG_DEBUG, "Finishing renewal process");
    return 0;
 }
 
@@ -251,6 +251,6 @@ watchdog_start(glite_renewal_core_context ctx)
        renewal(ctx, force_renewal, &num);
        count += num;
    }
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Terminating after %d renewal attempts", count);
+   glite_renewal_log(ctx, LOG_DEBUG, "Terminating after %d renewal attempts", count);
    exit(0);
 }

diff --git a/org.glite.security.proxyrenewal/src/renewal_core.c b/org.glite.security.proxyrenewal/src/renewal_core.c
index 93e011d..3bd2d1d 100644 (file)
--- a/org.glite.security.proxyrenewal/src/renewal_core.c
+++ b/org.glite.security.proxyrenewal/src/renewal_core.c
@@ -8,7 +8,7 @@
 static const char rcsid[] = "$Id$";
 
 int
-load_proxy(glite_renewal_core_context ctx, const char *cur_file, X509 **cert, EVP_PKEY **priv_key,
+glite_renewal_load_proxy(glite_renewal_core_context ctx, const char *cur_file, X509 **cert, EVP_PKEY **priv_key,
            STACK_OF(X509) **chain, globus_gsi_cred_handle_t *cur_proxy)
 {
    globus_result_t result;
@@ -68,7 +68,7 @@ end:
 }
 
 int
-get_proxy_base_name(glite_renewal_core_context ctx, const char *file, char **name)
+glite_renewal_get_proxy_base_name(glite_renewal_core_context ctx, const char *file, char **name)
 {
    X509 *cert = NULL;
    EVP_PKEY *key = NULL;
@@ -77,7 +77,7 @@ get_proxy_base_name(glite_renewal_core_context ctx, const char *file, char **nam
    int ret;
    globus_result_t result;
 
-   ret = load_proxy(ctx, file, &cert, &key, &chain, NULL);
+   ret = glite_renewal_load_proxy(ctx, file, &cert, &key, &chain, NULL);
    if (ret)
       return ret;
 
@@ -88,7 +88,7 @@ get_proxy_base_name(glite_renewal_core_context ctx, const char *file, char **nam
 
    result = globus_gsi_cert_utils_get_base_name(subject, chain);
    if (result) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot get subject name from proxy %s", file);
+      glite_renewal_log(ctx, LOG_ERR, "Cannot get subject name from proxy %s", file);
       ret = EDG_WLPR_ERROR_SSL; /* XXX ??? */
       goto end;
    }
@@ -138,27 +138,27 @@ glite_renewal_core_renew(glite_renewal_core_context ctx,
 
    myproxy_set_delegation_defaults(socket_attrs, client_request);
 
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Trying to renew proxy in %s", current_proxy);
+   glite_renewal_log(ctx, LOG_DEBUG, "Trying to renew proxy in %s", current_proxy);
 
    snprintf(tmp_proxy, sizeof(tmp_proxy), "%s.myproxy.XXXXXX", current_proxy);
    tmp_fd = mkstemp(tmp_proxy);
    if (tmp_fd == -1) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot create temporary file (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot create temporary file (%s)",
                    strerror(errno));
       return errno;
    }
 
-   ret = get_proxy_base_name(ctx, current_proxy, &client_request->username);
+   ret = glite_renewal_get_proxy_base_name(ctx, current_proxy, &client_request->username);
    if (ret)
       goto end;
 
-   voms_exts = check_voms_attrs(ctx, current_proxy);
+   voms_exts = glite_renewal_check_voms_attrs(ctx, current_proxy);
 
    client_request->proxy_lifetime = 60 * 60 * DGPR_RETRIEVE_DEFAULT_HOURS;
 
    server = (myproxy_server) ? myproxy_server : socket_attrs->pshost;
    if (server == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "No myproxy server specified");
+      glite_renewal_log(ctx, LOG_ERR, "No myproxy server specified");
       ret = EINVAL;
       goto end;
    }
@@ -171,7 +171,7 @@ glite_renewal_core_renew(glite_renewal_core_context ctx,
                                server_response, tmp_proxy);
    if (ret == 1) {
       ret = EDG_WLPR_ERROR_MYPROXY;
-      edg_wlpr_Log(ctx, LOG_ERR, "Error contacting MyProxy server for proxy %s: %s",
+      glite_renewal_log(ctx, LOG_ERR, "Error contacting MyProxy server for proxy %s: %s",
                   current_proxy, verror_get_string());
       verror_clear();
       goto end;
@@ -187,13 +187,13 @@ glite_renewal_core_renew(glite_renewal_core_context ctx,
               current_proxy);
       tmp_voms_fd = mkstemp(tmp_voms_proxy);
       if (tmp_voms_fd == -1) {
-        edg_wlpr_Log(ctx, LOG_ERR, "Cannot create temporary file (%s)",
+        glite_renewal_log(ctx, LOG_ERR, "Cannot create temporary file (%s)",
                      strerror(errno));
         ret = errno;
         goto end;
       }
 
-      ret = renew_voms_creds(ctx, current_proxy, renewed_proxy, tmp_voms_proxy);
+      ret = glite_renewal_renew_voms_creds(ctx, current_proxy, renewed_proxy, tmp_voms_proxy);
       close(tmp_voms_fd);
       if (ret) {
         unlink(tmp_voms_proxy);
@@ -250,7 +250,7 @@ glite_renewal_core_destroy_ctx(glite_renewal_core_context context)
 }
 
 void
-edg_wlpr_Log(glite_renewal_core_context context, int dbg_level, const char *format, ...)
+glite_renewal_log(glite_renewal_core_context context, int dbg_level, const char *format, ...)
 {
    va_list ap;
 

diff --git a/org.glite.security.proxyrenewal/src/renewd.c b/org.glite.security.proxyrenewal/src/renewd.c
index 2a61056..3c8512c 100644 (file)
--- a/org.glite.security.proxyrenewal/src/renewd.c
+++ b/org.glite.security.proxyrenewal/src/renewd.c
@@ -125,7 +125,7 @@ proto(glite_renewal_core_context ctx, int sock)
 
    ret = edg_wlpr_Read(sock, &timeout, &buf, &buf_len);
    if (ret) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Error reading from client: %s",
+      glite_renewal_log(ctx, LOG_ERR, "Error reading from client: %s",
                    edg_wlpr_GetErrorString(ret));
       return ret;
    }
@@ -140,11 +140,11 @@ proto(glite_renewal_core_context ctx, int sock)
    command = find_command(ctx, request.command);
    if (command == NULL) {
       ret = EDG_WLPR_ERROR_UNKNOWN_COMMAND;
-      edg_wlpr_Log(ctx, LOG_ERR, "Received unknown command (%d)", request.command);
+      glite_renewal_log(ctx, LOG_ERR, "Received unknown command (%d)", request.command);
       goto end;
    }
 
-   edg_wlpr_Log(ctx, LOG_INFO, "Received command code %d for proxy %s and jobid %s",
+   glite_renewal_log(ctx, LOG_INFO, "Received command code %d for proxy %s and jobid %s",
                 request.command,
                request.proxy_filename ? request.proxy_filename : "(unspecified)",
                request.jobid ? request.jobid : "(unspecified)");
@@ -158,7 +158,7 @@ proto(glite_renewal_core_context ctx, int sock)
    ret = edg_wlpr_Write(sock, &timeout, buf, strlen(buf) + 1);
    free(buf);
    if (ret) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Error sending response to client: %s",
+      glite_renewal_log(ctx, LOG_ERR, "Error sending response to client: %s",
                    edg_wlpr_GetErrorString(ret));
       goto end;
    }
@@ -188,7 +188,7 @@ doit(glite_renewal_core_context ctx, int sock)
         ret = start_watchdog(ctx, &newpid);
         if (ret)
            return ret;
-        edg_wlpr_Log(ctx, LOG_DEBUG, "Renewal slave process re-started");
+        glite_renewal_log(ctx, LOG_DEBUG, "Renewal slave process re-started");
         child_died = 0;
         continue;
       }
@@ -196,14 +196,14 @@ doit(glite_renewal_core_context ctx, int sock)
       newsock = accept(sock, (struct sockaddr *) &client_addr, &client_addr_len);
       if (newsock == -1) {
         if (errno != EINTR)
-           edg_wlpr_Log(ctx, LOG_ERR, "accept() failed");
+           glite_renewal_log(ctx, LOG_ERR, "accept() failed");
          continue;
       }
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Got connection");
+      glite_renewal_log(ctx, LOG_DEBUG, "Got connection");
 
       flags = fcntl(newsock, F_GETFL, 0);
       if (fcntl(newsock, F_SETFL, flags | O_NONBLOCK) < 0) {
-        edg_wlpr_Log(ctx, LOG_ERR, "Can't set O_NONBLOCK mode (%s), closing.\n",
+        glite_renewal_log(ctx, LOG_ERR, "Can't set O_NONBLOCK mode (%s), closing.\n",
                      strerror(errno));
         close(newsock);
         continue;
@@ -211,10 +211,10 @@ doit(glite_renewal_core_context ctx, int sock)
         
       proto(ctx, newsock);
 
-      edg_wlpr_Log(ctx, LOG_DEBUG, "Connection closed");
+      glite_renewal_log(ctx, LOG_DEBUG, "Connection closed");
       close(newsock);
    }
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Terminating on signal %d\n",die);
+   glite_renewal_log(ctx, LOG_DEBUG, "Terminating on signal %d\n",die);
    return 0;
 }
 
@@ -239,7 +239,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
    ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_VERSION, SEPARATORS,
                           0, &request->version);
    if (ret) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading protocol specification: %s",
+      glite_renewal_log(ctx, LOG_ERR, "Protocol error reading protocol specification: %s",
                    edg_wlpr_GetErrorString(ret));
       return ret;
    }
@@ -247,14 +247,14 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
    ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_COMMAND, SEPARATORS,
                           0, &value);
    if (ret) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading command specification: %s",
+      glite_renewal_log(ctx, LOG_ERR, "Protocol error reading command specification: %s",
                    edg_wlpr_GetErrorString(ret));
       goto err;
    }
 
    ret = edg_wlpr_DecodeInt(value, (int *)(&request->command));
    if (ret) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Received non-numeric command specification (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Received non-numeric command specification (%s)",
                    value);
       free(value);
       goto err;
@@ -262,7 +262,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
    free(value);
 
    if (find_command(ctx, request->command) == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Received unknown command (%d)", request->command);
+      glite_renewal_log(ctx, LOG_ERR, "Received unknown command (%d)", request->command);
       ret = EDG_WLPR_ERROR_UNKNOWN_COMMAND;
       goto err;
    }
@@ -270,7 +270,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
    ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_MYPROXY_SERVER,
                           SEPARATORS, 0, &request->myproxy_server);
    if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading myproxy server specification: %s",
+      glite_renewal_log(ctx, LOG_ERR, "Protocol error reading myproxy server specification: %s",
                    edg_wlpr_GetErrorString(ret));
       goto err;
    }
@@ -287,7 +287,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
    ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_PROXY, SEPARATORS, 
                           0, &request->proxy_filename);
    if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading proxy specification: %s",
+      glite_renewal_log(ctx, LOG_ERR, "Protocol error reading proxy specification: %s",
                    edg_wlpr_GetErrorString(ret));
       goto err;
    }
@@ -305,7 +305,7 @@ decode_request(glite_renewal_core_context ctx, const char *msg, const size_t msg
    ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_JOBID, SEPARATORS,
                           0, &request->jobid);
    if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Protocol error reading JobId : %s",
+      glite_renewal_log(ctx, LOG_ERR, "Protocol error reading JobId : %s",
                   edg_wlpr_GetErrorString(ret));
       goto err;
    }
@@ -452,20 +452,20 @@ do_listen(glite_renewal_core_context ctx, char *socket_name, int *sock)
 
    s = socket(AF_UNIX, SOCK_STREAM, 0);
    if (s == -1) {
-      edg_wlpr_Log(ctx, LOG_ERR, "socket(): %s", strerror(errno));
+      glite_renewal_log(ctx, LOG_ERR, "socket(): %s", strerror(errno));
       return errno;
    }
 
    ret = bind(s, (struct sockaddr *)&my_addr, sizeof(my_addr));
    if (ret == -1) {
-      edg_wlpr_Log(ctx, LOG_ERR, "bind(): %s", strerror(errno));
+      glite_renewal_log(ctx, LOG_ERR, "bind(): %s", strerror(errno));
       close(s);
       return errno;
    }
 
    ret = listen(s, 50);
    if (ret == -1) {
-      edg_wlpr_Log(ctx, LOG_ERR, "listen(): %s", strerror(errno));
+      glite_renewal_log(ctx, LOG_ERR, "listen(): %s", strerror(errno));
       close(s);
       return errno;
    }
@@ -481,7 +481,7 @@ start_watchdog(glite_renewal_core_context ctx, pid_t *pid)
 
    switch ((p = fork())) {
       case -1:
-        edg_wlpr_Log(ctx, LOG_ERR, "fork() failed: %s",
+        glite_renewal_log(ctx, LOG_ERR, "fork() failed: %s",
                      strerror(errno));
         return errno;
       case 0:
@@ -549,7 +549,7 @@ int main(int argc, char *argv[])
    ctx->voms_conf = vomsconf;
 
    if (chdir(repository)) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Cannot access repository directory %s (%s)",
+      glite_renewal_log(ctx, LOG_ERR, "Cannot access repository directory %s (%s)",
                   repository, strerror(errno));
       exit(1);
    }
@@ -600,7 +600,7 @@ int main(int argc, char *argv[])
    ret = do_listen(ctx, sockname, &sock);
    if (ret)
       return 1;
-   edg_wlpr_Log(ctx, LOG_DEBUG, "Listening at %s", sockname);
+   glite_renewal_log(ctx, LOG_DEBUG, "Listening at %s", sockname);
 
    ret = doit(ctx, sock);
 

diff --git a/org.glite.security.proxyrenewal/src/renewd_locl.h b/org.glite.security.proxyrenewal/src/renewd_locl.h
index 9304535..489e909 100644 (file)
--- a/org.glite.security.proxyrenewal/src/renewd_locl.h
+++ b/org.glite.security.proxyrenewal/src/renewd_locl.h
@@ -55,7 +55,7 @@ void
 watchdog_start(glite_renewal_core_context ctx);
 
 void
-edg_wlpr_Log(glite_renewal_core_context ctx, int dbg_level, const char *format, ...);
+glite_renewal_log(glite_renewal_core_context ctx, int dbg_level, const char *format, ...);
 
 int
 decode_record(glite_renewal_core_context ctx, char *line, proxy_record *record);
@@ -67,16 +67,16 @@ void
 free_record(glite_renewal_core_context ctx, proxy_record *record);
 
 int
-load_proxy(glite_renewal_core_context ctx, const char *filename, X509 **cert, EVP_PKEY **privkey,
+glite_renewal_load_proxy(glite_renewal_core_context ctx, const char *filename, X509 **cert, EVP_PKEY **privkey,
            STACK_OF(X509) **chain, globus_gsi_cred_handle_t *proxy);
 
 int
-get_proxy_base_name(glite_renewal_core_context ctx, const char *file, char **subject);
+glite_renewal_get_proxy_base_name(glite_renewal_core_context ctx, const char *file, char **subject);
 
 int
-renew_voms_creds(glite_renewal_core_context ctx, const char *cur_file, const char *renewed_file, const char *new_file);
+glite_renewal_renew_voms_creds(glite_renewal_core_context ctx, const char *cur_file, const char *renewed_file, const char *new_file);
 
 int
-check_voms_attrs(glite_renewal_core_context ctx, const char *proxy);
+glite_renewal_check_voms_attrs(glite_renewal_core_context ctx, const char *proxy);
 
 #endif /* RENEWALD_LOCL_H */

diff --git a/org.glite.security.proxyrenewal/src/voms.c b/org.glite.security.proxyrenewal/src/voms.c
index 367c4de..687d93b 100644 (file)
--- a/org.glite.security.proxyrenewal/src/voms.c
+++ b/org.glite.security.proxyrenewal/src/voms.c
@@ -25,39 +25,39 @@ generate_proxy(glite_renewal_core_context ctx, globus_gsi_cred_handle_t cur_prox
 
    result = globus_gsi_proxy_handle_init(&proxy_handle, NULL);
    if (result) {
-      edg_wlpr_Log(ctx, LOG_ERR, "globus_gsi_proxy_handle_init() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "globus_gsi_proxy_handle_init() failed\n");
       goto end;
    }
 
    result = globus_gsi_cred_get_key(cur_proxy, &cur_proxy_priv_key);
    if (result) {
-      edg_wlpr_Log(ctx, LOG_ERR, "globus_gsi_cred_get_key() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "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) {
-      edg_wlpr_Log(ctx, LOG_ERR, "globus_gsi_cred_get_cert_type() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "globus_gsi_cred_get_cert_type() failed\n");
       goto end;
    }
 
    result = globus_gsi_proxy_handle_set_type(proxy_handle, proxy_type);
    if (result) {
-      edg_wlpr_Log(ctx, LOG_ERR, "globus_gsi_proxy_handle_set_type() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "globus_gsi_proxy_handle_set_type() failed\n");
       goto end;
    }
 
    result = globus_gsi_proxy_create_signed(proxy_handle, cur_proxy, &proxy);
    if (result) {
-      edg_wlpr_Log(ctx, LOG_ERR, "globus_gsi_proxy_handle_init() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "globus_gsi_proxy_handle_init() failed\n");
       goto end;
    }
 
    /* Get the new proxy */
    result = globus_gsi_cred_get_cert(proxy, &new_cert);
    if (result) {
-      edg_wlpr_Log(ctx, LOG_ERR, "globus_gsi_cred_get_cert() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "globus_gsi_cred_get_cert() failed\n");
       goto end;
    }
 
@@ -77,7 +77,7 @@ generate_proxy(glite_renewal_core_context ctx, globus_gsi_cred_handle_t cur_prox
    /* And put the cert back, older one is unallocated by the function */
    result = globus_gsi_cred_set_cert(proxy, voms_cert);
    if (result) {
-      edg_wlpr_Log(ctx, LOG_ERR, "globus_gsi_cred_set_cert() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "globus_gsi_cred_set_cert() failed\n");
       goto end;
    }
 
@@ -98,7 +98,7 @@ my_VOMS_Export(glite_renewal_core_context ctx, void *buf, int buf_len, X509_EXTE
    p = pp = buf;
    ac = d2i_AC(NULL, &p, buf_len+1);
    if (ac == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "d2i_AC() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "d2i_AC() failed\n");
       return 1;
    }
 
@@ -120,14 +120,14 @@ create_voms_command(glite_renewal_core_context ctx, struct vomsdata *vd, struct
    for (i = 2; i < argc; i++) {
       ret = VOMS_Ordering(argv[i], vd, &voms_error);
       if (ret == 0) {
-        edg_wlpr_Log(ctx, LOG_ERR, "VOMS_Ordering() failed\n"); 
+        glite_renewal_log(ctx, LOG_ERR, "VOMS_Ordering() failed\n"); 
         return 1;
       }
    }
 #endif
 
    if (voms_cert == NULL || *voms_cert == NULL || (*voms_cert)->std == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "Invalid VOMS certificate\n");
+      glite_renewal_log(ctx, LOG_ERR, "Invalid VOMS certificate\n");
       return 1;
    }
 
@@ -154,7 +154,7 @@ renew_voms_cert(glite_renewal_core_context ctx, struct vomsdata *vd, struct voms
    voms_contacts = VOMS_FindByVO(vd, (*voms_cert)->voname, ctx->voms_conf, NULL, &voms_error);
 
    if (voms_contacts == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "VOMS_FindByVO() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "VOMS_FindByVO() failed\n");
       return 1;
    }
 
@@ -169,7 +169,7 @@ renew_voms_cert(glite_renewal_core_context ctx, struct vomsdata *vd, struct voms
                         (void**) buf, buf_len, &voms_version,
                         vd, &voms_error);
    if (ret == 0) {
-      edg_wlpr_Log(ctx, LOG_ERR, "VOMS_Contact() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "VOMS_Contact() failed\n");
       return 1;
    }
 
@@ -202,13 +202,13 @@ renew_voms_certs(glite_renewal_core_context ctx, const char *cur_file, const cha
    setenv("X509_USER_CERT", renewed_file, 1);
    setenv("X509_USER_KEY", renewed_file, 1);
 
-   ret = load_proxy(ctx, cur_file, &cert, NULL, &chain, &cur_proxy);
+   ret = glite_renewal_load_proxy(ctx, cur_file, &cert, NULL, &chain, &cur_proxy);
    if (ret)
       goto end;
 
    vd = VOMS_Init(NULL, NULL);
    if (vd == NULL) {
-      edg_wlpr_Log(ctx, LOG_ERR, "VOMS_Init() failed\n");
+      glite_renewal_log(ctx, LOG_ERR, "VOMS_Init() failed\n");
       return 1;
    }
 
@@ -218,11 +218,11 @@ renew_voms_certs(glite_renewal_core_context ctx, const char *cur_file, const cha
         /* no VOMS cred, no problem; continue */
         /* XXX this part shouldn't be reachable, this call is only called
          * if the proxy does contain VOMS attributes */
-        edg_wlpr_Log(ctx, LOG_ERR, "No VOMS attributes found in proxy %s\n", cur_file);
+        glite_renewal_log(ctx, LOG_ERR, "No VOMS attributes found in proxy %s\n", cur_file);
         ret = 0;
         goto end;
       } else {
-        edg_wlpr_Log(ctx, LOG_ERR, "Cannot get VOMS certificate(s) from proxy");
+        glite_renewal_log(ctx, LOG_ERR, "Cannot get VOMS certificate(s) from proxy");
         ret = 1;
         goto end;
       }
@@ -257,7 +257,7 @@ renew_voms_certs(glite_renewal_core_context ctx, const char *cur_file, const cha
    if (ret)
       goto end;
 
-   ret = load_proxy(ctx, renewed_file, NULL, NULL, NULL, &new_proxy);
+   ret = glite_renewal_load_proxy(ctx, renewed_file, NULL, NULL, NULL, &new_proxy);
    if (ret)
       goto end;
 
@@ -288,20 +288,20 @@ end:
 }
 
 int
-renew_voms_creds(glite_renewal_core_context ctx, const char *cur_file, const char *renewed_file, const char *new_file)
+glite_renewal_renew_voms_creds(glite_renewal_core_context ctx, const char *cur_file, const char *renewed_file, const char *new_file)
 {
    return renew_voms_certs(ctx, cur_file, renewed_file, new_file);
 }
 
 int
-check_voms_attrs(glite_renewal_core_context ctx, const char *proxy)
+glite_renewal_check_voms_attrs(glite_renewal_core_context ctx, const char *proxy)
 {
    int ret, voms_err, present;
    X509 *cert = NULL;
    STACK_OF(X509) *chain = NULL;
    struct vomsdata *vd = NULL;
 
-   ret = load_proxy(ctx, proxy, &cert, NULL, &chain, NULL);
+   ret = glite_renewal_load_proxy(ctx, proxy, &cert, NULL, &chain, NULL);
    if (ret)
       return 0;
 
@@ -345,7 +345,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) {
-       edg_wlpr_Log(ctx, LOG_ERR, "[%d]: Unable to initialize Globus modules\n", getpid());
+       glite_renewal_log(ctx, LOG_ERR, "[%d]: Unable to initialize Globus modules\n", getpid());
        return 1;
    }