Skip to content

Commit fb67f78

Browse files
committed
Merge branch 'ag/send-email-hostname-f'
Teach "git send-email" to also consult `hostname -f` for mail domain to compute the identity given to SMTP servers. * ag/send-email-hostname-f: send-email: try to get fqdn by running hostname -f on Linux and macOS
2 parents 5e9dea5 + 9c9f884 commit fb67f78

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

git-send-email.perl

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1393,8 +1393,22 @@ sub maildomain_mta {
13931393
return $maildomain;
13941394
}
13951395

1396+
sub maildomain_hostname_command {
1397+
my $maildomain;
1398+
1399+
if ($^O eq 'linux' || $^O eq 'darwin') {
1400+
my $domain = `(hostname -f) 2>/dev/null`;
1401+
if (!$?) {
1402+
chomp($domain);
1403+
$maildomain = $domain if valid_fqdn($domain);
1404+
}
1405+
}
1406+
return $maildomain;
1407+
}
1408+
13961409
sub maildomain {
1397-
return maildomain_net() || maildomain_mta() || 'localhost.localdomain';
1410+
return maildomain_net() || maildomain_mta() ||
1411+
maildomain_hostname_command || 'localhost.localdomain';
13981412
}
13991413

14001414
sub smtp_host_string {

0 commit comments

Comments
 (0)