Modified files:
localfile-config.c
Log message:
Description: Fixing globbed files on logcollector.
Reviewed by: dcid
Bug:
Index: localfile-config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/config/localfile-config.c,v
diff -u -r1.18 -r1.19
--- localfile-config.c 14 Nov 2008 18:55:16 -0000 1.18
+++ localfile-config.c 2 Feb 2009 17:42:04 -0000 1.19
@@ -120,7 +120,7 @@
/* Setting ot the first entry of the glob */
if(glob_set == 0)
- glob_set = pl;
+ glob_set = pl +1;
if(glob(node[i]->content, 0, NULL, &g) != 0)
{
@@ -238,9 +238,9 @@
{
format = logf[pl].logformat;
}
- else if(logf[glob_set].logformat)
+ else if(logf[glob_set -1].logformat)
{
- format = logf[glob_set].logformat;
+ format = logf[glob_set -1].logformat;
}
else
{
@@ -253,7 +253,7 @@
/* Setting format for all entries */
- for(i = glob_set; i<= pl; i++)
+ for(i = (glob_set -1); i<= pl; i++)
{
/* Every entry must be valid */
if(!logf[i].file)
Modified files:
localfile-config.c syscheck-config.c
Log message:
Description: Adding mssql log reader and fixing bugs on windows.
Reviewed by: dcid
Bug:
Index: localfile-config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/config/localfile-config.c,v
diff -u -r1.19 -r1.20
--- localfile-config.c 2 Feb 2009 17:42:04 -0000 1.19
+++ localfile-config.c 4 Jun 2009 22:08:15 -0000 1.20
@@ -201,6 +201,9 @@
else if(strcmp(logf[pl].logformat, "mysql_log") == 0)
{
}
+ else if(strcmp(logf[pl].logformat, "mssql_log") == 0)
+ {
+ }
else if(strcmp(logf[pl].logformat, "postgresql_log") == 0)
{
}
Index: syscheck-config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/config/syscheck-config.c,v
diff -u -r1.22 -r1.23
--- syscheck-config.c 9 Apr 2009 21:02:58 -0000 1.22
+++ syscheck-config.c 4 Jun 2009 22:08:15 -0000 1.23
@@ -431,6 +431,7 @@
/* Checking for glob. */
+ #ifndef WIN32
if(strchr(tmp_dir, '*') ||
strchr(tmp_dir, '?') ||
strchr(tmp_dir, '['))
@@ -463,6 +464,9 @@
{
dump_syscheck_entry(syscheck, tmp_dir, opts, 0);
}
+ #else
+ dump_syscheck_entry(syscheck, tmp_dir, opts, 0);
+ #endif
/* Next entry */