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

3 views
Skip to first unread message

OSSEC CVS

unread,
Jun 10, 2009, 3:53:29 PM6/10/09
to osse...@ossec.net
Module name: ossec-hids
Changes by: dcid 09/06/10 16:53:27

Modified files:
config.c

Log message:
Description: Adding option to filter the agent config by agent name.
Reviewed by: dcid
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/syscheckd/config.c,v
diff -u -r1.25 -r1.26
--- config.c 9 Apr 2009 21:02:59 -0000 1.25
+++ config.c 10 Jun 2009 19:53:27 -0000 1.26
@@ -42,6 +42,11 @@
return(OS_INVALID);


+ /* Reading shared config */
+ modules|= CAGENT_CONFIG;
+ ReadConfig(modules, cfgfile, &syscheck, NULL);
+
+
/* We must have at least one directory to check */
if(!syscheck.dir || syscheck.dir[0] == NULL)
{

OSSEC CVS

unread,
Jun 10, 2009, 3:53:29 PM6/10/09
to osse...@ossec.net
Module name: ossec-hids
Changes by: dcid 09/06/10 16:53:27

Modified files:
config.c

Log message:
Description: Adding option to filter the agent config by agent name.
Reviewed by: dcid
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/logcollector/config.c,v
diff -u -r1.16 -r1.17
--- config.c 17 Jun 2008 17:04:02 -0000 1.16
+++ config.c 10 Jun 2009 19:53:27 -0000 1.17
@@ -35,7 +35,10 @@

if(ReadConfig(modules, cfgfile, &log_config, NULL) < 0)
return(OS_INVALID);
-
+
+ modules|= CAGENT_CONFIG;
+ ReadConfig(modules, cfgfile, &log_config, NULL);
+
logff = log_config.config;

return(1);

OSSEC CVS

unread,
Jun 11, 2009, 3:04:36 PM6/11/09
to osse...@ossec.net
Module name: ossec-hids
Changes by: dcid 09/06/11 16:04:34

Modified files:
config.c

Log message:
Description: Fixing agent.conf location.
Reviewed by: dcid
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/logcollector/config.c,v

diff -u -r1.17 -r1.18
--- config.c 10 Jun 2009 19:53:27 -0000 1.17
+++ config.c 11 Jun 2009 19:04:33 -0000 1.18
@@ -37,7 +37,7 @@
return(OS_INVALID);

modules|= CAGENT_CONFIG;
- ReadConfig(modules, cfgfile, &log_config, NULL);
+ ReadConfig(modules, AGENTCONFIG, &log_config, NULL);

logff = log_config.config;

OSSEC CVS

unread,
Jun 11, 2009, 3:04:36 PM6/11/09
to osse...@ossec.net
Module name: ossec-hids
Changes by: dcid 09/06/11 16:04:34

Modified files:
config.c

Log message:
Description: Fixing agent.conf location.
Reviewed by: dcid
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/rootcheck/config.c,v
diff -u -r1.15 -r1.16
--- config.c 17 Jun 2008 17:04:08 -0000 1.15
+++ config.c 11 Jun 2009 19:04:34 -0000 1.16
@@ -27,6 +27,11 @@
if(ReadConfig(modules, cfgfile, &rootcheck, NULL) < 0)
return(OS_INVALID);

+


+ /* Reading shared config */

+ modules|= CAGENT_CONFIG;
+ ReadConfig(modules, AGENTCONFIG, &rootcheck, NULL);
+
return(0);
}

OSSEC CVS

unread,
Jun 11, 2009, 3:04:36 PM6/11/09
to osse...@ossec.net
Module name: ossec-hids
Changes by: dcid 09/06/11 16:04:34

Modified files:
config.c

Log message:
Description: Fixing agent.conf location.
Reviewed by: dcid
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/syscheckd/config.c,v

diff -u -r1.26 -r1.27
--- config.c 10 Jun 2009 19:53:27 -0000 1.26
+++ config.c 11 Jun 2009 19:04:34 -0000 1.27
@@ -44,7 +44,7 @@



/* Reading shared config */

modules|= CAGENT_CONFIG;
- ReadConfig(modules, cfgfile, &syscheck, NULL);
+ ReadConfig(modules, AGENTCONFIG, &syscheck, NULL);

OSSEC CVS

unread,
Jun 24, 2009, 2:52:15 PM6/24/09
to osse...@ossec.net
Module name: ossec-hids
Changes by: dcid 09/06/24 15:52:13

Modified files:
config.c

Log message:
Description: Fixing shared agent config to only be called from agents.. not from the manager.
Reviewed by: dcid
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/rootcheck/config.c,v

diff -u -r1.16 -r1.17
--- config.c 11 Jun 2009 19:04:34 -0000 1.16
+++ config.c 24 Jun 2009 18:52:13 -0000 1.17
@@ -28,9 +28,11 @@
return(OS_INVALID);


+ #ifdef CLIENT


/* Reading shared config */

modules|= CAGENT_CONFIG;
ReadConfig(modules, AGENTCONFIG, &rootcheck, NULL);
+ #endif

return(0);
}

OSSEC CVS

unread,
Jun 24, 2009, 2:52:16 PM6/24/09
to osse...@ossec.net
Module name: ossec-hids
Changes by: dcid 09/06/24 15:52:14

Modified files:
config.c

Log message:


Description: Fixing shared agent config to only be called from agents.. not from the manager.

Reviewed by: dcid
Bug:

Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/syscheckd/config.c,v

diff -u -r1.27 -r1.28
--- config.c 11 Jun 2009 19:04:34 -0000 1.27
+++ config.c 24 Jun 2009 18:52:13 -0000 1.28
@@ -42,9 +42,11 @@
return(OS_INVALID);


+ #ifdef CLIENT


/* Reading shared config */
modules|= CAGENT_CONFIG;

ReadConfig(modules, AGENTCONFIG, &syscheck, NULL);
+ #endif

Reply all
Reply to author
Forward
0 new messages