Changeset 481 for trunk/include/samhain.h

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/include/samhain.h (modified) (11 diffs)

trunk/include/samhain.h

@@ -28 +28 @@
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+#define SH_GNUC_SENTINEL __attribute__((__sentinel__))
+#else
+#define SH_GNUC_SENTINEL
+#endif
+
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+#undef  SH_GNUC_PURE
+#define SH_GNUC_PURE     __attribute__((pure))
+#undef  SH_GNUC_CONST
+#define SH_GNUC_CONST    __attribute__((const))
+#undef  SH_GNUC_NORETURN
+#define SH_GNUC_NORETURN __attribute__((noreturn))
+#undef  SH_GNUC_MALLOC
+#define SH_GNUC_MALLOC   __attribute__((malloc))
+#else
+#undef  SH_GNUC_PURE
+#define SH_GNUC_PURE
+#undef  SH_GNUC_CONST
+#define SH_GNUC_CONST
+#undef  SH_GNUC_NORETURN
+#define SH_GNUC_NORETURN
+#undef  SH_GNUC_MALLOC
+#define SH_GNUC_MALLOC
+#endif
+
 /**************************************************
  *
@@ -57 +83 @@
 
 /* end IPv6 */
-
-#define REPLACE_OLD
 
 /* Standard buffer sizes. 
@@ -101 +125 @@
 #define PW_LEN     8
 
-#undef  GOOD
-#define GOOD  1
-#undef  BAD
-#define BAD   0
-#undef  ON
-#define ON    1
-#undef  OFF
-#define OFF   0
 #undef  S_TRUE
 #define S_TRUE    1
 #undef  S_FALSE
 #define S_FALSE   0
+
+#undef  GOOD
+#define GOOD  S_TRUE
+#undef  BAD
+#define BAD   S_FALSE
+
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#if !defined(HAVE_UINT16_T)
+#define UINT16 unsigned short
+#else
+#define UINT16 uint16_t
+#endif
+
+#if !defined(HAVE_UINT32_T)
 
 /* An unsigned integer guaranteed to be 32 bit.
@@ -129 +166 @@
 #endif
 
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#if !defined(HAVE_UINT16_T)
-#define UINT16 unsigned short
-#else
-#define UINT16 uint16_t
+#else
+#define UINT32 uint32_t
+#define SINT32 int32_t
+
 #endif
 
@@ -305 +335 @@
   int    client_severity;          /* TRUE if client severity used    */
   int    client_class;             /* TRUE if client class used       */
+  int    hidefile;                 /* TRUE if file not shown in log   */
+  int    inotify;                  /* Flags for inotify               */
   int    audit;
   unsigned long aud_mask;
-  int    hidefile;                 /* TRUE if file not shown in log   */
-  int    inotify;                  /* Flags for inotify               */
 } sh_sh_flag;
 
@@ -347 +377 @@
   /*@null@*//*@out@*/ char   * timezone;
 
+  int delayload;
+
 #ifdef SCREW_IT_UP
   int sigtrap_max_duration;
 #endif
 
+  char * outpath;
 } sh_struct;
 
@@ -365 +398 @@
 extern volatile  int      sig_termfast;           /* SIGTERM */
 extern volatile  int      sig_force_check;        /* SIGTTOU */
+extern volatile  int      sh_load_delta_flag;
 
 extern long int eintr__result;
@@ -420 +454 @@
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ >= 4)
-#define SH_GNUC_SENTINEL __attribute__((__sentinel__))
-#else
-#define SH_GNUC_SENTINEL
-#endif
-
-#if defined(__GNUC__) && (__GNUC__ >= 3)
-#undef  SH_GNUC_PURE
-#define SH_GNUC_PURE     __attribute__((pure))
-#undef  SH_GNUC_CONST
-#define SH_GNUC_CONST    __attribute__((const))
-#undef  SH_GNUC_NORETURN
-#define SH_GNUC_NORETURN __attribute__((noreturn))
-#undef  SH_GNUC_MALLOC
-#define SH_GNUC_MALLOC   __attribute__((malloc))
-#else
-#undef  SH_GNUC_PURE
-#define SH_GNUC_PURE
-#undef  SH_GNUC_CONST
-#define SH_GNUC_CONST
-#undef  SH_GNUC_NORETURN
-#define SH_GNUC_NORETURN
-#undef  SH_GNUC_MALLOC
-#define SH_GNUC_MALLOC
-#endif
 
 
@@ -481 +490 @@
 #ifdef USE_SUID
 #define MLOCK(a, b) \
-      if ((skey != NULL) && skey->mlock_failed == SL_FALSE){ \
+      if ((skey != NULL) && skey->mlock_failed == S_FALSE){ \
         (void) sl_set_suid(); \
-        if (sh_unix_mlock(FIL__, __LINE__, a, b) < 0) skey->mlock_failed = SL_TRUE; \
+        if (sh_unix_mlock(FIL__, __LINE__, a, b) < 0) skey->mlock_failed = S_TRUE; \
         (void) sl_unset_suid(); }
 #else
 #define MLOCK(a, b) \
-      if ((skey != NULL) && skey->mlock_failed == SL_FALSE){ \
-        if (sh_unix_mlock(FIL__, __LINE__, a, b) < 0) skey->mlock_failed = SL_TRUE; }
+      if ((skey != NULL) && skey->mlock_failed == S_FALSE){ \
+        if (sh_unix_mlock(FIL__, __LINE__, a, b) < 0) skey->mlock_failed = S_TRUE; }
 #endif 
 #else
@@ -498 +507 @@
 #ifdef USE_SUID
 #define MUNLOCK(a, b) \
-      if ((skey != NULL) && skey->mlock_failed == SL_FALSE){ \
+      if ((skey != NULL) && skey->mlock_failed == S_FALSE){ \
         (void) sl_set_suid(); \
         (void) sh_unix_munlock( a, b );\
@@ -504 +513 @@
 #else
 #define MUNLOCK(a, b) \
-      if ((skey != NULL) && skey->mlock_failed == SL_FALSE){ \
+      if ((skey != NULL) && skey->mlock_failed == S_FALSE){ \
         (void) sh_unix_munlock( a, b ); }
 #endif