Changeset 292 for trunk/src

Timestamp:

Sep 5, 2010, 8:57:06 PM (14 years ago)

Author:

katerina

Message:

Fix for compile problems on Solaris 10 (ticket #220).

Location:

trunk/src

Files:

• make-tests.sh (modified) (1 diff)
• sh_log_parse_pacct.c (modified) (1 diff)
• sh_log_parse_samba.c (modified) (1 diff)
• sh_log_parse_syslog.c (modified) (1 diff)
• sh_mem.c (modified) (6 diffs)
• sh_port2proc.c (modified) (1 diff)

trunk/src/make-tests.sh

@@ -18 +18 @@
 /* This is auto-generated code. Edit at your own peril. */
 
+#include "config.h"
 #include <stdio.h>
 #include "CuTest.h"
-#include "config.h"
-
 '
 

trunk/src/sh_log_parse_pacct.c

@@ -116 +116 @@
   BIT(ACOMPAT, 'C');
 #endif
+#ifdef ACORE
   BIT(ACORE, 'D');
+#endif
+#ifdef AXSIG
   BIT(AXSIG, 'X');
+#endif
 
   out[i] = '\0';

trunk/src/sh_log_parse_samba.c

@@ -17 +17 @@
 #include "config_xor.h"
 #include <string.h>
+
+#if defined(HOST_IS_SOLARIS)
+/* For 'struct timeval' in <sys/time.h> */
+#define __EXTENSIONS__
+#endif
+
 #include <time.h>
 

trunk/src/sh_log_parse_syslog.c

@@ -20 +20 @@
 #include <stdlib.h>
 #include <string.h>
+
+#if defined(HOST_IS_SOLARIS)
+/* For 'struct timeval' in <sys/time.h> */
+#define __EXTENSIONS__
+#endif
+
 #include <sys/types.h>
 #include <time.h>

trunk/src/sh_mem.c

@@ -112 +112 @@
 #endif
 
-static void ** sh_mem_merr_1;
+static memlist_t ** sh_mem_merr_1;
 
 void sh_mem_stat ()
@@ -121 +121 @@
   SL_ENTER(_("sh_mem_stat"));
 
-  sh_mem_merr_1 = (void **) &merrlist;
+  sh_mem_merr_1 = (memlist_t **) &merrlist;
 
   if (Alloc_Count == Free_Count) 
@@ -166 +166 @@
 }
 
-static void ** sh_mem_merr_2;
+static memlist_t ** sh_mem_merr_2;
 
 void sh_mem_check ()
@@ -177 +177 @@
   SL_ENTER(_("sh_mem_check"));
 
-  sh_mem_merr_2 = (void **) &merrlist;
+  sh_mem_merr_2 = (memlist_t **) &merrlist;
 
   sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_MSTAMP,
@@ -317 +317 @@
 
 static void ** sh_mem_dummy_a;
-static void ** sh_mem_merr_3;
+static memlist_t ** sh_mem_merr_3;
 
 void sh_mem_free (void * aa, char * file, int line)
@@ -333 +333 @@
   a      = aa;
   sh_mem_dummy_a = &a;
-  sh_mem_merr_3  = (void **) &merrlist;
+  sh_mem_merr_3  = (memlist_t **) &merrlist;
 
 

trunk/src/sh_port2proc.c

@@ -973 +973 @@
 #else /* !defined(__linux__) && !defined(__FreeBSD__) */
 
+#include "samhain.h"
+#include "sh_utils.h"
+
 char * sh_port2proc_query(int proto, struct in_addr * saddr, int sport,
                           unsigned long * pid, char * user, size_t userlen)