ossec-hids: run_check.c (HEAD) [dcid]

[OSSEC CVS]

Module name: ossec-hids
Changes by: dcid 09/06/30 11:58:05

Modified files:
run_check.c

Log message:
Description: Fixing inotify bug (when not in use).
Reviewed by: dcid
Bug:

Index: run_check.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/syscheckd/run_check.c,v
diff -u -r1.43 -r1.44
--- run_check.c 24 Jun 2009 18:53:09 -0000 1.43
+++ run_check.c 30 Jun 2009 14:58:05 -0000 1.44
@@ -275,7 +275,7 @@


#ifdef USEINOTIFY
- if(syscheck.realtime->fd >= 0)
+ if(syscheck.realtime && (syscheck.realtime->fd >= 0))
verbose("%s: INFO: Starting real time file monitoring.", ARGV0);
#endif

[OSSEC CVS]

Module name: ossec-hids
Changes by: dcid 09/06/30 14:47:19

Modified files:
config.c run_check.c

Log message:
Description: One last time tofix it..
Reviewed by: dcid
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/syscheckd/config.c,v
diff -u -r1.30 -r1.31
--- config.c 30 Jun 2009 17:08:19 -0000 1.30
+++ config.c 30 Jun 2009 17:47:19 -0000 1.31
@@ -37,10 +37,6 @@
#endif


- /* Starting realtime */
- realtime_start();
-
-
/* Reading config */
if(ReadConfig(modules, cfgfile, &syscheck, NULL) < 0)
return(OS_INVALID);

Index: run_check.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/syscheckd/run_check.c,v

diff -u -r1.44 -r1.45
--- run_check.c 30 Jun 2009 14:58:05 -0000 1.44
+++ run_check.c 30 Jun 2009 17:47:19 -0000 1.45
@@ -416,33 +416,40 @@


#ifdef USEINOTIFY
- selecttime.tv_sec = SYSCHECK_WAIT;
- selecttime.tv_usec = 0;
+ if(syscheck.realtime)
+ {
+ selecttime.tv_sec = SYSCHECK_WAIT;
+ selecttime.tv_usec = 0;

- /* zero-out the fd_set */
- FD_ZERO (&rfds);
+ /* zero-out the fd_set */
+ FD_ZERO (&rfds);

- if(syscheck.realtime->fd >= 0)

- FD_SET(syscheck.realtime->fd, &rfds);
+ if(syscheck.realtime->fd >= 0)
+ FD_SET(syscheck.realtime->fd, &rfds);

- run_now = select (syscheck.realtime->fd + 1, &rfds,
- NULL, NULL, &selecttime);
- if(run_now < 0)
- {
- merror("%s: ERROR: Select failed (for realtime fim).", ARGV0);
- sleep(SYSCHECK_WAIT);
- }
- else if(run_now == 0)
- {
- /* Timeout. */
+ run_now = select (syscheck.realtime->fd + 1, &rfds,
+ NULL, NULL, &selecttime);
+ if(run_now < 0)
+ {
+ merror("%s: ERROR: Select failed (for realtime fim).", ARGV0);
+ sleep(SYSCHECK_WAIT);
+ }
+ else if(run_now == 0)
+ {
+ /* Timeout. */
+ }
+ else if (FD_ISSET (syscheck.realtime->fd, &rfds))
+ {
+ realtime_process();
+ }
+
+ sleep(10);
}
- else if (FD_ISSET (syscheck.realtime->fd, &rfds))
+ else
{
- realtime_process();
+ sleep(SYSCHECK_WAIT);
}
-
- sleep(10);

#else
sleep(SYSCHECK_WAIT);