Changeset 268 for trunk

Timestamp:

Dec 22, 2009, 12:28:00 PM (15 years ago)

Author:

katerina

Message:

Fix for typo in alternative inotify code (ticket #186).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_inotify.c (modified) (1 diff)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.6.1)
+AM_INIT_AUTOMAKE(samhain, 2.6.1a)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+2.6.1a (22-12-2009):
+        * fix typo in code for older inotify versions without
+          inotify_init1(), reported by Forll
+
 2.6.1 (21-12-2009):
         * add a routine to log monitoring module to guess the proper year 

trunk/src/sh_inotify.c

@@ -147 +147 @@
           long sflags;
 
-          sflags = retry_fcntl(FIL__, __LINE__, fd, F_GETFD, 0);
-          retry_fcntl(FIL__, __LINE__, fd, F_SETFD, sflags|FD_CLOEXEC);
+          sflags = retry_fcntl(FIL__, __LINE__, ifd, F_GETFD, 0);
+          retry_fcntl(FIL__, __LINE__, ifd, F_SETFD, sflags|FD_CLOEXEC);
         }
 #endif