projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new upstream release (3.3.0); modify package compatibility for Stretch
[ossec-hids.git]
/
src
/
os_maild
/
config.c
diff --git
a/src/os_maild/config.c
b/src/os_maild/config.c
old mode 100755
(executable)
new mode 100644
(file)
index
6a0194e
..
13f2f2f
--- a/
src/os_maild/config.c
+++ b/
src/os_maild/config.c
@@
-1,32
+1,30
@@
-/* @(#) $Id: config.c,v 1.13 2009/06/24 17:06:30 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
/* 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
*/
#include "shared.h"
* Foundation
*/
#include "shared.h"
-
#include "maild.h"
#include "config/config.h"
#include "maild.h"
#include "config/config.h"
-/* MailConf v0.1: 2005/04/01
- * Reads the Mail configuration
- */
-int MailConf(int test_config, char *cfgfile, MailConfig *Mail)
+/* Read the Mail configuration */
+int MailConf(int test_config, const char *cfgfile, MailConfig *Mail)
{
int modules = 0;
{
int modules = 0;
- modules|= CMAIL;
+ modules |= CMAIL;
Mail->to = NULL;
Mail->to = NULL;
+ Mail->reply_to = NULL;
Mail->from = NULL;
Mail->from = NULL;
+ Mail->idsname = NULL;
Mail->smtpserver = NULL;
Mail->smtpserver = NULL;
+ Mail->heloserver = NULL;
Mail->mn = 0;
Mail->priority = 0;
Mail->maxperhour = 12;
Mail->mn = 0;
Mail->priority = 0;
Mail->maxperhour = 12;
@@
-39,20
+37,21
@@
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 LIBGEOIP_ENABLED
+ Mail->geoip = 0;
+#endif
- if(ReadConfig(modules, cfgfile, NULL, Mail) < 0)
- return(OS_INVALID);
+ if (ReadConfig(modules, cfgfile, NULL, Mail) < 0) {
+ return (OS_INVALID);
+ }
- if(!Mail->mn)
- {
- if(!test_config)
- {
+ if (!Mail->mn) {
+ if (!test_config) {
verbose(MAIL_DIS, ARGV0);
}
verbose(MAIL_DIS, ARGV0);
}
- exit(0);
+ exit(0);
}
}
- return(0);
+ return (0);
}
}
-/* EOF */