merge 3.1

diff --git a/org.glite.lb.server-bones/Makefile b/org.glite.lb.server-bones/Makefile
index 1f03996..100ef16 100644 (file)
--- a/org.glite.lb.server-bones/Makefile
+++ b/org.glite.lb.server-bones/Makefile
@@ -1,7 +1,5 @@
 # defaults
 top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
 stagedir=.
 distdir=.
 globalprefix=glite
@@ -11,11 +9,6 @@ version=0.0.1
 PREFIX=/opt/glite
 
 glite_location=/opt/glite
-globus_prefix=/opt/globus
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-expat_prefix=/opt/expat
-cares_prefix=/opt/c-ares
 
 CC=gcc
 

diff --git a/org.glite.lb.server-bones/project/version.properties b/org.glite.lb.server-bones/project/version.properties
index eac2bae..a7447c6 100644 (file)
--- a/org.glite.lb.server-bones/project/version.properties
+++ b/org.glite.lb.server-bones/project/version.properties
@@ -1,3 +1,3 @@
 #Fri Sep 02 14:17:59 CEST 2005
-module.version=2.2.2
-module.age=0
+module.version=2.2.4
+module.age=1

diff --git a/org.glite.lb.server-bones/src/srvbones.c b/org.glite.lb.server-bones/src/srvbones.c
index 54cc196..b41312c 100644 (file)
--- a/org.glite.lb.server-bones/src/srvbones.c
+++ b/org.glite.lb.server-bones/src/srvbones.c
@@ -471,6 +471,8 @@ static int slave(slave_data_init_hnd data_init_hnd, int sock)
 
                if ( newconn >= 0 )
                {
+                       int     ret;
+
                        conn = newconn;
                        srv = newsrv;
                        gettimeofday(&client_start, NULL);
@@ -505,12 +507,13 @@ static int slave(slave_data_init_hnd data_init_hnd, int sock)
 
                        to = set_connect_to;
                        if (   services[srv].on_new_conn_hnd
-                               && services[srv].on_new_conn_hnd(conn, to.tv_sec >= 0 ? &to : NULL, clnt_data) )
+                               && (ret = services[srv].on_new_conn_hnd(conn, to.tv_sec >= 0 ? &to : NULL, clnt_data)) )
                        {
-                               dprintf(("[%d] Connection not estabilished.\n", getpid()));
-                               if ( !debug ) syslog(LOG_ERR, "Connection not estabilished.\n");
+                               dprintf(("[%d] Connection not estabilished, err = %d.\n", getpid(),ret));
+                               if ( !debug ) syslog(LOG_ERR, "Connection not estabilished, err = %d.\n",ret);
                                close(conn);
                                conn = srv = -1;
+                               if (ret < 0) exit(1);
                                continue;
                        }
                        gettimeofday(&client_done, NULL);