Allow setting an empty envelope-from using '-s'.

Change documentation accordingly.
Update version and copyright dates.
Fixes #54.

Signed-off-by: Thomas Hochstein <thh@inter.net>

diff --git a/ChangeLog b/ChangeLog
index a608207..3388109 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Version 0.6.2 (unreleased)
+
+* Allow setting an empty envelope-from ('<>') using '-s'.
+  Change documentation accordingly.
+  Update version and copyright dates.
+  Fixes #54.
+  Thomas Hochstein <thh@inter.net> Sat Jan 9 11:15:42 2016 +0100
+
+

 Version 0.6.1 (2011-12-04)
 
 * Fix annoying error message
 Version 0.6.1 (2011-12-04)
 
 * Fix annoying error message

diff --git a/checkmail.pl b/checkmail.pl
index 4ea8398..9bf82b8 100644 (file)
--- a/checkmail.pl
+++ b/checkmail.pl
@@ -9,7 +9,7 @@
 # It can be redistributed and/or modified under the same terms under 
 # which Perl itself is published.
 
 # It can be redistributed and/or modified under the same terms under 
 # which Perl itself is published.
 

-our $VERSION = "0.6.1";
+our $VERSION = "0.6.2";

 
 ################################# Configuration ################################
 # Please fill in a working configuration!
 
 ################################# Configuration ################################
 # Please fill in a working configuration!


@@ -39,7 +39,7 @@ getopts('Vhqlrf:m:s:e:', \%options);
 
 # -V: display version
 if ($options{'V'}) {
 
 # -V: display version
 if ($options{'V'}) {

-  print "$myself v $VERSION\nCopyright (c) 2010 Thomas Hochstein <thh\@inter.net>\n";
+  print "$myself v $VERSION\nCopyright (c) 2010-2016 Thomas Hochstein <thh\@inter.net>\n";

   print "This program is free software; you may redistribute it and/or modify it under the same terms as Perl itself.\n";
   exit(100);
 };
   print "This program is free software; you may redistribute it and/or modify it under the same terms as Perl itself.\n";
   exit(100);
 };


@@ -67,7 +67,7 @@ if (!$options{'f'} and !$ARGV[0]) {
 };
 
 # -s / -e: override configuration
 };
 
 # -s / -e: override configuration

-$config{'from'} = $options{'s'} if $options{'s'};
+$config{'from'} = $options{'s'} if defined($options{'s'});

 $config{'helo'} = $options{'e'} if $options{'e'};
 
 # -f: open file and read addresses to @adresses
 $config{'helo'} = $options{'e'} if $options{'e'};
 
 # -f: open file and read addresses to @adresses


@@ -440,6 +440,7 @@ The hostname to be used for I<HELO> or I<EHLO> in the SMTP dialog.
 =item B<$config{'from'}>
 
 The sender address to be used for I<MAIL FROM> while testing.
 =item B<$config{'from'}>
 
 The sender address to be used for I<MAIL FROM> while testing.

+May be empty ('') to set '<>' as MAIL FROM.

 
 =back
 
 
 =back