From 0d70eba9586555d1e399b5f733c08c83a446c308 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kou=C5=99il?= Date: Sun, 20 Mar 2005 07:26:51 +0000 Subject: [PATCH] use voms config file specified on the command-line if it was given --- org.glite.security.proxyrenewal/project/version.properties | 2 +- org.glite.security.proxyrenewal/src/renewd.c | 3 +-- org.glite.security.proxyrenewal/src/voms.c | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/org.glite.security.proxyrenewal/project/version.properties b/org.glite.security.proxyrenewal/project/version.properties index 09ad6f1..a5a7632 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.6 +module.version = 1.0.7 module.age = 1 diff --git a/org.glite.security.proxyrenewal/src/renewd.c b/org.glite.security.proxyrenewal/src/renewd.c index 49e4b17..cd2bef8 100644 --- a/org.glite.security.proxyrenewal/src/renewd.c +++ b/org.glite.security.proxyrenewal/src/renewd.c @@ -15,8 +15,7 @@ char *vomsdir = NULL; int voms_enabled = 0; char *cert = NULL; char *key = NULL; - -char *vomsconf = "/opt/edg/etc/vomses"; +char *vomsconf = NULL; static volatile int die = 0, child_died = 0; diff --git a/org.glite.security.proxyrenewal/src/voms.c b/org.glite.security.proxyrenewal/src/voms.c index 70e6b4f..e9cf837 100644 --- a/org.glite.security.proxyrenewal/src/voms.c +++ b/org.glite.security.proxyrenewal/src/voms.c @@ -11,6 +11,8 @@ char * Decode(const char *, int, int *); char **listadd(char **, char *, int); +extern char *vomsconf; + static int generate_proxy(globus_gsi_cred_handle_t cur_proxy, X509_EXTENSION *voms_extension, const char *new_file) @@ -151,7 +153,7 @@ renew_voms_cert(struct vomsdata *vd, struct voms **voms_cert, struct contactdata **voms_contacts = NULL; char *command = NULL; - voms_contacts = VOMS_FindByVO(vd, (*voms_cert)->voname, NULL, NULL, &voms_error); + voms_contacts = VOMS_FindByVO(vd, (*voms_cert)->voname, vomsconf, NULL, &voms_error); if (voms_contacts == NULL) { fprintf(stderr, "VOMS_FindByVO() failed\n"); -- 1.8.2.3