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

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

diff --git a/src/rootcheck/config.c b/src/rootcheck/config.c
old mode 100755 (executable)
new mode 100644 (file)
index 9cf9e6c..91c41d6
--- a/src/rootcheck/config.c
+++ b/src/rootcheck/config.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/rootcheck/config.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -16,27 +13,23 @@
 #include "config/config.h"
 
 
-
-/* Read_Rootcheck_Config: Reads the rootcheck config
- */
-int Read_Rootcheck_Config(char * cfgfile)
+/* Read the rootcheck config */
+int Read_Rootcheck_Config(const char *cfgfile)
 {
     int modules = 0;
 
-    modules|= CROOTCHECK;
+    modules |= CROOTCHECK;
+    if (ReadConfig(modules, cfgfile, &rootcheck, NULL) < 0) {
+        return (OS_INVALID);
+    }
 
-    if(ReadConfig(modules, cfgfile, &rootcheck, NULL) < 0)
-        return(OS_INVALID);
-
-
-    #ifdef CLIENT
-    /* Reading shared config */
-    modules|= CAGENT_CONFIG;
+#ifdef CLIENT
+    /* Read shared config */
+    modules |= CAGENT_CONFIG;
     ReadConfig(modules, AGENTCONFIG, &rootcheck, NULL);
-    #endif
+#endif
 
-    return(0);
+    return (0);
 }
+#endif /* OSSECHIDS */
 
-/* EOF */
-#endif