projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/2.7'
[ossec-hids.git]
/
src
/
os_maild
/
config.c
diff --git
a/src/os_maild/config.c
b/src/os_maild/config.c
index
311a87e
..
a3a20f3
100755
(executable)
--- a/
src/os_maild/config.c
+++ b/
src/os_maild/config.c
@@
-1,4
+1,5
@@
-/* @(#) $Id$ */
+/* @(#) $Id: ./src/os_maild/config.c, 2011/09/08 dcid Exp $
+ */
/* Copyright (C) 2009 Trend Micro Inc.
* All rights reserved.
/* Copyright (C) 2009 Trend Micro Inc.
* All rights reserved.
@@
-39,6
+40,9
@@
int MailConf(int test_config, char *cfgfile, MailConfig *Mail)
Mail->gran_format = NULL;
Mail->groupping = 1;
Mail->strict_checking = 0;
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);
if(ReadConfig(modules, cfgfile, NULL, Mail) < 0)
return(OS_INVALID);
@@
-49,7
+53,7
@@
int MailConf(int test_config, char *cfgfile, MailConfig *Mail)
{
verbose(MAIL_DIS, ARGV0);
}
{
verbose(MAIL_DIS, ARGV0);
}
- exit(0);
+ exit(0);
}
return(0);
}
return(0);