projects
/
mgsmtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Block more HTTP request methods
[mgsmtp.git]
/
MgSMTP.pas
diff --git
a/MgSMTP.pas
b/MgSMTP.pas
index 1cee11968ec66ea4e05e193e5620f9e3193102da..19dc9685e13a0960decb1bff1401374d051f8885 100644
(file)
--- a/
MgSMTP.pas
+++ b/
MgSMTP.pas
@@
-1,6
+1,6
@@
{
MegaBrutal's SMTP Server (MgSMTP)
{
MegaBrutal's SMTP Server (MgSMTP)
- Copyright (C) 2010-201
6
MegaBrutal
+ Copyright (C) 2010-201
8
MegaBrutal
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@
-49,7
+49,7
@@
const
document what bugfix/feature are you testing with the actual build.
This will be logged to help you differentiate outputs of subsequent
builds in your logs. If left empty, it won't be added to the logs. }
document what bugfix/feature are you testing with the actual build.
This will be logged to help you differentiate outputs of subsequent
builds in your logs. If left empty, it won't be added to the logs. }
- DEVCOMMENT = '
Catch CTRL-C in user mode
';
+ DEVCOMMENT = '
BindAddress
';
var
var
@@
-179,13
+179,18
@@
begin
SpoolManager:= TSpoolManager.Create(Config);
PolicyManager:= TPolicyManager.Create(Config);
SpoolManager:= TSpoolManager.Create(Config);
PolicyManager:= TPolicyManager.Create(Config);
+ AddDevComment(Logger);
+
+ if (Config.ReadString('Server', 'ListenAddress', '') = '')
+ and (Config.ReadString('Server', 'ListenPort', '') <> '') then
+ Logger.AddStdLine('WARNING! Server\ListenPort is deprecated. Use ListenAddress instead!');
+
if Config.ReadBool('Spool', 'KeepProcessedEnvelopes', false)
or Config.ReadBool('Spool', 'KeepProcessedEMails', false) then
if not DirectoryExists('processed') then CreateDir('processed');
Config.Free;
if Config.ReadBool('Spool', 'KeepProcessedEnvelopes', false)
or Config.ReadBool('Spool', 'KeepProcessedEMails', false) then
if not DirectoryExists('processed') then CreateDir('processed');
Config.Free;
- AddDevComment(Logger);
Logger.AddStdLine('Primary server name: ' + MainServerConfig.Name);
Logger.AddStdLine('FCrDNS policy: ' + FCrDNSPolicyToStr(PolicyManager.FCrDNSPolicy));
if MailboxManager.DomainSpecific then
Logger.AddStdLine('Primary server name: ' + MainServerConfig.Name);
Logger.AddStdLine('FCrDNS policy: ' + FCrDNSPolicyToStr(PolicyManager.FCrDNSPolicy));
if MailboxManager.DomainSpecific then
@@
-231,7
+236,7
@@
begin
end
else begin
Config.Free;
end
else begin
Config.Free;
- Out.writeln('Error: Server
/
Name is a mandatory configuration entry.'#13#10
+ Out.writeln('Error: Server
\
Name is a mandatory configuration entry.'#13#10
+ 'Please configure the application properly, refer to the manual.');
ReportSvcStatus(SERVICE_STOPPED, 2, 0);
end;
+ 'Please configure the application properly, refer to the manual.');
ReportSvcStatus(SERVICE_STOPPED, 2, 0);
end;
@@
-246,7
+251,7
@@
end;
begin
Out.writeln('MegaBrutal''s SMTP Server, version ' + VERSION_STR + ', ' + IntToStr(PLATFORM_BITS) + ' bits');
begin
Out.writeln('MegaBrutal''s SMTP Server, version ' + VERSION_STR + ', ' + IntToStr(PLATFORM_BITS) + ' bits');
- Out.writeln('Copyright (C) 2010-201
4
MegaBrutal');
+ Out.writeln('Copyright (C) 2010-201
8
MegaBrutal');
AddDevComment(Out);
Out.writeln;
AddDevComment(Out);
Out.writeln;