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

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

diff --git a/src/syscheckd/config.c b/src/syscheckd/config.c
old mode 100755 (executable)
new mode 100644 (file)
index 0ee30e4..4cec1ba
--- a/src/syscheckd/config.c
+++ b/src/syscheckd/config.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/syscheckd/config.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,75 +7,78 @@
  * Foundation
  */
 
-
 #include "shared.h"
 #include "syscheck.h"
 #include "config/config.h"
 
-char *SYSCHECK_EMPTY[] = { NULL };
+#ifdef WIN32
+static char *SYSCHECK_EMPTY[] = { NULL };
+#endif
+
 
-int Read_Syscheck_Config(char * cfgfile)
+int Read_Syscheck_Config(const char *cfgfile)
 {
     int modules = 0;
 
-    modules|= CSYSCHECK;
-
-    syscheck.rootcheck = 0;
-    syscheck.disabled = 0;
-    syscheck.scan_on_start = 1;
-    syscheck.time = SYSCHECK_WAIT * 2;
-    syscheck.ignore = NULL;
-    syscheck.ignore_regex = NULL;
-    syscheck.scan_day = NULL;
-    syscheck.scan_time = NULL;
-    syscheck.dir = NULL;
-    syscheck.opts = NULL;
-    syscheck.realtime = NULL;
-    #ifdef WIN32
-    syscheck.registry = NULL;
-    syscheck.reg_fp = NULL;
-    #endif
-    syscheck.prefilter_cmd = NULL;
-
+    modules |= CSYSCHECK;
+
+    syscheck.rootcheck      = 0;
+    syscheck.disabled       = 0;
+    syscheck.skip_nfs       = 0;
+    syscheck.scan_on_start  = 1;
+    syscheck.time           = SYSCHECK_WAIT * 2;
+    syscheck.ignore         = NULL;
+    syscheck.ignore_regex   = NULL;
+    syscheck.nodiff         = NULL;
+    syscheck.nodiff_regex   = NULL;
+    syscheck.scan_day       = NULL;
+    syscheck.scan_time      = NULL;
+    syscheck.dir            = NULL;
+    syscheck.opts           = NULL;
+    syscheck.realtime       = NULL;
+#ifdef WIN32
+    syscheck.registry       = NULL;
+    syscheck.reg_fp         = NULL;
+#endif
+    syscheck.prefilter_cmd  = NULL;
 
     debug2("%s: Reading Configuration [%s]", "syscheckd", cfgfile);
 
-    /* Reading config */
-    if(ReadConfig(modules, cfgfile, &syscheck, NULL) < 0)
-        return(OS_INVALID);
-
+    /* Read config */
+    if (ReadConfig(modules, cfgfile, &syscheck, NULL) < 0) {
+        return (OS_INVALID);
+    }
 
-    #ifdef CLIENT
+#ifdef CLIENT
     debug2("%s: Reading Client Configuration [%s]", "syscheckd", cfgfile);
 
-    /* Reading shared config */
-    modules|= CAGENT_CONFIG;
+    /* Read shared config */
+    modules |= CAGENT_CONFIG;
     ReadConfig(modules, AGENTCONFIG, &syscheck, NULL);
-    #endif
+#endif
 
-
-    #ifndef WIN32
+#ifndef WIN32
     /* We must have at least one directory to check */
-    if(!syscheck.dir || syscheck.dir[0] == NULL)
-    {
-        return(1);
+    if (!syscheck.dir || syscheck.dir[0] == NULL) {
+        return (1);
     }
-
-    #else
+#else
     /* We must have at least one directory or registry key to check. Since
        it's possible on Windows to have syscheck enabled but only monitoring
        either the filesystem or the registry, both lists must be valid,
        even if empty.
      */
-    if(!syscheck.dir) syscheck.dir = SYSCHECK_EMPTY;
-    if(!syscheck.registry) syscheck.registry = SYSCHECK_EMPTY;
-
-    if((syscheck.dir[0] == NULL) && (syscheck.registry[0] == NULL))
-    {
-        return(1);
+    if (!syscheck.dir) {
+        syscheck.dir = SYSCHECK_EMPTY;
     }
-    #endif
-
+    if (!syscheck.registry) {
+        syscheck.registry = SYSCHECK_EMPTY;
+    }
+    if ((syscheck.dir[0] == NULL) && (syscheck.registry[0] == NULL)) {
+        return (1);
+    }
+#endif
 
-    return(0);
+    return (0);
 }
+