[ossec-cvs] ossec-hids: config.c (HEAD) config.h (HEAD) rules-config.c (HEAD) syscheck-config.c (HEAD) [dcid]

[OSSEC CVS <cvs-commit@xxxxxxxxx>]

Module name:	ossec-hids
Changes by:	dcid	07/08/12 23:11:48

Modified files:
	config.c config.h rules-config.c syscheck-config.c

Log message:
Description: A few new pix/sshd rules. Adding some additional libraries too (organizing mem_op).
Reviewed by: dcid
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/config/config.c,v
diff -u -r1.11 -r1.12
--- config.c	9 Feb 2007 02:51:44 -0000	1.11
+++ config.c	13 Aug 2007 02:11:48 -0000	1.12
@@ -69,7 +69,7 @@
         }
         else if(strcmp(node[i]->element, osrules) == 0)
         {
-            if((modules & CGLOBAL) && (Read_Rules(chld_node, d1, d2) < 0))
+            if((modules & CRULES) && (Read_Rules(chld_node, d1, d2) < 0))
                 return(OS_INVALID);
         }
         else if(strcmp(node[i]->element, ossyscheck) == 0)

Index: config.h
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/config/config.h,v
diff -u -r1.7 -r1.8
--- config.h	9 Feb 2007 02:51:45 -0000	1.7
+++ config.h	13 Aug 2007 02:11:48 -0000	1.8
@@ -1,12 +1,15 @@
 /* @(#) $Id$ */
 
 /* Copyright (C) 2003-2006 Daniel B. Cid <dcid@xxxxxxxxx>
- * All right reserved.
+ * All rights reserved.
  *
  * This program is a free software; you can redistribute it
  * and/or modify it under the terms of the GNU General Public
- * License (version 2) as published by the FSF - Free Software
+ * License (version 3) as published by the FSF - Free Software
  * Foundation
+ *
+ * License details at the LICENSE file included with OSSEC or
+ * online at: http://www.ossec.net/en/licensing.html
  */
 
  
@@ -24,8 +27,10 @@
 #define CCLIENT      0000200
 #define CMAIL        0000400
 #define CAR          0001000
+#define CDBD         0002000
 
 #include "os_xml/os_xml.h"
+
 
 /* Main function to read the config */
 int ReadConfig(int modules, char *cfgfile, void *d1, void *d2);

Index: rules-config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/config/rules-config.c,v
diff -u -r1.2 -r1.3
--- rules-config.c	15 Apr 2006 02:33:32 -0000	1.2
+++ rules-config.c	13 Aug 2007 02:11:48 -0000	1.3
@@ -1,11 +1,11 @@
-/*   $OSSEC, rules-config.c, v0.1, 2005/04/02, Daniel B. Cid$   */
+/* @(#) $Id$ */
 
-/* Copyright (C) 2003-2006 Daniel B. Cid <dcid@xxxxxxxxx>
+/* Copyright (C) 2003-2007 Daniel B. Cid <dcid@xxxxxxxxx>
  * All right reserved.
  *
  * This program is a free software; you can redistribute it
  * and/or modify it under the terms of the GNU General Public
- * License (version 2) as published by the FSF - Free Software
+ * License (version 3) as published by the FSF - Free Software
  * Foundation
  */
 
@@ -48,7 +48,8 @@
         else if(strcmp(node[i]->element, xml_rules_include) == 0)
         {
             rules_size++;
-            Config->includes = realloc(Config->includes, sizeof(char *)*rules_size);
+            Config->includes = realloc(Config->includes, 
+                                       sizeof(char *)*rules_size);
             if(!Config->includes)
             {
                 merror(MEM_ERROR, ARGV0);

Index: syscheck-config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/config/syscheck-config.c,v
diff -u -r1.13 -r1.14
--- syscheck-config.c	15 Feb 2007 02:41:01 -0000	1.13
+++ syscheck-config.c	13 Aug 2007 02:11:48 -0000	1.14
@@ -476,7 +476,7 @@
             }
 
             /* Adding if simple entry -- checking for duplicates */
-            else if(!IsStrOnArray(node[i]->content, syscheck->ignore))
+            else if(!os_IsStrOnArray(node[i]->content, syscheck->ignore))
             {
                 if(!syscheck->ignore)
                 {
@@ -551,7 +551,8 @@
                 }
             }
             /* We do not add duplicated entries */
-            else if(!IsStrOnArray(node[i]->content, syscheck->registry_ignore))
+            else if(!os_IsStrOnArray(node[i]->content, 
+                     syscheck->registry_ignore))
             {
                 if(!syscheck->registry_ignore)
                 {