Skip to content

Commit

Permalink
send-email: Don't use FQDNs without a '.'
Browse files Browse the repository at this point in the history
Although Net::Domain::domainname attempts to be very thorough, the
host's configuration can still refuse to give a FQDN.  Check to see if
what we receive contains a dot as a basic sanity check.

Since the same condition is used twice and getting complex, let's move
it to a new function.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Apr 10, 2010
1 parent 68ce933 commit 59a8630
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions git-send-email.perl
Original file line number Diff line number Diff line change
Expand Up @@ -852,13 +852,17 @@ sub sanitize_address {
# This maildomain*() code is based on ideas in Perl library Test::Reporter
# /usr/share/perl5/Test/Reporter/Mail/Util.pm ==> sub _maildomain ()

sub valid_fqdn {
my $domain = shift;
return !($^O eq 'darwin' && $domain =~ /\.local$/) && $domain =~ /\./;
}

sub maildomain_net {
my $maildomain;

if (eval { require Net::Domain; 1 }) {
my $domain = Net::Domain::domainname();
$maildomain = $domain
unless $^O eq 'darwin' && $domain =~ /\.local$/;
$maildomain = $domain if valid_fqdn($domain);
}

return $maildomain;
Expand All @@ -874,8 +878,7 @@ sub maildomain_mta {
my $domain = $smtp->domain;
$smtp->quit;

$maildomain = $domain
unless $^O eq 'darwin' && $domain =~ /\.local$/;
$maildomain = $domain if valid_fqdn($domain);

last if $maildomain;
}
Expand Down

0 comments on commit 59a8630

Please sign in to comment.