bug#20917: do not propagate IL errors

diff --git a/org.glite.lb.server/src/il_lbproxy.c b/org.glite.lb.server/src/il_lbproxy.c
index 8624da1..27223d3 100644 (file)
--- a/org.glite.lb.server/src/il_lbproxy.c
+++ b/org.glite.lb.server/src/il_lbproxy.c
@@ -52,7 +52,7 @@ edg_wll_EventSendProxy(
 
        if ( edg_wll_log_event_send(ctx, lbproxy_ilog_socket_path, filepos,
                                                event, strlen(event), 1, &ctx->p_tmp_timeout) ) {
-               edg_wll_UpdateError(ctx, 0, "edg_wll_log_event_send()");
+               edg_wll_UpdateError(ctx, EDG_WLL_IL_PROTO, "edg_wll_log_event_send()");
                _err(-1);
        }
 
@@ -61,12 +61,7 @@ out:
        if ( event_file ) free(event_file);
 
        if ( !err ) return 0;
-       if ( err < 0 ) {
-               /* do not propagate IL errors */
-               edg_wll_ResetError(ctx);
-               return 0;
-       } else {
-               edg_wll_UpdateError(ctx, 0, "edg_wll_EventSendProxy()");
-               return edg_wll_Error(ctx, NULL, NULL);
-       }
+       edg_wll_UpdateError(ctx, 0, "edg_wll_EventSendProxy()");
+       if ( err < 0 ) return 0;
+       return edg_wll_Error(ctx, NULL, NULL);
 }

diff --git a/org.glite.lb.server/src/request.c b/org.glite.lb.server/src/request.c
index cb84b1f..60502ce 100644 (file)
--- a/org.glite.lb.server/src/request.c
+++ b/org.glite.lb.server/src/request.c
@@ -80,7 +80,14 @@ create_reply(const edg_wll_Context ctx, char **buf)
     break;
 
   case EDG_WLL_IL_PROTO:
-    err_code = LB_PROTO;
+    if ( ctx->isProxy ) {
+        /* Do not propagate IL errors */
+        err_code = LB_OK;
+       if (err_msg) free(err_msg);
+       err_msg = NULL;
+    } else {
+        err_code = LB_PROTO;
+    }
     break;
     
   default: