X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Fconfig%2Fglobal-config.c;fp=src%2Fconfig%2Fglobal-config.c;h=0449a8c94089e641d0da7f8ab55da252812e5cba;hp=a535a813d756d49137136cc78e3354101cd77749;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b

diff --git a/src/config/global-config.c b/src/config/global-config.c
old mode 100755
new mode 100644
index a535a81..0449a8c
--- a/src/config/global-config.c
+++ b/src/config/global-config.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/config/global-config.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,169 +7,131 @@
  * Foundation
  */
 
-/* Functions to handle the configuration files
- */
-
-
 #include "shared.h"
 #include "os_net/os_net.h"
 #include "global-config.h"
 #include "mail-config.h"
+#include "config.h"
 
 
-void AssignIgnore_Global(char **ignores, void *configp)
-{
-    _Config *Config;
-
-    Config = (_Config *)configp;
-    if(Config)
-    {
-        Config->syscheck_ignore = ignores;
-    }
-}
-
-
-/* GlobalConfSK v0.1: 2006/04/26
- * v0.1 Getting the ignore fields.
- */
-int Read_GlobalSK(XML_NODE node, void *configp, void *mailp)
+int Read_GlobalSK(XML_NODE node, void *configp, __attribute__((unused)) void *mailp)
 {
     int i = 0;
-    int ign_size = 1;
-    char *xml_ignore = "ignore";
-    char *xml_auto_ignore = "auto_ignore";
-    char *xml_alert_new_files = "alert_new_files";
+    unsigned int ign_size = 1;
+    const char *xml_ignore = "ignore";
+    const char *xml_auto_ignore = "auto_ignore";
+    const char *xml_alert_new_files = "alert_new_files";
 
     _Config *Config;
-
     Config = (_Config *)configp;
 
+    if (!Config) {
+        return (0);
+    }
 
-    /* Shouldn't be here if !Config */
-    if(!Config)
-        return(0);
-
-
-    /* Getting right white_size */
-    if(Config && Config->syscheck_ignore)
-    {
+    /* Get right allow_size */
+    if (Config && Config->syscheck_ignore) {
         char **ww;
         ww = Config->syscheck_ignore;
 
-        while(*ww != NULL)
-        {
+        while (*ww != NULL) {
             ign_size++;
             ww++;
         }
     }
 
-    while(node[i])
-    {
-        if(!node[i]->element)
-        {
-            merror(XML_ELEMNULL, ARGV0);
-            return(OS_INVALID);
-        }
-        else if(!node[i]->content)
-        {
-            merror(XML_VALUENULL, ARGV0, node[i]->element);
-            return(OS_INVALID);
-        }
-        else if(strcmp(node[i]->element,xml_auto_ignore) == 0)
-        {
-            if(strcmp(node[i]->content, "yes") == 0)
-            {
+    while (node[i]) {
+        if (!node[i]->element) {
+            merror(XML_ELEMNULL, __local_name);
+            return (OS_INVALID);
+        } else if (!node[i]->content) {
+            merror(XML_VALUENULL, __local_name, node[i]->element);
+            return (OS_INVALID);
+        } else if (strcmp(node[i]->element, xml_auto_ignore) == 0) {
+            if (strcmp(node[i]->content, "yes") == 0) {
                 Config->syscheck_auto_ignore = 1;
-            }
-            else if(strcmp(node[i]->content, "no") == 0)
-            {
+            } else if (strcmp(node[i]->content, "no") == 0) {
                 Config->syscheck_auto_ignore = 0;
+            } else {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
-            else
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
-            }
-        }
-        else if(strcmp(node[i]->element,xml_alert_new_files) == 0)
-        {
-            if(strcmp(node[i]->content, "yes") == 0)
-            {
+        } else if (strcmp(node[i]->element, xml_alert_new_files) == 0) {
+            if (strcmp(node[i]->content, "yes") == 0) {
                 Config->syscheck_alert_new = 1;
-            }
-            else if(strcmp(node[i]->content, "no") == 0)
-            {
+            } else if (strcmp(node[i]->content, "no") == 0) {
                 Config->syscheck_alert_new = 0;
+            } else {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
-            else
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
-            }
-        }
-        else if(strcmp(node[i]->element,xml_ignore) == 0)
-        {
+        } else if (strcmp(node[i]->element, xml_ignore) == 0) {
             ign_size++;
-            Config->syscheck_ignore =
-                realloc(Config->syscheck_ignore, sizeof(char *)*ign_size);
-            if(!Config->syscheck_ignore)
-            {
-                merror(MEM_ERROR, ARGV0);
-                return(OS_INVALID);
+            Config->syscheck_ignore = (char **)
+                                      realloc(Config->syscheck_ignore, sizeof(char *)*ign_size);
+            if (!Config->syscheck_ignore) {
+                merror(MEM_ERROR, __local_name, errno, strerror(errno));
+                return (OS_INVALID);
             }
 
-            os_strdup(node[i]->content,Config->syscheck_ignore[ign_size -2]);
-            Config->syscheck_ignore[ign_size -1] = NULL;
+            os_strdup(node[i]->content, Config->syscheck_ignore[ign_size - 2]);
+            Config->syscheck_ignore[ign_size - 1] = NULL;
         }
         i++;
     }
 
-    return(0);
+    return (0);
 }
 
-
-/* GlobalConf v0.2: 2005/03/03
- * v0.2: Changing to support the new OS_XML
- */
 int Read_Global(XML_NODE node, void *configp, void *mailp)
 {
     int i = 0;
 
-    /* White list size */
-    int white_size = 1;
-    int hostname_white_size = 1;
-    int mailto_size = 1;
-
+    /* allowlist size */
+    unsigned int allow_size = 1;
+    unsigned int hostname_allow_size = 1;
+    unsigned int mailto_size = 1;
 
     /* XML definitions */
-    char *xml_mailnotify = "email_notification";
-    char *xml_logall = "logall";
-    char *xml_integrity = "integrity_checking";
-    char *xml_rootcheckd = "rootkit_detection";
-    char *xml_hostinfo = "host_information";
-    char *xml_picviz = "picviz_output";
-    char *xml_picviz_socket = "picviz_socket";
-    char *xml_prelude = "prelude_output";
-    char *xml_prelude_profile = "prelude_profile";
-    char *xml_prelude_log_level = "prelude_log_level";
-    char *xml_zeromq_output = "zeromq_output";
-    char *xml_zeromq_output_uri = "zeromq_uri";
-    char *xml_stats = "stats";
-    char *xml_memorysize = "memory_size";
-    char *xml_white_list = "white_list";
-    char *xml_compress_alerts = "compress_alerts";
-    char *xml_custom_alert_output = "custom_alert_output";
-
-    char *xml_emailto = "email_to";
-    char *xml_emailfrom = "email_from";
-    char *xml_emailidsname = "email_idsname";
-    char *xml_smtpserver = "smtp_server";
-    char *xml_mailmaxperhour = "email_maxperhour";
-
-#ifdef GEOIP
-    /* GeoIP */
-    char *xml_geoip_db_path = "geoip_db_path";
-    char *xml_geoip6_db_path = "geoip6_db_path";
+    const char *xml_mailnotify = "email_notification";
+    const char *xml_logall = "logall";
+    const char *xml_logall_json = "logall_json";
+    const char *xml_integrity = "integrity_checking";
+    const char *xml_rootcheckd = "rootkit_detection";
+    const char *xml_hostinfo = "host_information";
+    const char *xml_prelude = "prelude_output";
+    const char *xml_prelude_profile = "prelude_profile";
+    const char *xml_prelude_log_level = "prelude_log_level";
+    const char *xml_geoipdb_file = "geoipdb";
+    const char *xml_zeromq_output = "zeromq_output";
+    const char *xml_zeromq_output_uri = "zeromq_uri";
+    const char *xml_zeromq_output_server_cert = "zeromq_server_cert";
+    const char *xml_zeromq_output_client_cert = "zeromq_client_cert";
+    const char *xml_jsonout_output = "jsonout_output";
+    const char *xml_stats = "stats";
+    const char *xml_memorysize = "memory_size";
+    const char *xml_white_list = "white_list";
+    const char *xml_allow_list = "allow_list";
+    const char *xml_compress_alerts = "compress_alerts";
+    const char *xml_custom_alert_output = "custom_alert_output";
+
+    const char *xml_emailto = "email_to";
+    const char *xml_emailfrom = "email_from";
+    const char *xml_emailreplyto = "email_reply_to";
+    const char *xml_emailidsname = "email_idsname";
+    const char *xml_smtpserver = "smtp_server";
+    const char *xml_heloserver = "helo_server";
+    const char *xml_mailmaxperhour = "email_maxperhour";
+
+#ifdef LIBGEOIP_ENABLED
+    const char *xml_geoip_db_path = "geoip_db_path";
+    const char *xml_geoip6_db_path = "geoip6_db_path";
+#endif
+
+#ifdef SQLITE_ENABLED
+    /* MD5 DB */
+    char *xml_md5_whitelist = "md5_whitelist";
+    char *xml_md5_allowlist = "md5_allowlist";
 #endif
 
     _Config *Config;
@@ -181,426 +140,384 @@ int Read_Global(XML_NODE node, void *configp, void *mailp)
     Config = (_Config *)configp;
     Mail = (MailConfig *)mailp;
 
-    /* Getting right white_size */
-    if(Config && Config->white_list)
-    {
+    /* Get right allow_size */
+    if (Config && Config->allow_list) {
         os_ip **ww;
-        ww = Config->white_list;
+        ww = Config->allow_list;
 
-        while(*ww != NULL)
-        {
-            white_size++;
+        while (*ww != NULL) {
+            allow_size++;
             ww++;
         }
     }
 
-     /* Getting right white_size */
-    if(Config && Config->hostname_white_list)
-    {
-        OSMatch **ww;
-        ww = Config->hostname_white_list;
+    /* Get right allow_size */
+    if (Config && Config->hostname_allow_list) {
+        char **ww;
+        ww = Config->hostname_allow_list;
 
-        while(*ww != NULL)
-        {
-            hostname_white_size++;
+        while (*ww != NULL) {
+            hostname_allow_size++;
             ww++;
         }
     }
 
-    /* Getting mail_to size */
-    if(Mail && Mail->to)
-    {
+    /* Get mail_to size */
+    if (Mail && Mail->to) {
         char **ww;
         ww = Mail->to;
-        while(*ww != NULL)
-        {
+        while (*ww != NULL) {
             mailto_size++;
             ww++;
         }
     }
 
-    while(node[i])
-    {
-        if(!node[i]->element)
-        {
-            merror(XML_ELEMNULL, ARGV0);
-            return(OS_INVALID);
-        }
-        else if(!node[i]->content)
-        {
-            merror(XML_VALUENULL, ARGV0, node[i]->element);
-            return(OS_INVALID);
-        }
-        else if(strcmp(node[i]->element, xml_custom_alert_output) == 0)
-        {
-          if(Config)
-          {
-            Config->custom_alert_output= 1;
-            os_strdup(node[i]->content, Config->custom_alert_output_format);
-          }
-        }
-        /* Mail notification */
-        else if(strcmp(node[i]->element, xml_mailnotify) == 0)
-        {
-            if(strcmp(node[i]->content, "yes") == 0)
-            {
-                if(Config) Config->mailnotify = 1;
-                if(Mail) Mail->mn = 1;
-            }
-            else if(strcmp(node[i]->content, "no") == 0)
-            {
-                if(Config) Config->mailnotify = 0;
-                if(Mail) Mail->mn = 0;
-            }
-            else
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
+    while (node[i]) {
+        if (!node[i]->element) {
+            merror(XML_ELEMNULL, __local_name);
+            return (OS_INVALID);
+        } else if (!node[i]->content) {
+            merror(XML_VALUENULL, __local_name, node[i]->element);
+            return (OS_INVALID);
+        } else if (strcmp(node[i]->element, xml_custom_alert_output) == 0) {
+            if (Config) {
+                Config->custom_alert_output = 1;
+                os_strdup(node[i]->content, Config->custom_alert_output_format);
             }
         }
-        /* Picviz support */
-        else if(strcmp(node[i]->element, xml_picviz) == 0)
-        {
-            if(strcmp(node[i]->content, "yes") == 0)
-            {
-                if(Config) Config->picviz = 1;
-            }
-            else if(strcmp(node[i]->content, "no") == 0)
-            {
-                if(Config) Config->picviz = 0;
-            }
-            else
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element, node[i]->content);
-                return(OS_INVALID);
-            }
-        }
-        else if(strcmp(node[i]->element, xml_picviz_socket) == 0)
-        {
-            if(Config)
-            {
-                os_strdup(node[i]->content, Config->picviz_socket);
+        /* Mail notification */
+        else if (strcmp(node[i]->element, xml_mailnotify) == 0) {
+            if (strcmp(node[i]->content, "yes") == 0) {
+                if (Config) {
+                    Config->mailnotify = 1;
+                }
+                if (Mail) {
+                    Mail->mn = 1;
+                }
+            } else if (strcmp(node[i]->content, "no") == 0) {
+                if (Config) {
+                    Config->mailnotify = 0;
+                }
+                if (Mail) {
+                    Mail->mn = 0;
+                }
+            } else {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
         }
         /* Prelude support */
-        else if(strcmp(node[i]->element, xml_prelude) == 0)
-        {
-            if(strcmp(node[i]->content, "yes") == 0)
-            {
-                if(Config) Config->prelude = 1;
-            }
-            else if(strcmp(node[i]->content, "no") == 0)
-            {
-                if(Config) Config->prelude = 0;
-            }
-            else
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element, node[i]->content);
-                return(OS_INVALID);
+        else if (strcmp(node[i]->element, xml_prelude) == 0) {
+            if (strcmp(node[i]->content, "yes") == 0) {
+                if (Config) {
+                    Config->prelude = 1;
+                }
+            } else if (strcmp(node[i]->content, "no") == 0) {
+                if (Config) {
+                    Config->prelude = 0;
+                }
+            } else {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
-        }
-        else if(strcmp(node[i]->element, xml_prelude_profile) == 0)
-        {
+        /* GeoIP */
+        } else if(strcmp(node[i]->element, xml_geoipdb_file) == 0) {
             if(Config)
             {
+                Config->geoipdb_file = strdup(node[i]->content);
+            }
+        } else if (strcmp(node[i]->element, xml_prelude_profile) == 0) {
+            if (Config) {
                 Config->prelude_profile = strdup(node[i]->content);
             }
-        }
-        else if(strcmp(node[i]->element, xml_prelude_log_level) == 0)
-        {
-            if(!OS_StrIsNum(node[i]->content))
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
+        } else if (strcmp(node[i]->element, xml_prelude_log_level) == 0) {
+            if (!OS_StrIsNum(node[i]->content)) {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
 
-            if(Config)
-            {
-                Config->prelude_log_level = atoi(node[i]->content);
+            if (Config) {
+                Config->prelude_log_level = (u_int8_t) atoi(node[i]->content);
             }
         }
         /* ZeroMQ output */
-        else if(strcmp(node[i]->element, xml_zeromq_output) == 0)
-        {
-            if(strcmp(node[i]->content, "yes") == 0)
-            { 
-                if(Config) Config->zeromq_output = 1; 
+        else if (strcmp(node[i]->element, xml_zeromq_output) == 0) {
+            if (strcmp(node[i]->content, "yes") == 0) {
+                if (Config) {
+                    Config->zeromq_output = 1;
+                }
+            } else if (strcmp(node[i]->content, "no") == 0) {
+                if (Config) {
+                    Config->zeromq_output = 0;
+                }
+            } else {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
-            else if(strcmp(node[i]->content, "no") == 0)
-            { 
-                if(Config) Config->zeromq_output = 0; 
+        } else if (strcmp(node[i]->element, xml_zeromq_output_uri) == 0) {
+            if (Config) {
+                Config->zeromq_output_uri = strdup(node[i]->content);
             }
-            else
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element, node[i]->content);
-                return(OS_INVALID);
+        } else if (strcmp(node[i]->element, xml_zeromq_output_server_cert) == 0) {
+            if (Config) {
+                Config->zeromq_output_server_cert = strdup(node[i]->content);
+            }
+        } else if (strcmp(node[i]->element, xml_zeromq_output_client_cert) == 0) {
+            if (Config) {
+                Config->zeromq_output_client_cert = strdup(node[i]->content);
             }
         }
-        else if(strcmp(node[i]->element, xml_zeromq_output_uri) == 0)
-        {
-            if(Config)
-            {
-                Config->zeromq_output_uri = strdup(node[i]->content);
+        /* jsonout output */
+        else if (strcmp(node[i]->element, xml_jsonout_output) == 0) {
+            if (strcmp(node[i]->content, "yes") == 0) {
+                if (Config) {
+                    Config->jsonout_output = 1;
+                }
+            } else if (strcmp(node[i]->content, "no") == 0) {
+                if (Config) {
+                    Config->jsonout_output = 0;
+                }
+            } else {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
         }
         /* Log all */
-        else if(strcmp(node[i]->element, xml_logall) == 0)
-        {
-            if(strcmp(node[i]->content, "yes") == 0)
-                { if(Config) Config->logall = 1;}
-            else if(strcmp(node[i]->content, "no") == 0)
-                {if(Config) Config->logall = 0;}
-            else
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
+        else if (strcmp(node[i]->element, xml_logall) == 0) {
+            if (strcmp(node[i]->content, "yes") == 0) {
+                if (Config) {
+                    Config->logall = 1;
+                }
+            } else if (strcmp(node[i]->content, "no") == 0) {
+                if (Config) {
+                    Config->logall = 0;
+                }
+            } else {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
         }
-        /* compress alerts */
-        else if(strcmp(node[i]->element, xml_compress_alerts) == 0)
-        {
-            /* removed from here -- compatility issues only */
+        /* Log all JSON*/
+        else if (strcmp(node[i]->element, xml_logall_json) == 0) {
+            if (strcmp(node[i]->content, "yes") == 0) {
+                if (Config) {
+                    Config->logall_json = 1;
+                }
+            } else if (strcmp(node[i]->content, "no") == 0) {
+                if (Config) {
+                    Config->logall_json = 0;
+                }
+            } else {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
+            }
+        }           
+        /* Compress alerts */
+        else if (strcmp(node[i]->element, xml_compress_alerts) == 0) {
+            /* removed from here -- compatibility issues only */
         }
         /* Integrity */
-        else if(strcmp(node[i]->element, xml_integrity) == 0)
-        {
-            if(!OS_StrIsNum(node[i]->content))
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
+        else if (strcmp(node[i]->element, xml_integrity) == 0) {
+            if (!OS_StrIsNum(node[i]->content)) {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
-            if(Config)
-            {
-                Config->integrity = atoi(node[i]->content);
+            if (Config) {
+                Config->integrity = (u_int8_t) atoi(node[i]->content);
             }
         }
         /* rootcheck */
-        else if(strcmp(node[i]->element, xml_rootcheckd) == 0)
-        {
-            if(!OS_StrIsNum(node[i]->content))
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
+        else if (strcmp(node[i]->element, xml_rootcheckd) == 0) {
+            if (!OS_StrIsNum(node[i]->content)) {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
-            if(Config)
-            {
-                Config->rootcheck = atoi(node[i]->content);
+            if (Config) {
+                Config->rootcheck = (u_int8_t) atoi(node[i]->content);
             }
         }
         /* hostinfo */
-        else if(strcmp(node[i]->element, xml_hostinfo) == 0)
-        {
-            if(!OS_StrIsNum(node[i]->content))
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
+        else if (strcmp(node[i]->element, xml_hostinfo) == 0) {
+            if (!OS_StrIsNum(node[i]->content)) {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
-            if(Config)
-            {
-                Config->hostinfo = atoi(node[i]->content);
+            if (Config) {
+                Config->hostinfo = (u_int8_t) atoi(node[i]->content);
             }
         }
         /* stats */
-        else if(strcmp(node[i]->element, xml_stats) == 0)
-        {
-            if(!OS_StrIsNum(node[i]->content))
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
+        else if (strcmp(node[i]->element, xml_stats) == 0) {
+            if (!OS_StrIsNum(node[i]->content)) {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
-            if(Config)
-            {
-                Config->stats = atoi(node[i]->content);
+            if (Config) {
+                Config->stats = (u_int8_t) atoi(node[i]->content);
             }
-        }
-        else if(strcmp(node[i]->element, xml_memorysize) == 0)
-        {
-            if(!OS_StrIsNum(node[i]->content))
-            {
-                merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                return(OS_INVALID);
+        } else if (strcmp(node[i]->element, xml_memorysize) == 0) {
+            if (!OS_StrIsNum(node[i]->content)) {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                return (OS_INVALID);
             }
-            if(Config)
-            {
+            if (Config) {
                 Config->memorysize = atoi(node[i]->content);
             }
         }
-        /* whitelist */
-        else if(strcmp(node[i]->element, xml_white_list) == 0)
-        {
+        /* allowlist */
+        else if ((strcmp(node[i]->element, xml_white_list) == 0) || (strcmp(node[i]->element, xml_allow_list) == 0)) {
             /* Windows do not need it */
-            #ifndef WIN32
-
-            char *ip_address_regex =
-             "^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}/?"
-             "([0-9]{0,2}|[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})$";
-
-            if(Config && OS_PRegex(node[i]->content, ip_address_regex))
-            {
-                white_size++;
-                Config->white_list =
-                    realloc(Config->white_list, sizeof(os_ip *)*white_size);
-                if(!Config->white_list)
-                {
-                    merror(MEM_ERROR, ARGV0);
-                    return(OS_INVALID);
+#ifndef WIN32
+
+            const char *ip_address_regex =
+                "^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}/?"
+                "([0-9]{0,2}|[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})$";
+
+            if (Config && OS_PRegex(node[i]->content, ip_address_regex)) {
+                allow_size++;
+                Config->allow_list = (os_ip **)
+                                     realloc(Config->allow_list, sizeof(os_ip *)*allow_size);
+                if (!Config->allow_list) {
+                    merror(MEM_ERROR, __local_name, errno, strerror(errno));
+                    return (OS_INVALID);
                 }
 
-                os_calloc(1, sizeof(os_ip), Config->white_list[white_size -2]);
-                Config->white_list[white_size -1] = NULL;
+                os_calloc(1, sizeof(os_ip), Config->allow_list[allow_size - 2]);
+                Config->allow_list[allow_size - 1] = NULL;
 
-                if(!OS_IsValidIP(node[i]->content,
-                                 Config->white_list[white_size -2]))
-                {
-                    merror(INVALID_IP, ARGV0,
-                                       node[i]->content);
-                    return(OS_INVALID);
+                if (!OS_IsValidIP(node[i]->content,
+                                  Config->allow_list[allow_size - 2])) {
+                    merror(INVALID_IP, __local_name,
+                           node[i]->content);
+                    return (OS_INVALID);
                 }
             }
-            /* Adding hostname */
-            else if(Config)
-            {
-                hostname_white_size++;
-                Config->hostname_white_list =
-                    realloc(Config->hostname_white_list,
-                    sizeof(OSMatch *)*hostname_white_size);
-
-                if(!Config->hostname_white_list)
-                {
-                    merror(MEM_ERROR, ARGV0);
-                    return(OS_INVALID);
-                }
-                os_calloc(1,
-                          sizeof(OSMatch),
-                          Config->hostname_white_list[hostname_white_size -2]);
-                Config->hostname_white_list[hostname_white_size -1] = NULL;
-
-                if(!OSMatch_Compile(
-                        node[i]->content,
-                        Config->hostname_white_list[hostname_white_size -2],
-                        0))
-                {
-                    merror(REGEX_COMPILE, ARGV0, node[i]->content,
-                           Config->hostname_white_list
-                           [hostname_white_size -2]->error);
-                    return(-1);
+            /* Add hostname */
+            else if (Config) {
+                hostname_allow_size++;
+                Config->hostname_allow_list = (char **)
+                                              realloc(Config->hostname_allow_list,
+                                                      sizeof(char *)*hostname_allow_size);
+
+                if (!Config->hostname_allow_list) {
+                    merror(MEM_ERROR, __local_name, errno, strerror(errno));
+                    return (OS_INVALID);
                 }
+                os_strdup(node[i]->content, Config->hostname_allow_list[hostname_allow_size - 2]);
+                Config->hostname_allow_list[hostname_allow_size - 1] = NULL;
             }
-
-            #endif
+#endif
 
         }
 
         /* For the email now
-         * email_to, email_from, idsname, smtp_Server and maxperhour.
+         * email_to, email_from, email_replyto, idsname, smtp_Server and maxperhour.
          * We will use a separate structure for that.
          */
-        else if(strcmp(node[i]->element, xml_emailto) == 0)
-        {
-            #ifndef WIN32
-            if(!OS_PRegex(node[i]->content, "[a-zA-Z0-9\\._-]+@[a-zA-Z0-9\\._-]"))
-            {
-                merror("%s: ERROR: Invalid Email address: %s.", ARGV0, node[i]->content);
-                return(OS_INVALID);
+        else if (strcmp(node[i]->element, xml_emailto) == 0) {
+#ifndef WIN32
+            if (!OS_PRegex(node[i]->content, "[a-zA-Z0-9\\._-]+@[a-zA-Z0-9\\._-]")) {
+                merror("%s: ERROR: Invalid Email address: %s.", __local_name, node[i]->content);
+                return (OS_INVALID);
             }
-            #endif
-
-            if(Mail)
-            {
+#endif
+            if (Mail) {
                 mailto_size++;
-                Mail->to = realloc(Mail->to, sizeof(char *)*mailto_size);
-                if(!Mail->to)
-                {
-                    merror(MEM_ERROR, ARGV0);
-                    return(OS_INVALID);
+                Mail->to = (char **) realloc(Mail->to, sizeof(char *)*mailto_size);
+                if (!Mail->to) {
+                    merror(MEM_ERROR, __local_name, errno, strerror(errno));
+                    return (OS_INVALID);
                 }
 
                 os_strdup(node[i]->content, Mail->to[mailto_size - 2]);
                 Mail->to[mailto_size - 1] = NULL;
             }
-        }
-        else if(strcmp(node[i]->element, xml_emailfrom) == 0)
-        {
-            if(Mail)
-            {
-                if(Mail->from)
-                {
+        } else if (strcmp(node[i]->element, xml_emailfrom) == 0) {
+            if (Mail) {
+                if (Mail->from) {
                     free(Mail->from);
                 }
                 os_strdup(node[i]->content, Mail->from);
             }
-        }
-        else if(strcmp(node[i]->element, xml_emailidsname) == 0)
-        {
-            if(Mail)
-            {
-                if(Mail->idsname)
-                {
+        } else if (strcmp(node[i]->element, xml_emailreplyto) == 0) {
+            if (Mail) {
+                if (Mail->reply_to) {
+                    free(Mail->reply_to);
+                }
+                os_strdup(node[i]->content, Mail->reply_to);
+            }
+        } else if (strcmp(node[i]->element, xml_emailidsname) == 0) {
+            if (Mail) {
+                if (Mail->idsname) {
                     free(Mail->idsname);
                 }
                 os_strdup(node[i]->content, Mail->idsname);
             }
-        }
-        else if(strcmp(node[i]->element, xml_smtpserver) == 0)
-        {
-            #ifndef WIN32
-            if(Mail && (Mail->mn))
-            {
-                Mail->smtpserver = OS_GetHost(node[i]->content, 5);
-                if(!Mail->smtpserver)
-                {
-                    merror(INVALID_SMTP, ARGV0, node[i]->content);
-                    return(OS_INVALID);
+        } else if (strcmp(node[i]->element, xml_smtpserver) == 0) {
+#ifndef WIN32
+            if (Mail && (Mail->mn)) {
+                if (node[i]->content[0] == '/') {
+                    os_strdup(node[i]->content, Mail->smtpserver);
+                } else {
+                    Mail->smtpserver = OS_GetHost(node[i]->content, 5);
+                    if (!Mail->smtpserver) {
+                        merror(INVALID_SMTP, __local_name, node[i]->content);
+                        return (OS_INVALID);
+                    }
                 }
+                free(Mail->smtpserver);
+                os_strdup(node[i]->content, Mail->smtpserver);
             }
-            #endif
-        }
-        else if(strcmp(node[i]->element, xml_mailmaxperhour) == 0)
-        {
-            if(Mail)
-            {
-                if(!OS_StrIsNum(node[i]->content))
-                {
-                   merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                   return(OS_INVALID);
+#endif
+        } else if (strcmp(node[i]->element, xml_heloserver) == 0) {
+            if (Mail && (Mail->mn)) {
+                os_strdup(node[i]->content, Mail->heloserver);
+            }
+        } else if (strcmp(node[i]->element, xml_mailmaxperhour) == 0) {
+            if (Mail) {
+                if (!OS_StrIsNum(node[i]->content)) {
+                    merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                    return (OS_INVALID);
                 }
                 Mail->maxperhour = atoi(node[i]->content);
 
-                if((Mail->maxperhour <= 0) || (Mail->maxperhour > 9999))
-                {
-                   merror(XML_VALUEERR,ARGV0,node[i]->element,node[i]->content);
-                   return(OS_INVALID);
+                if ((Mail->maxperhour <= 0) || (Mail->maxperhour > 9999)) {
+                    merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
+                    return (OS_INVALID);
                 }
             }
         }
-#ifdef GEOIP
+#ifdef LIBGEOIP_ENABLED
         /* GeoIP v4 DB location */
-        else if(strcmp(node[i]->element, xml_geoip_db_path) == 0)
-        {
-            if(Config)
-            {
+        else if (strcmp(node[i]->element, xml_geoip_db_path) == 0) {
+            if (Config) {
                 os_strdup(node[i]->content, Config->geoip_db_path);
             }
         }
         /* GeoIP v6 DB location */
-        else if(strcmp(node[i]->element, xml_geoip6_db_path) == 0)
-        {
-            if(Config)
-            {
+        else if (strcmp(node[i]->element, xml_geoip6_db_path) == 0) {
+            if (Config) {
                 os_strdup(node[i]->content, Config->geoip6_db_path);
             }
         }
 #endif
-        else
-        {
-            merror(XML_INVELEM, ARGV0, node[i]->element);
-            return(OS_INVALID);
+
+#ifdef SQLITE_ENABLED
+        /* MD5 DB */
+        else if((strcmp(node[i]->element, xml_md5_allowlist) == 0) || (strcmp(node[i]->element, xml_md5_whitelist) == 0)) {
+            if(Config) {
+                os_strdup(node[i]->content, Config->md5_allowlist);
+            }
+        }
+#endif
+
+        else {
+            merror(XML_INVELEM, __local_name, node[i]->element);
+            return (OS_INVALID);
         }
         i++;
     }
 
-    return(0);
+    return (0);
 }
 
-
-/* EOF */