Changeset 203 for trunk/src

Timestamp:

Dec 7, 2008, 7:26:17 PM (16 years ago)

Author:

katerina

Message:

Fix compile failures on RHEL3 (ticket #130) and FreeBSD7 amd64 (ticket #131).

Location:

trunk/src

Files:

• make-tests.sh (modified) (1 diff)
• samhain.c (modified) (1 diff)
• sh_gpg.c (modified) (3 diffs)
• sh_log_check.c (modified) (1 diff)
• sh_log_evalrule.c (modified) (1 diff)
• sh_log_parse_apache.c (modified) (1 diff)
• sh_log_parse_pacct.c (modified) (1 diff)
• sh_processcheck.c (modified) (3 diffs)
• sh_unix.c (modified) (1 diff)
• sh_userfiles.c (modified) (1 diff)
• slib.c (modified) (1 diff)

trunk/src/make-tests.sh

@@ -20 +20 @@
 #include <stdio.h>
 #include "CuTest.h"
+#include "config.h"
 
 '

trunk/src/samhain.c

@@ -824 +824 @@
   ino = (long) buf.st_ino;
     
-  if (NULL == (dp = opendir("/proc")))
+  if (NULL == (dp = opendir(_("/proc"))))
     {
       return NULL;

trunk/src/sh_gpg.c

@@ -257 +257 @@
   char   cc3[32];
   char   cc4[SH_PATHBUF+32];
-  char   cc5[32] = "--no-tty";
+  char   cc5[32];
 #endif
 
@@ -283 +283 @@
   /* sl_strlcpy (cc4,   sh.effective.home, SH_PATHBUF+32); */
   sl_strlcpy (cc4,   homedir,           SH_PATHBUF+32);
-  sl_strlcat (cc4,   _("/.gnupg"),      SH_PATHBUF+32); 
+  sl_strlcat (cc4,   _("/.gnupg"),      SH_PATHBUF+32);
+  sl_strlcpy (cc5,   _("--no-tty"),     32);
 
   /* fprintf(stderr, "YULE: homedir=%s\n", homedir); */
@@ -416 +417 @@
       envp[0] = malloc (len); /* free() ok   */
       if (envp[0] != NULL)
-        sl_snprintf (envp[0], len, "HOME=%s", sh.effective.home); 
+        sl_snprintf (envp[0], len, _("HOME=%s"), sh.effective.home); 
       envp[1] = NULL;
     }

trunk/src/sh_log_check.c

@@ -14 +14 @@
 
 /* Debian/Ubuntu: libpcre3-dev */
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
 #include <pcre.h>
+#endif
 
 #include "samhain.h"

trunk/src/sh_log_evalrule.c

@@ -15 +15 @@
 
 /* Debian/Ubuntu: libpcre3-dev */
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
 #include <pcre.h>
+#endif
+
+#ifndef PCRE_NO_AUTO_CAPTURE
+#define PCRE_NO_AUTO_CAPTURE 0
+#endif
 
 #include "samhain.h"

trunk/src/sh_log_parse_apache.c

@@ -29 +29 @@
 
 /* Debian/Ubuntu: libpcre3-dev */
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
 #include <pcre.h>
+#endif
 
 #include "samhain.h"

trunk/src/sh_log_parse_pacct.c

@@ -227 +227 @@
 sh_string * sh_read_pacct (sh_string * record, struct sh_logfile * logfile)
 {
-#if defined(__linux__)
+#if defined(__linux__) && defined(HAVE_ACCT_V3)
 #  define STRUCT_ACCT struct acct_v3
 #else

trunk/src/sh_processcheck.c

@@ -196 +196 @@
   char *      tmp;
 
-  sl_snprintf (path, sizeof(path), "/proc/%ld/exe", (unsigned long) pid);
+  sl_snprintf (path, sizeof(path), _("/proc/%ld/exe"), (unsigned long) pid);
 
   if (0 == retry_lstat(FIL__, __LINE__, path, &sbuf) && S_ISLNK(sbuf.st_mode))
@@ -203 +203 @@
     }
 
-  sl_snprintf (path, sizeof(path), "/proc/%ld/file", (unsigned long) pid);
+  sl_snprintf (path, sizeof(path), _("/proc/%ld/file"), (unsigned long) pid);
 
   if (0 == retry_lstat(FIL__, __LINE__, path, &sbuf) && S_ISLNK(sbuf.st_mode))
@@ -210 +210 @@
     }
 
-  sl_snprintf (path, sizeof(path), "/proc/%ld/path/a.out", (unsigned long) pid);
+  sl_snprintf (path, sizeof(path), _("/proc/%ld/path/a.out"), (unsigned long) pid);
 
   if (0 == retry_lstat(FIL__, __LINE__, path, &sbuf) && S_ISLNK(sbuf.st_mode))

trunk/src/sh_unix.c

@@ -2083 +2083 @@
       int r;
 
-      while((r = waitpid(pid, &status, WCONTINUED|WUNTRACED)) != pid && r != -1) ;
+      while((r = waitpid(pid, &status, WUNTRACED)) != pid && r != -1) ;
 
 #if !defined(USE_UNO)

trunk/src/sh_userfiles.c

@@ -215 +215 @@
      * So, compare longest strings first */
     if( s == NULL ) /* The default */          new->level = default_level;
-    else if ( strstr(s, "attributes")!= NULL ) new->level = SH_LEVEL_ATTRIBUTES;
-    else if ( strstr(s, "allignore") != NULL ) new->level = SH_LEVEL_ALLIGNORE;
-    else if ( strstr(s, "noignore")  != NULL ) new->level = SH_LEVEL_NOIGNORE;
-    else if ( strstr(s, "logfiles")  != NULL ) new->level = SH_LEVEL_LOGFILES;
-    else if ( strstr(s, "readonly")  != NULL ) new->level = SH_LEVEL_READONLY;
-    else if ( strstr(s, "loggrow")   != NULL ) new->level = SH_LEVEL_LOGGROW;
-    else if ( strstr(s, "user0")     != NULL ) new->level = SH_LEVEL_USER0;
-    else if ( strstr(s, "user1")     != NULL ) new->level = SH_LEVEL_USER1;
-    else if ( strstr(s, "user2")     != NULL ) new->level = SH_LEVEL_USER2;
-    else if ( strstr(s, "user3")     != NULL ) new->level = SH_LEVEL_USER3;
-    else if ( strstr(s, "user4")     != NULL ) new->level = SH_LEVEL_USER4;
-    else if ( strstr(s, "prelink")   != NULL ) new->level = SH_LEVEL_PRELINK;
+    else if ( strstr(s, _("attributes"))!= NULL ) new->level = SH_LEVEL_ATTRIBUTES;
+    else if ( strstr(s, _("allignore")) != NULL ) new->level = SH_LEVEL_ALLIGNORE;
+    else if ( strstr(s, _("noignore"))  != NULL ) new->level = SH_LEVEL_NOIGNORE;
+    else if ( strstr(s, _("logfiles"))  != NULL ) new->level = SH_LEVEL_LOGFILES;
+    else if ( strstr(s, _("readonly"))  != NULL ) new->level = SH_LEVEL_READONLY;
+    else if ( strstr(s, _("loggrow"))   != NULL ) new->level = SH_LEVEL_LOGGROW;
+    else if ( strstr(s, _("user0"))     != NULL ) new->level = SH_LEVEL_USER0;
+    else if ( strstr(s, _("user1"))     != NULL ) new->level = SH_LEVEL_USER1;
+    else if ( strstr(s, _("user2"))     != NULL ) new->level = SH_LEVEL_USER2;
+    else if ( strstr(s, _("user3"))     != NULL ) new->level = SH_LEVEL_USER3;
+    else if ( strstr(s, _("user4"))     != NULL ) new->level = SH_LEVEL_USER4;
+    else if ( strstr(s, _("prelink"))   != NULL ) new->level = SH_LEVEL_PRELINK;
     else            /* The default */          new->level = default_level;
 

trunk/src/slib.c

@@ -1094 +1094 @@
 {
 #ifndef HAVE_STRSTR
-  insigned int    i;
+  unsigned int    i;
   size_t          needle_len;
   size_t          haystack_len;