X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.c;h=517d9022f1cfc30873fb4dcf5aa2710fee495738;hb=521b6e262531f937cb5ca445b46b46669e63d736;hp=75e48a29d07e780070206d9a3b9c5a5ba023864f;hpb=f95122885a6ff906b7273f204bb1ef048667c896;p=privoxy.git diff --git a/jcc.c b/jcc.c index 75e48a29..517d9022 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.10 2001/05/26 15:26:15 jongfoster Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.23 2001/07/02 02:28:25 iwanttokeepanon Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -33,6 +33,96 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.10 2001/05/26 15:26:15 jongfoster Exp $"; * * Revisions : * $Log: jcc.c,v $ + * Revision 1.23 2001/07/02 02:28:25 iwanttokeepanon + * Added "#ifdef ACL_FILES" conditional compilation to line 1291 to exclude + * the `block_acl' call. This prevents a compilation error when the user + * does not wish to use the "ACL" feature. + * + * Revision 1.22 2001/06/29 21:45:41 oes + * Indentation, CRLF->LF, Tab-> Space + * + * Revision 1.21 2001/06/29 13:29:36 oes + * - Cleaned up, improved comments + * - Unified all possible interceptors (CGI, + * block, trust, fast_redirect) in one + * place, with one (CGI) answer generation + * mechansim. Much clearer now. + * - Removed the GIF image generation, which + * is now done in filters.c:block_url() + * - Made error conditions like domain lookup + * failiure or (various) problems while talking + * to the server use cgi.c:error_response() + * instead of generating HTML/HTTP in chat() (yuck!) + * - Removed logentry from cancelled commit + * + * Revision 1.20 2001/06/09 10:55:28 jongfoster + * Changing BUFSIZ ==> BUFFER_SIZE + * + * Revision 1.19 2001/06/07 23:12:52 jongfoster + * Replacing function pointer in struct gateway with a directly + * called function forwarded_connect(). + * Replacing struct gateway with struct forward_spec + * + * Revision 1.18 2001/06/03 19:12:16 oes + * introduced new cgi handling + * + * Revision 1.17 2001/06/01 20:07:23 jongfoster + * Now uses action +image-blocker{} rather than config->tinygif + * + * Revision 1.16 2001/06/01 18:49:17 jongfoster + * Replaced "list_share" with "list" - the tiny memory gain was not + * worth the extra complexity. + * + * Revision 1.15 2001/05/31 21:24:47 jongfoster + * Changed "permission" to "action" throughout. + * Removed DEFAULT_USER_AGENT - it must now be specified manually. + * Moved vanilla wafer check into chat(), since we must now + * decide whether or not to add it based on the URL. + * + * Revision 1.14 2001/05/29 20:14:01 joergs + * AmigaOS bugfix: PCRS needs a lot of stack, stacksize for child threads + * increased. + * + * Revision 1.13 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * + * Revision 1.12 2001/05/27 22:17:04 oes + * + * - re_process_buffer no longer writes the modified buffer + * to the client, which was very ugly. It now returns the + * buffer, which it is then written by chat. + * + * - content_length now adjusts the Content-Length: header + * for modified documents rather than crunch()ing it. + * (Length info in csp->content_length, which is 0 for + * unmodified documents) + * + * - For this to work, sed() is called twice when filtering. + * + * Revision 1.11 2001/05/26 17:27:53 jongfoster + * Added support for CLF and fixed LOG_LEVEL_LOG. + * Also did CRLF->LF fix of my previous patch. + * * Revision 1.10 2001/05/26 15:26:15 jongfoster * ACL feature now provides more security by immediately dropping * connections from untrusted hosts. @@ -170,6 +260,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.10 2001/05/26 15:26:15 jongfoster Exp $"; #endif #include "project.h" +#include "list.h" #include "jcc.h" #include "filters.h" #include "loaders.h" @@ -180,12 +271,12 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.10 2001/05/26 15:26:15 jongfoster Exp $"; #include "errlog.h" #include "jbsockets.h" #include "gateway.h" +#include "actions.h" +#include "cgi.h" const char jcc_h_rcs[] = JCC_H_VERSION; const char project_h_rcs[] = PROJECT_H_VERSION; -const char DEFAULT_USER_AGENT[] ="User-Agent: Mozilla (X11; I; Linux 2.0.32 i586)"; - struct client_state clients[1]; struct file_list files[1]; @@ -212,6 +303,17 @@ static int32 server_thread(void *data); #endif +/* The vanilla wafer. */ +static const char VANILLA_WAFER[] = + "NOTICE=TO_WHOM_IT_MAY_CONCERN_" + "Do_not_send_me_any_copyrighted_information_other_than_the_" + "document_that_I_am_requesting_or_any_of_its_necessary_components._" + "In_particular_do_not_send_me_any_cookies_that_" + "are_subject_to_a_claim_of_copyright_by_anybody._" + "Take_notice_that_I_refuse_to_be_bound_by_any_license_condition_" + "(copyright_or_otherwise)_applying_to_any_cookie._"; + + /********************************************************************* * * Function : chat @@ -235,39 +337,46 @@ static int32 server_thread(void *data); *********************************************************************/ static void chat(struct client_state *csp) { -/* This next line is a little ugly, but it simplifies the if statement below. */ -/* Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't */ +/* + * This next lines are a little ugly, but they simplifies the if statements below. + * Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't + * And if FORCE_LOAD, then we want the if to test "csp->toggled_on", else we don't + */ #ifdef TOGGLE -# define IS_TOGGLED_ON csp->toggled_on && +# define IS_TOGGLED_ON_AND (csp->toggled_on) && #else /* ifndef TOGGLE */ -# define IS_TOGGLED_ON +# define IS_TOGGLED_ON_AND #endif /* ndef TOGGLE */ +#ifdef FORCE_LOAD +# define IS_NOT_FORCED_AND (!csp->force) && +#else /* ifndef FORCE_LOAD */ +# define IS_NOT_FORCED_AND +#endif /* def FORCE_LOAD */ -/* This next line is a little ugly, but it simplifies the if statement below. */ -/* Basically if TRUST_FILES, then we want the if to call "trust_url", else we don't */ -#ifdef TRUST_FILES -# define IS_TRUSTED_URL (p = trust_url(http, csp)) || -#else /* ifndef TRUST_FILES */ -# define IS_TRUSTED_URL -#endif /* ndef TRUST_FILES */ +#define IS_ENABLED_AND IS_TOGGLED_ON_AND IS_NOT_FORCED_AND - char buf[BUFSIZ], *hdr, *p, *req; + char buf[BUFFER_SIZE]; + char *hdr, *p, *req; char *err = NULL; - char *eno; fd_set rfds; int n, maxfd, server_body; int ms_iis5_hack = 0; int byte_count = 0; - const struct gateway *gw; + const struct forward_spec * fwd; struct http_request *http; #ifdef KILLPOPUPS int block_popups; /* bool, 1==will block popups */ int block_popups_now = 0; /* bool, 1==currently blocking popups */ #endif /* def KILLPOPUPS */ -#ifdef PCRS - int pcrs_filter; /* bool, 1==will filter through pcrs */ - int filtering = 0; /* bool, 1==currently filtering through pcrs */ -#endif /* def PCRS */ + + int pcrs_filter; /* bool, 1==will filter through pcrs */ + int gif_deanimate; /* bool, 1==will deanimate gifs */ + + /* Function that does the content filtering for the current request */ + char *(*content_filter)() = NULL; + + /* Skeleton for HTTP response, if we should intercept the request */ + struct http_response *rsp; http = csp->http; @@ -330,7 +439,7 @@ static void chat(struct client_state *csp) /* decide how to route the HTTP request */ - if ((gw = forward_url(http, csp)) == NULL) + if ((fwd = forward_url(http, csp)) == NULL) { log_error(LOG_LEVEL_FATAL, "gateway spec is NULL!?!? This can't happen!"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ @@ -361,7 +470,7 @@ static void chat(struct client_state *csp) * */ - if (gw->forward_host) + if (fwd->forward_host) { /* if forwarding, just pass the request as is */ enlist(csp->headers, http->cmd); @@ -387,25 +496,37 @@ static void chat(struct client_state *csp) #ifdef TOGGLE if (!csp->toggled_on) { - /* Most compatible set of permissions */ - csp->permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS; + /* Most compatible set of actions (i.e. none) */ + init_current_action(csp->action); } else +#endif /* ndef TOGGLE */ { - csp->permissions = url_permissions(http, csp); + url_actions(http, csp); } -#else /* ifndef TOGGLE */ - csp->permissions = url_permissions(http, csp); -#endif /* ndef TOGGLE */ + +#ifdef JAR_FILES + /* + * If we're logging cookies in a cookie jar, and the user has not + * supplied any wafers, and the user has not told us to suppress the + * vanilla wafer, then send the vanilla wafer. + */ + if ((csp->config->jarfile != NULL) + && (csp->action->multi[ACTION_MULTI_WAFER]->next == NULL) + && ((csp->action->flags & ACTION_VANILLA_WAFER) != 0)) + { + enlist(csp->action->multi[ACTION_MULTI_WAFER], VANILLA_WAFER); + } +#endif /* def JAR_FILES */ #ifdef KILLPOPUPS - block_popups = ((csp->permissions & PERMIT_POPUPS) == 0); + block_popups = ((csp->action->flags & ACTION_NO_POPUPS) != 0); #endif /* def KILLPOPUPS */ -#ifdef PCRS + pcrs_filter = (csp->rlist != NULL) && /* There are expressions to be used */ - ((csp->permissions & PERMIT_RE_FILTER) != 0); -#endif /* def PCRS */ + ((csp->action->flags & ACTION_FILTER) != 0); + gif_deanimate = ((csp->action->flags & ACTION_DEANIMATE) != 0); /* grab the rest of the client's headers */ @@ -429,85 +550,67 @@ static void chat(struct client_state *csp) freez(p); } - /* filter it as required */ + /* We have a request. */ hdr = sed(client_patterns, add_client_headers, csp); - destroy_list(csp->headers); - /* Check the request against all rules, unless - * we're toggled off or in force mode. + /* + * Now, check to see if we need to intercept it, i.e. + * If */ - if (IS_TOGGLED_ON -#ifdef FORCE_LOAD - (!csp->force) && -#endif /* def FORCE_LOAD */ - ( (p = intercept_url(http, csp)) || - IS_TRUSTED_URL - (p = block_url(http, csp)) + if ( + /* a CGI call was detected and answered */ + (NULL != (rsp = dispatch_cgi(csp))) + + /* or we are enabled and... */ + || (IS_ENABLED_AND ( + + /* ..the request was blocked */ + ( NULL != (rsp = block_url(csp))) + + /* ..or untrusted */ +#ifdef TRUST_FILES + || ( NULL != (rsp = trust_url(csp))) +#endif + + /* ..or a fast redirect kicked in */ #ifdef FAST_REDIRECTS - || (csp->config->fast_redirects && (p = redirect_url(http, csp))) + || (((csp->action->flags & ACTION_FAST_REDIRECTS) != 0) && + (NULL != (rsp = redirect_url(csp)))) #endif /* def FAST_REDIRECTS */ - )) + )) + ) { + /* Write the answer to the client */ + if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) + || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) + { + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); + } + #ifdef STATISTICS + /* Count as a rejected request */ csp->rejected = 1; #endif /* def STATISTICS */ + /* Log (FIXME: All intercept reasons apprear as "crunch" with Status 200) */ log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 3", csp->ip_addr_str, http->cmd); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 1", - csp->ip_addr_str, http->cmd); - -#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) - /* Block as image? */ - if ( (csp->config->tinygif > 0) && block_imageurl(http, csp) ) - { - /* Send "blocked" image */ - log_error(LOG_LEVEL_GPC, "%s%s image crunch!", - http->hostport, http->path); - - if ((csp->config->tinygif == 2) || strstr(http->path, "ijb-send-banner")) - { - write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); - } - else if (csp->config->tinygif == 1) - { - write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1); - } - else if ((csp->config->tinygif == 3) && (csp->config->tinygifurl)) - { - freez(p); - p = (char *)malloc(sizeof(HTTP_REDIRECT_TEMPLATE) - + strlen(csp->config->tinygifurl)); - sprintf(p, HTTP_REDIRECT_TEMPLATE, csp->config->tinygifurl); - write_socket(csp->cfd, p, strlen(p)); - } - else - { - write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); - } - } - else -#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */ - /* Block as HTML */ - { - /* Send HTML "blocked" message, interception, or redirection result */ - write_socket(csp->cfd, p, strlen(p)); - } - - freez(p); + /* Clean up and return */ + free_http_response(rsp); freez(hdr); return; } log_error(LOG_LEVEL_GPC, "%s%s", http->hostport, http->path); - if (gw->forward_host) + if (fwd->forward_host) { log_error(LOG_LEVEL_CONNECT, "via %s:%d to: %s", - gw->forward_host, gw->forward_port, http->hostport); + fwd->forward_host, fwd->forward_port, http->hostport); } else { @@ -516,7 +619,7 @@ static void chat(struct client_state *csp) /* here we connect to the server, gateway, or the forwarder */ - csp->sfd = (gw->conn)(gw, http, csp); + csp->sfd = forwarded_connect(fwd, http, csp); if (csp->sfd < 0) { @@ -525,32 +628,37 @@ static void chat(struct client_state *csp) if (errno == EINVAL) { - err = zalloc(strlen(CNXDOM) + strlen(http->host)); - sprintf(err, CNXDOM, http->host); + rsp = error_response(csp, "no-such-domain", errno); log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 404 0", csp->ip_addr_str, http->cmd); } else { - eno = safe_strerror(errno); - err = zalloc(strlen(CFAIL) + strlen(http->hostport) + strlen(eno)); - sprintf(err, CFAIL, http->hostport, eno); + rsp = error_response(csp, "connect-failed", errno); log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", csp->ip_addr_str, http->cmd); } - write_socket(csp->cfd, err, strlen(err)); + /* Write the answer to the client */ + if(rsp) + { + if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) + || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) + { + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); + } + } - freez(err); + free_http_response(rsp); freez(hdr); return; } log_error(LOG_LEVEL_CONNECT, "OK"); - if (gw->forward_host || (http->ssl == 0)) + if (fwd->forward_host || (http->ssl == 0)) { /* write the client's (modified) header to the server * (along with anything else that may be in the buffer) @@ -564,15 +672,21 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_CONNECT, "write header to: %s failed: %E", http->hostport); - eno = safe_strerror(errno); - err = zalloc(strlen(CFAIL) + strlen(http->hostport) + strlen(eno)); - sprintf(err, CFAIL, http->hostport, eno); - write_socket(csp->cfd, err, strlen(err)); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", csp->ip_addr_str, http->cmd); - freez(err); + rsp = error_response(csp, "connect-failed", errno); + + if(rsp) + { + if ((write_socket(csp->cfd, rsp->head, n) != n) + || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) + { + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); + } + } + + free_http_response(rsp); freez(hdr); return; } @@ -645,7 +759,7 @@ static void chat(struct client_state *csp) /* * The server wants to talk. It could be the header or the body. * If `hdr' is null, then it's the header otherwise it's the body. - * FIXME: Does `hdr' really mean `host'? + * FIXME: Does `hdr' really mean `host'? No. */ @@ -658,14 +772,21 @@ static void chat(struct client_state *csp) { log_error(LOG_LEVEL_ERROR, "read from: %s failed: %E", http->host); - eno = safe_strerror(errno); - sprintf(buf, CFAIL, http->hostport, eno); - freez(eno); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0", csp->ip_addr_str, http->cmd); - write_socket(csp->cfd, buf, strlen(buf)); + rsp = error_response(csp, "connect-failed", errno); + + if(rsp) + { + if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length) + || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length)) + { + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); + } + } + + free_http_response(rsp); return; } @@ -702,19 +823,47 @@ static void chat(struct client_state *csp) */ if (n == 0) { - /* This hack must only be enforced for headers. */ + if (server_body || http->ssl) { -#ifdef PCRS - if (filtering) + /* + * If we have been buffering up the document, + * now is the time to apply content modification + * and send the result to the client. + */ + if (content_filter) { - re_process_buffer(csp); + /* + * If the content filter fails, use the original + * buffer and length. + * (see p != NULL ? p : csp->iob->cur below) + */ + if (NULL == (p = (*content_filter)(csp))) + { + csp->content_length = csp->iob->eod - csp->iob->cur; + } + + hdr = sed(server_patterns, add_server_headers, csp); + n = strlen(hdr); + + if ((write_socket(csp->cfd, hdr, n) != n) + || (write_socket(csp->cfd, p != NULL ? p : csp->iob->cur, csp->content_length) != csp->content_length)) + { + log_error(LOG_LEVEL_CONNECT, "write modified content to client failed: %E"); + return; + } + + freez(hdr); + freez(p); } -#endif /* def PCRS */ + break; /* "game over, man" */ } - /* Let's pretend the server just sent us a blank line. */ + /* + * This is NOT the body, so + * Let's pretend the server just sent us a blank line. + */ n = sprintf(buf, "\r\n"); /* @@ -732,13 +881,13 @@ static void chat(struct client_state *csp) if (server_body || http->ssl) { -#ifdef PCRS - if (filtering) + + if (content_filter) { add_to_iob(csp, buf, n); /* Buffer the body for filtering */ } + else -#endif /* def PCRS */ { /* just write */ if (write_socket(csp->cfd, buf, n) != n) @@ -817,37 +966,39 @@ static void chat(struct client_state *csp) #ifdef KILLPOPUPS /* Start blocking popups if appropriate. */ - if (csp->is_text && /* It's a text / * MIME-Type */ - !http->ssl && /* We talk plaintext */ - block_popups) + if ((csp->content_type & CT_TEXT) && /* It's a text / * MIME-Type */ + !http->ssl && /* We talk plaintext */ + block_popups) /* Policy allows */ { block_popups_now = 1; } #endif /* def KILLPOPUPS */ -#ifdef PCRS - /* Start re_filtering this if appropriate. */ + /* Buffer and pcrs filter this if appropriate. */ - if (csp->is_text && /* It's a text / * MIME-Type */ - !http->ssl && /* We talk plaintext */ - pcrs_filter) /* Policy allows */ + if ((csp->content_type & CT_TEXT) && /* It's a text / * MIME-Type */ + !http->ssl && /* We talk plaintext */ + pcrs_filter) /* Policy allows */ { - filtering = 1; + content_filter = pcrs_filter_response; } -/* This next line is a little ugly, but it simplifies the if statement below. */ -/* Basically if using PCRS, we want the OR condition to require "!filtering" */ -#define NOT_FILTERING_AND !filtering && - -#else /* not def PCRS */ + /* Buffer and gif_deanimate this if appropriate. */ -#define NOT_FILTERING_AND + if ((csp->content_type & CT_GIF) && /* It's a image/gif MIME-Type */ + !http->ssl && /* We talk plaintext */ + gif_deanimate) /* Policy allows */ + { + content_filter = gif_deanimate_response; + } -#endif /* def PCRS */ - if ((write_socket(csp->cfd, hdr, n) != n) - || (NOT_FILTERING_AND (n = flush_socket(csp->cfd, csp) < 0))) + /* + * Only write if we're not buffering for content modification + */ + if (!content_filter && ((write_socket(csp->cfd, hdr, n) != n) + || (n = flush_socket(csp->cfd, csp) < 0))) { log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E"); @@ -859,7 +1010,7 @@ static void chat(struct client_state *csp) return; } - NOT_FILTERING_AND (byte_count += n); + !content_filter && (byte_count += n); /* we're finished with the server's header */ @@ -920,7 +1071,6 @@ static void serve(struct client_state *csp) #ifdef __BEOS__ - /********************************************************************* * * Function : server_thread @@ -939,7 +1089,6 @@ static int32 server_thread(void *data) return 0; } - #endif @@ -974,7 +1123,7 @@ int main(int argc, const char *argv[]) { configfile = #ifdef AMIGA - "AmiTCP:db/junkbuster.config" + "AmiTCP:db/junkbuster/config" #elif !defined(_WIN32) "config" #else @@ -999,10 +1148,6 @@ int main(int argc, const char *argv[]) } #endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */ -#ifdef AMIGA - InitAmiga(); -#endif - Argc = argc; Argv = argv; @@ -1013,7 +1158,9 @@ int main(int argc, const char *argv[]) files->next = NULL; -#ifdef _WIN32 +#ifdef AMIGA + InitAmiga(); +#elif defined(_WIN32) InitWin32(); #endif @@ -1090,7 +1237,7 @@ static void listen_loop(void) #endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */ sweep(); - if ( NULL == (csp = (struct client_state *) malloc(sizeof(*csp))) ) + if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) ) { log_error(LOG_LEVEL_FATAL, "malloc(%d) for csp failed: %E", sizeof(*csp)); continue; @@ -1170,6 +1317,7 @@ static void listen_loop(void) /* Never get here - LOG_LEVEL_FATAL causes program exit */ } +#ifdef ACL_FILES if (block_acl(NULL,csp)) { log_error(LOG_LEVEL_CONNECT, "Connection dropped due to ACL"); @@ -1177,6 +1325,7 @@ static void listen_loop(void) freez(csp); continue; } +#endif /* def ACL_FILES */ /* add it to the list of clients */ csp->next = clients->next; @@ -1222,7 +1371,7 @@ static void listen_loop(void) NP_Output, Output(), NP_CloseOutput, FALSE, NP_Name, (ULONG)"junkbuster child", - NP_StackSize, 20*1024, + NP_StackSize, 200*1024, TAG_DONE))) { childs++; @@ -1241,7 +1390,7 @@ static void listen_loop(void) if (child_id < 0) /* failed */ { - char buf[BUFSIZ]; + char buf[BUFFER_SIZE]; log_error(LOG_LEVEL_ERROR, "can't fork: %E");