send-email: Cleanup smtp-domain and add config

The way the code stored --smtp-domain was unlike its handling of other
similar options.  Bring it in line with the others by:

- Renaming $mail_domain to $smtp_domain to match the command line
option. Also move its declaration from near the top of the file to
near other option variables.

- Removing $mail_domain_default.  The variable was used once and only
served to move the default away from where it gets used.

- Adding a sendemail.smtpdomain config option.  smtp-domain was the
only SMTP configuration option that couldn't be set in the user's
.gitconfig.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index c80262bc37065bc2f7fe16427df0940840614e45..0338d03d7e8fa472b94f4b15c12ae91981509243 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1573,6 +1573,7 @@ sendemail.smtppass::
 sendemail.suppresscc::
 sendemail.suppressfrom::
 sendemail.to::
 sendemail.suppresscc::
 sendemail.suppressfrom::
 sendemail.to::

+sendemail.smtpdomain::

 sendemail.smtpserver::
 sendemail.smtpserverport::
 sendemail.smtpuser::
 sendemail.smtpserver::
 sendemail.smtpserverport::
 sendemail.smtpuser::

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index f171471e64d6b1980fe64a359c512e909d83adf7..288a4ec3039a59a14819b843d1100fc76a47e3f6 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -123,7 +123,8 @@ Sending
        Specifies the Fully Qualified Domain Name (FQDN) used in the
        HELO/EHLO command to the SMTP server.  Some servers require the
        FQDN to match your IP address.  If not set, git send-email attempts
        Specifies the Fully Qualified Domain Name (FQDN) used in the
        HELO/EHLO command to the SMTP server.  Some servers require the
        FQDN to match your IP address.  If not set, git send-email attempts

-       to determine your FQDN automatically.
+       to determine your FQDN automatically.  Default is the value of
+       'sendemail.smtpdomain'.

 
 --smtp-pass[=<password>]::
        Password for SMTP-AUTH. The argument is optional: If no
 
 --smtp-pass[=<password>]::
        Password for SMTP-AUTH. The argument is optional: If no

diff --git a/git-send-email.perl b/git-send-email.perl
index df83f0aa1060ff57e71ae84fbc0eb29a510effa4..0f23ed380f93383fd3e085149e482be54964f789 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -132,8 +132,6 @@ sub format_2822_time {
 my $have_mail_address = eval { require Mail::Address; 1 };
 my $smtp;
 my $auth;
 my $have_mail_address = eval { require Mail::Address; 1 };
 my $smtp;
 my $auth;

-my $mail_domain_default = "localhost.localdomain";
-my $mail_domain;

 
 sub unique_email_list(@);
 sub cleanup_compose_files();
 
 sub unique_email_list(@);
 sub cleanup_compose_files();


@@ -187,7 +185,7 @@ sub do_edit {
 # Variables with corresponding config settings
 my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
 my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption);
 # Variables with corresponding config settings
 my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
 my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption);

-my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts);
+my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts, $smtp_domain);

 my ($validate, $confirm);
 my (@suppress_cc);
 
 my ($validate, $confirm);
 my (@suppress_cc);
 


@@ -209,6 +207,7 @@ sub do_edit {
     "smtpserverport" => \$smtp_server_port,
     "smtpuser" => \$smtp_authuser,
     "smtppass" => \$smtp_authpass,
     "smtpserverport" => \$smtp_server_port,
     "smtpuser" => \$smtp_authuser,
     "smtppass" => \$smtp_authpass,

+       "smtpdomain" => \$smtp_domain,

     "to" => \@to,
     "cc" => \@initial_cc,
     "cccmd" => \$cc_cmd,
     "to" => \@to,
     "cc" => \@initial_cc,
     "cccmd" => \$cc_cmd,


@@ -277,7 +276,7 @@ sub signal_handler {
                    "smtp-ssl" => sub { $smtp_encryption = 'ssl' },
                    "smtp-encryption=s" => \$smtp_encryption,
                    "smtp-debug:i" => \$debug_net_smtp,
                    "smtp-ssl" => sub { $smtp_encryption = 'ssl' },
                    "smtp-encryption=s" => \$smtp_encryption,
                    "smtp-debug:i" => \$debug_net_smtp,

-                   "smtp-domain:s" => \$mail_domain,
+                   "smtp-domain:s" => \$smtp_domain,

                    "identity=s" => \$identity,
                    "annotate" => \$annotate,
                    "compose" => \$compose,
                    "identity=s" => \$identity,
                    "annotate" => \$annotate,
                    "compose" => \$compose,


@@ -889,7 +888,7 @@ sub maildomain_mta {
 }
 
 sub maildomain {
 }
 
 sub maildomain {

-       return maildomain_net() || maildomain_mta() || $mail_domain_default;
+       return maildomain_net() || maildomain_mta() || 'localhost.localdomain';

 }
 
 # Returns 1 if the message was sent, and 0 otherwise.
 }
 
 # Returns 1 if the message was sent, and 0 otherwise.


@@ -993,18 +992,18 @@ sub send_message {
                if ($smtp_encryption eq 'ssl') {
                        $smtp_server_port ||= 465; # ssmtp
                        require Net::SMTP::SSL;
                if ($smtp_encryption eq 'ssl') {
                        $smtp_server_port ||= 465; # ssmtp
                        require Net::SMTP::SSL;

-                       $mail_domain ||= maildomain();
+                       $smtp_domain ||= maildomain();

                        $smtp ||= Net::SMTP::SSL->new($smtp_server,
                        $smtp ||= Net::SMTP::SSL->new($smtp_server,

-                                                     Hello => $mail_domain,
+                                                     Hello => $smtp_domain,

                                                      Port => $smtp_server_port);
                }
                else {
                        require Net::SMTP;
                                                      Port => $smtp_server_port);
                }
                else {
                        require Net::SMTP;

-                       $mail_domain ||= maildomain();
+                       $smtp_domain ||= maildomain();

                        $smtp ||= Net::SMTP->new((defined $smtp_server_port)
                                                 ? "$smtp_server:$smtp_server_port"
                                                 : $smtp_server,
                        $smtp ||= Net::SMTP->new((defined $smtp_server_port)
                                                 ? "$smtp_server:$smtp_server_port"
                                                 : $smtp_server,

-                                                Hello => $mail_domain,
+                                                Hello => $smtp_domain,

                                                 Debug => $debug_net_smtp);
                        if ($smtp_encryption eq 'tls' && $smtp) {
                                require Net::SMTP::SSL;
                                                 Debug => $debug_net_smtp);
                        if ($smtp_encryption eq 'tls' && $smtp) {
                                require Net::SMTP::SSL;


@@ -1027,7 +1026,7 @@ sub send_message {
                        die "Unable to initialize SMTP properly. Check config and use --smtp-debug. ",
                            "VALUES: server=$smtp_server ",
                            "encryption=$smtp_encryption ",
                        die "Unable to initialize SMTP properly. Check config and use --smtp-debug. ",
                            "VALUES: server=$smtp_server ",
                            "encryption=$smtp_encryption ",

-                           "maildomain=$mail_domain",
+                           "hello=$smtp_domain",

                            defined $smtp_server_port ? "port=$smtp_server_port" : "";
                }
 
                            defined $smtp_server_port ? "port=$smtp_server_port" : "";
                }