-const char loaders_rcs[] = "$Id: loaders.c,v 1.91 2012/06/19 12:50:22 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.96 2013/11/24 14:22:51 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
last_active->next = client_list->next;
freez(csp->ip_addr_str);
+ freez(csp->client_iob->buf);
freez(csp->iob->buf);
freez(csp->error_message);
{
next = cur->next;
- free_url_spec(cur->url);
+ free_pattern_spec(cur->url);
free(cur);
cur = next;
FILE *fp;
struct block_spec *b, *bl;
- struct url_spec **tl;
+ struct pattern_spec **tl;
char *buf = NULL;
int reject, trusted;
b->reject = reject;
/* Save the URL pattern */
- if (create_url_spec(b->url, buf))
+ if (create_pattern_spec(b->url, buf))
{
fclose(fp);
goto load_trustfile_error;
*********************************************************************/
void unload_forward_spec(struct forward_spec *fwd)
{
- free_url_spec(fwd->url);
+ free_pattern_spec(fwd->url);
freez(fwd->gateway_host);
freez(fwd->forward_host);
free(fwd);
* FALSE otherwise.
*
*********************************************************************/
-int any_loaded_file_changed(const struct file_list *files_to_check)
+int any_loaded_file_changed(const struct client_state *csp)
{
- const struct file_list *file_to_check = files_to_check;
+ const struct file_list *file_to_check = csp->config->config_file_list;
+ int i;
+
+ if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified))
+ {
+ return TRUE;
+ }
- while (file_to_check != NULL)
+ for (i = 0; i < MAX_AF_FILES; i++)
{
- if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified))
+ if (csp->actions_list[i])
+ {
+ file_to_check = csp->actions_list[i];
+ if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified))
+ {
+ return TRUE;
+ }
+ }
+ }
+
+ for (i = 0; i < MAX_AF_FILES; i++)
+ {
+ if (csp->rlist[i])
+ {
+ file_to_check = csp->rlist[i];
+ if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified))
+ {
+ return TRUE;
+ }
+ }
+ }
+
+#ifdef FEATURE_TRUST
+ if (csp->tlist)
+ {
+ if (file_has_been_modified(csp->tlist->filename, csp->tlist->lastmodified))
{
return TRUE;
}
- file_to_check = file_to_check->next;
}
+#endif /* def FEATURE_TRUST */
+
return FALSE;
}