X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fconfig%2Femail-alerts-config.c;h=8d61e1301fdc1db844604a72647aabc46d68def9;hb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;hp=ee5d7f343227334408a30ca1640dc6b6e648f929;hpb=914feba5d54f979cd5d7e69c349c3d01f630042a;p=ossec-hids.git diff --git a/src/config/email-alerts-config.c b/src/config/email-alerts-config.c index ee5d7f3..8d61e13 100644 --- a/src/config/email-alerts-config.c +++ b/src/config/email-alerts-config.c @@ -1,11 +1,12 @@ -/* @(#) $Id: email-alerts-config.c,v 1.10 2009/06/24 17:06:25 dcid Exp $ */ +/* @(#) $Id: ./src/config/email-alerts-config.c, 2011/09/08 dcid Exp $ + */ /* Copyright (C) 2009 Trend Micro Inc. * All right reserved. * * This program is a free software; you can redistribute it * and/or modify it under the terms of the GNU General Public - * License (version 3) as published by the FSF - Free Software + * License (version 2) as published by the FSF - Free Software * Foundation */ @@ -33,7 +34,7 @@ int Read_EmailAlerts(XML_NODE node, void *configp, void *mailp) char *xml_email_donotgroup = "do_not_group"; MailConfig *Mail; - + Mail = (MailConfig *)mailp; if(!Mail) { @@ -56,44 +57,44 @@ int Read_EmailAlerts(XML_NODE node, void *configp, void *mailp) if(Mail) { - os_realloc(Mail->gran_to, + os_realloc(Mail->gran_to, sizeof(char *)*(granto_size +1), Mail->gran_to); - os_realloc(Mail->gran_id, + os_realloc(Mail->gran_id, sizeof(int *)*(granto_size +1), Mail->gran_id); - os_realloc(Mail->gran_level, + os_realloc(Mail->gran_level, sizeof(int)*(granto_size +1), Mail->gran_level); - os_realloc(Mail->gran_set, + os_realloc(Mail->gran_set, sizeof(int)*(granto_size +1), Mail->gran_set); - os_realloc(Mail->gran_format, + os_realloc(Mail->gran_format, sizeof(int)*(granto_size +1), Mail->gran_format); - os_realloc(Mail->gran_location, + os_realloc(Mail->gran_location, sizeof(OSMatch)*(granto_size +1), Mail->gran_location); - os_realloc(Mail->gran_group, + os_realloc(Mail->gran_group, sizeof(OSMatch)*(granto_size +1), Mail->gran_group); - + Mail->gran_to[granto_size -1] = NULL; Mail->gran_to[granto_size] = NULL; - + Mail->gran_id[granto_size -1] = NULL; Mail->gran_id[granto_size] = NULL; - + Mail->gran_location[granto_size -1] = NULL; Mail->gran_location[granto_size] = NULL; Mail->gran_group[granto_size -1] = NULL; Mail->gran_group[granto_size] = NULL; - + Mail->gran_level[granto_size -1] = 0; Mail->gran_level[granto_size] = 0; - - Mail->gran_format[granto_size -1] = FULL_FORMAT; - Mail->gran_format[granto_size] = FULL_FORMAT; - + + Mail->gran_format[granto_size -1] = FULL_FORMAT; + Mail->gran_format[granto_size] = FULL_FORMAT; + Mail->gran_set[granto_size -1] = 0; Mail->gran_set[granto_size] = 0; } - - + + while(node[i]) { if(!node[i]->element) @@ -142,11 +143,11 @@ int Read_EmailAlerts(XML_NODE node, void *configp, void *mailp) else if(isdigit((int)*str_pt)) { int id_i = 0; - + r_id = atoi(str_pt); debug1("%s: DEBUG: Adding '%d' to granular e-mail", ARGV0, r_id); - + if(!Mail->gran_id[granto_size -1]) { os_calloc(2,sizeof(int),Mail->gran_id[granto_size -1]); @@ -159,14 +160,14 @@ int Read_EmailAlerts(XML_NODE node, void *configp, void *mailp) { id_i++; } - + os_realloc(Mail->gran_id[granto_size -1], (id_i +2) * sizeof(int), - Mail->gran_id[granto_size -1]); + Mail->gran_id[granto_size -1]); Mail->gran_id[granto_size -1][id_i +1] = 0; } Mail->gran_id[granto_size -1][id_i] = r_id; - + str_pt = strchr(str_pt, ','); if(str_pt) @@ -227,7 +228,7 @@ int Read_EmailAlerts(XML_NODE node, void *configp, void *mailp) else if(strcmp(node[i]->element, xml_email_location) == 0) { os_calloc(1, sizeof(OSMatch),Mail->gran_location[granto_size -1]); - if(!OSMatch_Compile(node[i]->content, + if(!OSMatch_Compile(node[i]->content, Mail->gran_location[granto_size -1], 0)) { merror(REGEX_COMPILE, ARGV0, node[i]->content, @@ -238,7 +239,7 @@ int Read_EmailAlerts(XML_NODE node, void *configp, void *mailp) else if(strcmp(node[i]->element, xml_email_group) == 0) { os_calloc(1, sizeof(OSMatch),Mail->gran_group[granto_size -1]); - if(!OSMatch_Compile(node[i]->content, + if(!OSMatch_Compile(node[i]->content, Mail->gran_group[granto_size -1], 0)) { merror(REGEX_COMPILE, ARGV0, node[i]->content, @@ -265,7 +266,7 @@ int Read_EmailAlerts(XML_NODE node, void *configp, void *mailp) merror(XML_INV_GRAN_MAIL, ARGV0); return(OS_INVALID); } - + return(0); }