From 04f36df29517db9cfbcc3c1d8e3600c246e6c395 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 15 Aug 2012 08:02:58 +0000 Subject: [PATCH] Improved reaction to missing HTML style --- org.glite.lb.server/src/bkserverd.c | 2 ++ org.glite.lb.server/src/lb_html.c | 1 + 2 files changed, 3 insertions(+) diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c index b434f52..16e801b 100644 --- a/org.glite.lb.server/src/bkserverd.c +++ b/org.glite.lb.server/src/bkserverd.c @@ -597,6 +597,7 @@ int main(int argc, char *argv[]) glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_DEBUG, "Using HTML header file %s", html_header); } else { glite_common_log(LOG_CATEGORY_CONTROL, html_header_forced ? LOG_PRIORITY_ERROR : LOG_PRIORITY_INFO, "Cannot open HTML header file %s", html_header); + free(html_header), html_header = NULL; } } @@ -1105,6 +1106,7 @@ int bk_handle_connection(int conn, struct timeval *timeout, void *data) if (policy_file) ctx->authz_policy_file = strdup(policy_file); if (html_header) ctx->html_header_file = strdup(html_header); + else ctx->html_header_file = NULL; gettimeofday(&conn_start, 0); diff --git a/org.glite.lb.server/src/lb_html.c b/org.glite.lb.server/src/lb_html.c index 3417b4f..dd5bf6f 100644 --- a/org.glite.lb.server/src/lb_html.c +++ b/org.glite.lb.server/src/lb_html.c @@ -53,6 +53,7 @@ char *get_html_header(edg_wll_Context ctx, int text) { rlen = getdelim( &header, &header_len, '\0', header_file); fclose (header_file); } + else rlen = -1; if (rlen == -1 ) header=strdup(""); -- 1.8.2.3