-const char jcc_rcs[] = "$Id: jcc.c,v 1.162 2007/12/06 17:54:57 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.163 2007/12/13 01:47:11 david__schmidt Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.163 2007/12/13 01:47:11 david__schmidt
+ * Make sure all console-mode apps get a usage() instance
+ *
* Revision 1.162 2007/12/06 17:54:57 fabiankeil
* Reword NO_SERVER_DATA_RESPONSE to make it harder
* to misunderstand what the message is all about.
|| (csp->action->flags & ACTION_LIMIT_CONNECT
&& !match_portlist(csp->action->string[ACTION_STRING_LIMIT_CONNECT], csp->http->port)) )
{
+ const char *acceptable_connect_ports =
+ csp->action->string[ACTION_STRING_LIMIT_CONNECT] ?
+ csp->action->string[ACTION_STRING_LIMIT_CONNECT] :
+ "443 (implied default)";
if (csp->action->flags & ACTION_TREAT_FORBIDDEN_CONNECTS_LIKE_BLOCKS)
{
/*
*/
log_error(LOG_LEVEL_INFO, "Request from %s marked for blocking. "
"limit-connect{%s} doesn't allow CONNECT requests to port %d.",
- csp->ip_addr_str, csp->action->string[ACTION_STRING_LIMIT_CONNECT],
- csp->http->port);
+ csp->ip_addr_str, acceptable_connect_ports, csp->http->port);
csp->action->flags |= ACTION_BLOCK;
http->ssl = 0;
}
write_socket(csp->cfd, CFORBIDDEN, strlen(CFORBIDDEN));
log_error(LOG_LEVEL_INFO, "Request from %s denied. "
"limit-connect{%s} doesn't allow CONNECT requests to port %d.",
- csp->ip_addr_str, csp->action->string[ACTION_STRING_LIMIT_CONNECT],
- csp->http->port);
+ csp->ip_addr_str, acceptable_connect_ports, csp->http->port);
assert(NULL != csp->http->ocmd);
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 403 0", csp->ip_addr_str, csp->http->ocmd);