X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fsyscheckd%2Fconfig.c;h=4cec1bafd817f560895923831bd7d6303883dac7;hb=HEAD;hp=500c6129d03b9ab3dc350e4955d359641f07d8b8;hpb=301048b51990573e58a30dc4a5bb4ec285cad554;p=ossec-hids.git

diff --git a/src/syscheckd/config.c b/src/syscheckd/config.c
old mode 100755
new mode 100644
index 500c612..4cec1ba
--- a/src/syscheckd/config.c
+++ b/src/syscheckd/config.c
@@ -1,5 +1,3 @@
-/* @(#) $Id$ */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -9,52 +7,78 @@
  * Foundation
  */
 
-
 #include "shared.h"
 #include "syscheck.h"
 #include "config/config.h"
 
-int Read_Syscheck_Config(char * cfgfile)
+#ifdef WIN32
+static char *SYSCHECK_EMPTY[] = { NULL };
+#endif
+
+
+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
-
-
-    /* Reading config */
-    if(ReadConfig(modules, cfgfile, &syscheck, NULL) < 0)
-        return(OS_INVALID);
-
-
-    #ifdef CLIENT
-    /* Reading shared config */
-    modules|= CAGENT_CONFIG;
+    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);
+
+    /* Read config */
+    if (ReadConfig(modules, cfgfile, &syscheck, NULL) < 0) {
+        return (OS_INVALID);
+    }
+
+#ifdef CLIENT
+    debug2("%s: Reading Client Configuration [%s]", "syscheckd", cfgfile);
+
+    /* Read shared config */
+    modules |= CAGENT_CONFIG;
     ReadConfig(modules, AGENTCONFIG, &syscheck, NULL);
-    #endif
-              
+#endif
 
+#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
+    /* 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);
+    }
+#endif
 
-    return(0);
+    return (0);
 }
+