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

[OSSEC CVS <cvs-commit@xxxxxxxxx>]

Module name:	ossec-hids
Changes by:	dcid	07/08/13 21:29:34

Modified files:
	config.c config.h

Log message:
Description: Working alpha of the database support. the basic stuff should be working now, but we still need to improve the tables and a few other things.
Reviewed by: dcid
Example config:
<database_output>
  <hostname>1.2.3.4</hostname>
  <username>user</username>
  <password>mypass</password>
  <database>test1</database>
</database_output>
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/config/config.c,v
diff -u -r1.12 -r1.13
--- config.c	13 Aug 2007 02:11:48 -0000	1.12
+++ config.c	14 Aug 2007 00:29:33 -0000	1.13
@@ -33,6 +33,7 @@
     char *osrootcheck = "rootcheck";
     char *osalerts = "alerts";
     char *osemailalerts = "email_alerts";
+    char *osdbd = "database_output";
     char *oslocalfile = "localfile";
     char *osremote = "remote";
     char *osclient = "client";
@@ -65,6 +66,11 @@
         else if(strcmp(node[i]->element, osemailalerts) == 0)
         {
             if((modules & CMAIL) && (Read_EmailAlerts(chld_node, d1, d2) < 0))
+                return(OS_INVALID);
+        }
+        else if(strcmp(node[i]->element, osdbd) == 0)
+        {
+            if((modules & CDBD) && (Read_DB(chld_node, d1, d2) < 0))
                 return(OS_INVALID);
         }
         else if(strcmp(node[i]->element, osrules) == 0)

Index: config.h
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/config/config.h,v
diff -u -r1.8 -r1.9
--- config.h	13 Aug 2007 02:11:48 -0000	1.8
+++ config.h	14 Aug 2007 00:29:33 -0000	1.9
@@ -37,17 +37,18 @@
 
 int Read_Global(XML_NODE node, void *d1, void *d2);
 int Read_GlobalSK(XML_NODE node, void *configp, void *mailp);
-void AssignIgnore_Global(char **ignores, void *configp);
 int Read_Rules(XML_NODE node, void *d1, void *d2);
 int Read_Syscheck(XML_NODE node, void *d1, void *d2);
 int Read_Rootcheck(XML_NODE node, void *d1, void *d2);
 int Read_Alerts(XML_NODE node, void *d1, void *d2);
 int Read_EmailAlerts(XML_NODE node, void *d1, void *d2);
+int Read_DB(XML_NODE node, void *config1, void *config2);
 int Read_Localfile(XML_NODE node, void *d1, void *d2);
 int Read_Remote(XML_NODE node, void *d1, void *d2);
 int Read_Client(XML_NODE node, void *d1, void *d2);
 int ReadActiveResponses(XML_NODE node, void *d1, void *d2);
 int ReadActiveCommands(XML_NODE node, void *d1, void *d2);
+void AssignIgnore_Global(char **ignores, void *configp);