-const char actions_rcs[] = "$Id: actions.c,v 1.88 2013/11/24 14:22:51 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.91 2013/12/24 13:35:07 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
#include "urlmatch.h"
#include "cgi.h"
#include "ssplit.h"
+#include "filters.h"
const char actions_h_rcs[] = ACTIONS_H_VERSION;
while (cur != NULL)
{
next = cur->next;
- free_url_spec(cur->url);
+ free_pattern_spec(cur->url);
if ((next == NULL) || (next->action != cur->action))
{
/*
* 3 : multi_index = The index where to look for the filter.
* 4 : filter_type = The filter type the caller is interested in.
*
- * Returns : 0 => All referenced filters exists, everything else is an error.
+ * Returns : 0 => All referenced filters exist, everything else is an error.
*
*********************************************************************/
static int referenced_filters_are_missing(const struct client_state *csp,
const struct action_spec *cur_action, int multi_index, enum filter_type filter_type)
{
- int i;
- struct file_list *fl;
- struct re_filterfile_spec *b;
struct list_entry *filtername;
for (filtername = cur_action->multi_add[multi_index]->first;
filtername; filtername = filtername->next)
{
- int filter_found = 0;
- for (i = 0; i < MAX_AF_FILES; i++)
- {
- fl = csp->rlist[i];
- if ((NULL == fl) || (NULL == fl->f))
- {
- continue;
- }
-
- for (b = fl->f; b; b = b->next)
- {
- if (b->type != filter_type)
- {
- continue;
- }
- if (strcmp(b->name, filtername->str) == 0)
- {
- filter_found = 1;
- }
- }
- }
- if (!filter_found)
+ if (NULL == get_filter(csp, filtername->str, filter_type))
{
log_error(LOG_LEVEL_ERROR, "Missing filter '%s'", filtername->str);
return 1;
cur_action_used = 1;
/* Save the URL pattern */
- if (create_url_spec(perm->url, buf))
+ if (create_pattern_spec(perm->url, buf))
{
fclose(fp);
log_error(LOG_LEVEL_FATAL,