[Pkg-ossec-devel] [pkg-ossec] 01/01: Merge tag 'upstream/2.7.1'
Jose Antonio Quevedo Muñoz
jaqm-guest at moszumanska.debian.org
Thu Mar 6 18:33:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
jaqm-guest pushed a commit to branch master
in repository pkg-ossec.
commit 363a565821b516076cf98dfa21ac12951f2b51b1
Merge: c8a4f2a b2e4a1d
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date: Thu Mar 6 19:32:01 2014 +0100
Merge tag 'upstream/2.7.1'
Upstream version 2.7.1
Conflicts:
.hg_archival.txt
src/VERSION
src/analysisd/alerts/log.c
src/analysisd/lists_list.c
src/analysisd/rules.c
src/client-agent/agentd.c
src/headers/custom_output_search.h
src/headers/defs.h
src/init/ossec-client.sh
src/init/ossec-local.sh
src/init/ossec-server.sh
src/shared/custom_output_search_replace.c
src/shared/file_op.c
src/win32/ossec-installer.nsi
src/win32/ui.nsi
.hg_archival.txt | 4 +-
BUGS | 4 +-
contrib/ossec-batch-manager.pl | 40 +++++++++--
etc/decoder.xml | 2 +-
src/VERSION | 2 +-
src/analysisd/alerts/log.c | 111 ------------------------------
src/analysisd/lists_list.c | 14 ++--
src/analysisd/lists_make.c | 2 +-
src/analysisd/rules.c | 7 --
src/client-agent/agentd.c | 2 +-
src/headers/custom_output_search.h | 5 ++
src/headers/defs.h | 2 +-
src/init/ossec-client.sh | 2 +-
src/init/ossec-local.sh | 2 +-
src/init/ossec-server.sh | 2 +-
src/os_auth/main-server.c | 28 ++++----
src/os_dbd/Makefile | 2 +-
src/shared/custom_output_search_replace.c | 43 ++++++++++++
src/shared/file_op.c | 8 +--
src/syscheckd/create_db.c | 9 ++-
src/syscheckd/run_check.c | 4 ++
src/win32/ossec-installer.nsi | 18 ++---
src/win32/ui.nsi | 8 +--
23 files changed, 150 insertions(+), 171 deletions(-)
diff --cc src/analysisd/alerts/log.c
index 048403f,f5cb74a..595c9b0
--- a/src/analysisd/alerts/log.c
+++ b/src/analysisd/alerts/log.c
@@@ -354,117 -354,125 +354,6 @@@ void OS_CustomLog(Eventinfo *lf,char* f
//Replace all the tokens:
os_strdup(format,log);
-- snprintf(tmp_buffer, 1024, "%d", lf->time);
-- tmp_log = searchAndReplace(log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_TIMESTAMP], tmp_buffer);
-- if(log)
-- {
-- os_free(log);
-- log=NULL;
-- }
-- snprintf(tmp_buffer, 1024, "%ld", __crt_ftell);
-- log = searchAndReplace(tmp_log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_FTELL], tmp_buffer);
-- if (tmp_log)
-- {
-- os_free(tmp_log);
-- tmp_log=NULL;
-- }
--
--
-- snprintf(tmp_buffer, 1024, "%s", (lf->generated_rule->alert_opts & DO_MAILALERT)?"mail " : "");
-- tmp_log = searchAndReplace(log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_RULE_ALERT_OPTIONS], tmp_buffer);
-- if(log)
-- {
-- os_free(log);
-- log=NULL;
-- }
--
--
-- snprintf(tmp_buffer, 1024, "%s",lf->hostname?lf->hostname:"None");
-- log = searchAndReplace(tmp_log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_HOSTNAME], tmp_buffer);
-- if (tmp_log)
-- {
-- os_free(tmp_log);
-- tmp_log=NULL;
-- }
--
-- snprintf(tmp_buffer, 1024, "%s",lf->location?lf->location:"None");
-- tmp_log = searchAndReplace(log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_LOCATION], tmp_buffer);
-- if(log)
-- {
-- os_free(log);
-- log=NULL;
-- }
--
--
-- snprintf(tmp_buffer, 1024, "%d", lf->generated_rule->sigid);
-- log = searchAndReplace(tmp_log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_RULE_ID], tmp_buffer);
-- if (tmp_log)
-- {
-- os_free(tmp_log);
-- tmp_log=NULL;
-- }
--
-- snprintf(tmp_buffer, 1024, "%d", lf->generated_rule->level);
-- tmp_log = searchAndReplace(log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_RULE_LEVEL], tmp_buffer);
-- if(log)
-- {
-- os_free(log);
-- log=NULL;
-- }
--
-- snprintf(tmp_buffer, 1024, "%s",lf->srcip?lf->srcip:"None");
-- log = searchAndReplace(tmp_log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_SRC_IP], tmp_buffer);
-- if (tmp_log)
-- {
-- os_free(tmp_log);
-- tmp_log=NULL;
-- }
--
-- snprintf(tmp_buffer, 1024, "%s",lf->srcuser?lf->srcuser:"None");
--
-- tmp_log = searchAndReplace(log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_DST_USER], tmp_buffer);
-- if(log)
-- {
-- os_free(log);
-- log=NULL;
-- }
- char * escaped_log;
- escaped_log = escape_newlines(lf->full_log);
--
- log = searchAndReplace(tmp_log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_FULL_LOG], lf->full_log);
- log = searchAndReplace(tmp_log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_FULL_LOG],escaped_log );
-- if (tmp_log)
-- {
-- os_free(tmp_log);
-- tmp_log=NULL;
- }
-
- if(escaped_log)
- {
- os_free(escaped_log);
- escaped_log=NULL;
-- }
--
-- snprintf(tmp_buffer, 1024, "%s",lf->generated_rule->comment?lf->generated_rule->comment:"");
-- tmp_log = searchAndReplace(log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_RULE_COMMENT], tmp_buffer);
-- if(log)
-- {
-- os_free(log);
-- log=NULL;
-- }
--
-- snprintf(tmp_buffer, 1024, "%s",lf->generated_rule->group?lf->generated_rule->group:"");
-- log = searchAndReplace(tmp_log, CustomAlertTokenName[CUSTOM_ALERT_TOKEN_RULE_GROUP], tmp_buffer);
-- if (tmp_log)
-- {
-- os_free(tmp_log);
-- tmp_log=NULL;
-- }
--
--
-- fprintf(_aflog,log);
-- fprintf(_aflog,"\n");
-- fflush(_aflog);
--
-- if(log)
-- {
-- os_free(log);
-- log=NULL;
-- }
--
-- return;
--}
void OS_InitFwLog()
{
diff --cc src/analysisd/lists_list.c
index 55394db,e5f8358..aa07c3a
--- a/src/analysisd/lists_list.c
+++ b/src/analysisd/lists_list.c
@@@ -262,7 -262,53 +262,7 @@@ int OS_DBSeachKeyAddress(ListRule *lrul
}
free(tmpkey);
}
- }
- return 0;
-}
-
-int OS_DBSearchKeyAddressValue(ListRule *lrule, char *key)
-{
- int result=-1;
- char *val;
- unsigned vlen, vpos;
- if (lrule->db!= NULL)
- {
- if(_OS_CDBOpen(lrule->db) == -1) return 0;
-
- // First lookup for a single IP address
- if(cdb_find(&lrule->db->cdb, key, strlen(key)) > 0 ) {
- vpos = cdb_datapos(&lrule->db->cdb);
- vlen = cdb_datalen(&lrule->db->cdb);
- val = malloc(vlen);
- cdb_read(&lrule->db->cdb, val, vlen, vpos);
- result = OSMatch_Execute(val, vlen, lrule->matcher);
- free(val);
- return result;
- } else {
- // IP address not found, look for matching subnets
- char *tmpkey;
- os_strdup(key, tmpkey);
- while(strlen(tmpkey) > 0)
- {
- if(tmpkey[strlen(tmpkey) - 1] == '.')
- {
- if( cdb_find(&lrule->db->cdb, tmpkey, strlen(tmpkey)) > 0 ) {
- vpos = cdb_datapos(&lrule->db->cdb);
- vlen = cdb_datalen(&lrule->db->cdb);
- val = malloc(vlen);
- cdb_read(&lrule->db->cdb, val, vlen, vpos);
- result = OSMatch_Execute(val, vlen, lrule->matcher);
- free(val);
- free(tmpkey);
- return result;
- }
- }
- tmpkey[strlen(tmpkey) - 1] = '\0';
- }
- free(tmpkey);
- return 0;
- }
-- }
++ }
return 0;
}
@@@ -308,8 -356,10 +310,8 @@@ int OS_DBSearch(ListRule *lrule, char *
break;
case LR_ADDRESS_MATCH_VALUE:
//debug1("LR_ADDRESS_MATCH_VALUE");
- // XXX TODO
- return 0;
- if (OS_DBSearchKeyAddressValue(lrule, key) == 0)
- return 1;
- else
- return 0;
++ // XXX TODO
++ return 0;
break;
default:
debug1("lists_list.c::OS_DBSearch should never hit default");
diff --cc src/analysisd/rules.c
index c9b155d,5ada268..f22682c
--- a/src/analysisd/rules.c
+++ b/src/analysisd/rules.c
@@@ -316,13 -316,13 +316,6 @@@ int Rules_OP_ReadRules(char * rulefile
return(-1);
}
-- if(overwrite != 1 && doesRuleExist(id, NULL))
-- {
- merror("%s: Rule with id %d exists allready.",ARGV0, id);
- merror("%s: Duplicate rule ID:%d",ARGV0, id);
-- OS_ClearXML(&xml);
-- return(-1);
-- }
--
/* Allocating memory and initializing structure */
config_ruleinfo = zerorulemember(id, level, maxsize,
frequency,timeframe,
diff --cc src/client-agent/agentd.c
index 6439250,ca33dd5..b18fc95
--- a/src/client-agent/agentd.c
+++ b/src/client-agent/agentd.c
@@@ -172,7 -172,9 +172,7 @@@ void AgentdStart(char *dir, int uid, in
fdtimeout.tv_sec = 120;
fdtimeout.tv_usec = 0;
- /* Continuesly send notifications */
- run_notify();
--
++
/* Wait for 120 seconds at a maximum for any descriptor */
rc = select(maxfd, &fdset, NULL, NULL, &fdtimeout);
if(rc == -1)
diff --cc src/headers/defs.h
index 698d370,880cd8d..3d491a7
--- a/src/headers/defs.h
+++ b/src/headers/defs.h
@@@ -52,7 -52,7 +52,7 @@@
/* Some Global names */
#define __name "OSSEC HIDS"
- #define __version "v2.7.1-beta-1"
-#define __version "v2.7.1"
++#define __version "v2.7-beta1"
#define __author "Trend Micro Inc."
#define __contact "contact at ossec.net"
#define __site "http://www.ossec.net"
diff --cc src/shared/file_op.c
index 17778e2,6ed6b07..a799a1d
--- a/src/shared/file_op.c
+++ b/src/shared/file_op.c
@@@ -291,9 -291,9 +291,9 @@@ int DeletePID(char *name
if(File_DateofChange(file) < 0)
return(-1);
-
- unlink(file);
--
++
+ unlink(file);
-
++
return(0);
}
@@@ -446,7 -446,7 +446,7 @@@ int MergeAppendFile(char *finalpath, ch
finalfp = fopen(finalpath, "a");
if(!finalfp)
{
- merror("%s: ERROR: Unable to create merged file: '%s'.",
- merror("%s: ERROR: Unable to append merged file: '%s'.",
++ merror("%s: ERROR: Unable to create merged file: '%s'.",
__local_name, finalpath);
return(0);
}
@@@ -741,7 -741,7 +741,7 @@@ int checkVista(
strstr(m_uname, "Windows 7"))
{
isVista = 1;
- verbose("%s: INFO: System is Vista or Windows Server 2008.",
- verbose("%s: INFO: System is Vista, Windows 7 or Windows Server 2008.",
++ verbose("%s: INFO: System is Vista or Windows Server 2008.",
__local_name);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ossec/pkg-ossec.git
More information about the Pkg-ossec-devel
mailing list