diff options
author | Steve Hay <steve.m.hay@googlemail.com> | 2015-01-26 13:30:11 +0000 |
---|---|---|
committer | Steve Hay <steve.m.hay@googlemail.com> | 2015-01-26 13:30:11 +0000 |
commit | dcd7804b1f9631aab47f9b2adb52913907824ce8 (patch) | |
tree | 2c6e45aecce41f1ba6e5209e9f1bfabf203fa378 | |
parent | 087b58c95d577fbb807a4037c08926de1df86cf9 (diff) | |
parent | 7e251383639974ba9558fd20673837d4357194cc (diff) | |
download | perl-libnet-dcd7804b1f9631aab47f9b2adb52913907824ce8.tar.gz |
Merge pull request #13 from RubberCthulhu/optional-auto-hello
Optional automatic hello
-rw-r--r-- | lib/Net/SMTP.pm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/Net/SMTP.pm b/lib/Net/SMTP.pm index 91b1598..426d50c 100644 --- a/lib/Net/SMTP.pm +++ b/lib/Net/SMTP.pm @@ -20,7 +20,7 @@ use Net::Cmd; use Net::Config; use Socket; -our $VERSION = "3.06"; +our $VERSION = "3.061"; # Code for detecting if we can use SSL my $ssl_class = eval { @@ -112,11 +112,13 @@ sub new { (${*$obj}{'net_smtp_banner'}) = $obj->message; (${*$obj}{'net_smtp_domain'}) = $obj->message =~ /\A\s*(\S+)/; - unless ($obj->hello($arg{Hello} || "")) { - my $err = ref($obj) . ": " . $obj->code . " " . $obj->message; - $obj->close(); - $@ = $err; - return; + if( !exists $arg{SendHello} || $arg{SendHello} ) { + unless ($obj->hello($arg{Hello} || "")) { + my $err = ref($obj) . ": " . $obj->code . " " . $obj->message; + $obj->close(); + $@ = $err; + return; + } } $obj; |