X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=src%2Fos_maild%2Fconfig.c;h=1f2a4320adba30976d5f17f697671835c8e42fbf;hb=927951d1c1ad45ba9e7325f07d996154a91c911b;hp=6a0194e99636954f7ead79091cfe062a06a080e4;hpb=914feba5d54f979cd5d7e69c349c3d01f630042a;p=ossec-hids.git diff --git a/src/os_maild/config.c b/src/os_maild/config.c index 6a0194e..1f2a432 100755 --- a/src/os_maild/config.c +++ b/src/os_maild/config.c @@ -1,11 +1,12 @@ -/* @(#) $Id: config.c,v 1.13 2009/06/24 17:06:30 dcid Exp $ */ +/* @(#) $Id: ./src/os_maild/config.c, 2011/09/08 dcid Exp $ + */ /* Copyright (C) 2009 Trend Micro Inc. * All rights 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 */ @@ -26,6 +27,7 @@ int MailConf(int test_config, char *cfgfile, MailConfig *Mail) Mail->to = NULL; Mail->from = NULL; + Mail->idsname = NULL; Mail->smtpserver = NULL; Mail->mn = 0; Mail->priority = 0; @@ -39,6 +41,9 @@ int MailConf(int test_config, char *cfgfile, MailConfig *Mail) Mail->gran_format = NULL; Mail->groupping = 1; Mail->strict_checking = 0; +#ifdef GEOIP + Mail->geoip = 0; +#endif if(ReadConfig(modules, cfgfile, NULL, Mail) < 0) return(OS_INVALID); @@ -49,7 +54,7 @@ int MailConf(int test_config, char *cfgfile, MailConfig *Mail) { verbose(MAIL_DIS, ARGV0); } - exit(0); + exit(0); } return(0);