Builds after merge _RC31

diff --git a/org.glite.lb.proxy/project/version.properties b/org.glite.lb.proxy/project/version.properties
index 81d0890..e2d64fb 100644 (file)
--- a/org.glite.lb.proxy/project/version.properties
+++ b/org.glite.lb.proxy/project/version.properties
@@ -1,3 +1,3 @@
 #Fri Sep 02 14:18:53 CEST 2005
-module.version=1.4.0
+module.version=1.3.3
 module.age=0

diff --git a/org.glite.lb.proxy/src/lbproxy.c b/org.glite.lb.proxy/src/lbproxy.c
index c84c9cf..05b581f 100644 (file)
--- a/org.glite.lb.proxy/src/lbproxy.c
+++ b/org.glite.lb.proxy/src/lbproxy.c
@@ -220,8 +220,8 @@ int main(int argc, char *argv[])
 
        fpid = fopen(pidfile, "w");
        if ( !fpid ) { perror(pidfile); return 1; }
-       fprintf(fpid, "%d", getpid());
-       fclose(fpid);
+       if (fprintf(fpid, "%d", getpid()) <= 0) { perror(pidfile); return 1; }
+       if (fclose(fpid) != 0) { perror(pidfile); return 1; }
 
        semkey = ftok(pidfile,0);
 
@@ -389,7 +389,7 @@ int handle_conn(int conn, struct timeval *timeout, void *data)
        edg_wll_Context         ctx;
        struct timeval          conn_start, now;
 
-       if ( !(ctx = (edg_wll_Context) calloc(1, sizeof(*ctx))) ) {
+        if ( edg_wll_InitContext(&ctx) ) {
                dprintf(("Couldn't create context"));
                return -1;
        }