new upstream release (3.3.0); modify package compatibility for Stretch

[ossec-hids.git] / src / logcollector / config.c

diff --git a/src/logcollector/config.c b/src/logcollector/config.c
old mode 100755 (executable)
new mode 100644 (file)
index 67ed253..b85f7d2
--- a/src/logcollector/config.c
+++ b/src/logcollector/config.c
@@ -1,51 +1,41 @@
-/* @(#) $Id: config.c,v 1.20 2009/06/24 18:52:13 dcid Exp $ */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * 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 3) as published by the FSF - Free Software
+ * License (version 2) as published by the FSF - Free Software
  * Foundation
  */
 
-/* v0.3 (2005/08/23): Using the new OS_XML syntax and changing some usage 
- * v0.2 (2005/01/17)
- */
- 
-
-#include "shared.h" 
-
+#include "shared.h"
 #include "logcollector.h"
 
 
-/* LogCollectorConfig v0.3, 2005/03/03
- * Read the config file (the localfiles)
- * v0.3: Changed for the new OS_XML
- */
-int LogCollectorConfig(char * cfgfile)
+/* Read the config file (the localfiles) */
+int LogCollectorConfig(const char *cfgfile, int accept_remote)
 {
     int modules = 0;
-
     logreader_config log_config;
 
-    modules|= CLOCALFILE;
+    modules |= CLOCALFILE;
 
     log_config.config = NULL;
+    log_config.agent_cfg = 0;
+    log_config.accept_remote = accept_remote;
 
-    if(ReadConfig(modules, cfgfile, &log_config, NULL) < 0)
-        return(OS_INVALID);
-    
-    #ifdef CLIENT
-    modules|= CAGENT_CONFIG;
-    ReadConfig(modules, AGENTCONFIG, &log_config, NULL);
-    #endif
-
-    logff = log_config.config;       
+    if (ReadConfig(modules, cfgfile, &log_config, NULL) < 0) {
+        return (OS_INVALID);
+    }
 
-    return(1);
+#ifdef CLIENT
+    modules |= CAGENT_CONFIG;
+    log_config.agent_cfg = 1;
+    ReadConfig(modules, AGENTCONFIG, &log_config, NULL);
+    log_config.agent_cfg = 0;
+#endif
 
+    logff = log_config.config;
 
+    return (1);
 }
 
-/* EOF */