Merged changes from the release branch (between merge_rc1_src_1 and merge_rc1_src_2)

diff --git a/org.glite.security.proxyrenewal/build.xml b/org.glite.security.proxyrenewal/build.xml
index 6ebb14f..2ddf1c0 100755 (executable)
--- a/org.glite.security.proxyrenewal/build.xml
+++ b/org.glite.security.proxyrenewal/build.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.5  2005/05/26 15:18:36  zurek
+       inserted module.build.file
+       
        Revision 1.4  2004/11/02 15:10:43  dkouril
        RPM description
        
@@ -95,7 +98,8 @@
                 Load version file 
             ========================================= -->
        <property file="${module.version.file}"/>
-       <property file="${module.build.file}"/>
+               <property file="${module.build.file}"/>
+       <property file="${module.build.file}" />
                
        <!-- ==============================================
                 Local private targets

diff --git a/org.glite.security.proxyrenewal/src/renew.c b/org.glite.security.proxyrenewal/src/renew.c
index ddae37b..e9dff3f 100644 (file)
--- a/org.glite.security.proxyrenewal/src/renew.c
+++ b/org.glite.security.proxyrenewal/src/renew.c
@@ -144,7 +144,6 @@ renew_proxy(proxy_record *record, char *basename, char **new_proxy)
       goto end;
 
    client_request->proxy_lifetime = 60 * 60 * DGPR_RETRIEVE_DEFAULT_HOURS;
-   client_request->authzcreds = repository_file;
 
    server = (record->myproxy_server) ? record->myproxy_server :
                                        socket_attrs->pshost;
@@ -165,7 +164,7 @@ renew_proxy(proxy_record *record, char *basename, char **new_proxy)
       socket_attrs->psport = MYPROXY_SERVER_PORT;
 
    verror_clear();
-   ret = myproxy_get_delegation(socket_attrs, client_request,
+   ret = myproxy_get_delegation(socket_attrs, client_request, repository_file,
                                server_response, tmp_proxy);
    if (ret == 1) {
       ret = EDG_WLPR_ERROR_MYPROXY;

diff --git a/org.glite.security.proxyrenewal/src/voms.c b/org.glite.security.proxyrenewal/src/voms.c
index cbeabec..950e60e 100644 (file)
--- a/org.glite.security.proxyrenewal/src/voms.c
+++ b/org.glite.security.proxyrenewal/src/voms.c
@@ -5,6 +5,7 @@
 #include <openssl/x509.h>
 
 #include "glite/security/voms/voms_apic.h"
+
 #include "glite/security/voms/newformat.h"
 
 char * Decode(const char *, int, int *);