-const char loaders_rcs[] = "$Id: loaders.c,v 1.72 2009/04/24 15:29:43 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.75 2010/05/26 23:01:47 ler762 Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
unsigned int sweep(void)
{
struct file_list *fl, *nfl;
- struct client_state *csp, *last_active;
+ struct client_state *csp;
+ struct client_states *last_active, *client_list;
int i;
unsigned int active_threads = 0;
}
last_active = clients;
- csp = clients->next;
+ client_list = clients->next;
- while (NULL != csp)
+ while (NULL != client_list)
{
+ csp = &client_list->csp;
if (csp->flags & CSP_FLAG_ACTIVE)
{
/* Mark this client's files as active */
active_threads++;
- last_active = csp;
- csp = csp->next;
+ last_active = client_list;
+ client_list = client_list->next;
}
else
/*
* This client is not active. Free its resources.
*/
{
- last_active->next = csp->next;
+ last_active->next = client_list->next;
freez(csp->ip_addr_str);
freez(csp->iob->buf);
}
#endif /* def FEATURE_STATISTICS */
- freez(csp);
+ freez(client_list);
- csp = last_active->next;
+ client_list = last_active->next;
}
}
else
{
assert(buf2);
- assert(strlen(buf2) + 1U < buflen);
- strncpy(buf, buf2, buflen - 1);
+ if (strlen(buf2) + 1U > buflen)
+ {
+ log_error(LOG_LEVEL_FATAL,
+ "Max line limit reached. Linenumber: %u. Lenght: %u. Max lenght: %u.",
+ *linenum, strlen(buf2), buflen-1);
+ }
+ strlcpy(buf, buf2, buflen);
free(buf2);
- buf[buflen - 1] = '\0';
return buf;
}
}
{
goto load_trustfile_error;
}
+ log_error(LOG_LEVEL_INFO, "Loading trust file: %s", csp->config->trustfile);
tl = csp->config->trust_list;
goto load_re_filterfile_error;
}
+ log_error(LOG_LEVEL_INFO, "Loading filter file: %s", csp->config->re_filterfile[fileid]);
+
/*
* Read line by line
*/