Fix LMTP delivery with multiple recipients (closes #23, ref: mail-in-…

…a-box/mailinabox#1523);

Fix Warning for "Use of uninitialized value in string" (closes #22).

changelog.txt

@@ -1,6 +1,11 @@
 SpamPD Change Log
 -----------------
 
+2.53 (25-Feb-19)
+
+- Fix LMTP delivery with multiple recipients (https://github.com/mpaperno/spampd/issues/23 & https://github.com/mail-in-a-box/mailinabox/issues/1523)
+- Fix Warning for "Use of uninitialized value in string" (https://github.com/mpaperno/spampd/issues/22)
+
 2.52 (10-Nov-18)
 
 - Override Net::Server's HUP handling, just restart children (https://github.com/mpaperno/spampd/pull/20).
@@ -10,17 +15,11 @@ SpamPD Change Log
 
 2.51 (01-May-18)
 
-- Fix listening to IP address, broken in 2.50 "Unix ports" feature.  (#18)
-- Add --setsid option to start server with setsid if running in background (#18)
 - Fix listening to IP address, broken in 2.50 "Unix ports" feature.  (https://github.com/mpaperno/spampd/pull/18)
 - Add --setsid option to start server with setsid if running in background (https://github.com/mpaperno/spampd/pull/18)
 
 2.50 (30-Apr-18)
 
-- Replace IO::Socket::INET with IO::Socket::IP for IPv6 support (#9).
-- Unix ports (ability to listen on UNIX sockets) (#13).
-- Add X-Envelope-* headers before Received (#14).
-- Add /usr/local/bin and /usr/local/sbin to PATH (#17).
 - Replace IO::Socket::INET with IO::Socket::IP for IPv6 support (https://github.com/mpaperno/spampd/pull/9).
 - Unix ports (ability to listen on UNIX sockets) (https://github.com/mpaperno/spampd/pull/13).
 - Add X-Envelope-* headers before Received (https://github.com/mpaperno/spampd/pull/14).

spampd.pl

@@ -3,6 +3,7 @@
 ######################
 # SpamPD - spam proxy daemon
 #
+# v2.53  - 25-Feb-19
 # v2.52  - 10-Nov-18
 # v2.51  - 01-May-18
 # v2.50  - 30-Apr-18
@@ -110,6 +111,8 @@ sub new {
 
   die "$0: socket bind failure: $!\n" unless defined $self->{sock};
   $self->{state} = 'started';
+  $self->{proto} = 'unknown';
+  $self->{helo} = 'unknown.host';
   return $self;
 }
 
@@ -145,7 +148,7 @@ sub chat {
     return 0 unless defined($_ = $self->_getline);
     s/[\r\n]*$//;
     $self->{state} = $_;
-    if (s/^(l|h)?he?lo\s+//i) {  # mp: find helo|ehlo|lhlo
+    if (/^(l|h)?he?lo\s+/i) {  # mp: find helo|ehlo|lhlo
       # mp: determine protocol
       if (s/^helo\s+//i) {
         $self->{proto} = "smtp";
@@ -413,7 +416,7 @@ BEGIN
 
 use vars qw(@ISA $VERSION);
 our @ISA     = qw(Net::Server::PreForkSimple);
-our $VERSION = '2.52';
+our $VERSION = '2.53';
 
 sub process_message {
   my ($self, $fh) = @_;