[SCM] GNU Mailutils branch, master, updated. release-2.2-588-gf9a486e

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=f9a486e8ff07e3f35e250d366e748c7f5e712c13

The branch, master has been updated
       via  f9a486e8ff07e3f35e250d366e748c7f5e712c13 (commit)
      from  4066c947d378bba39bdc36d8f1c7b0c4c4070ebd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f9a486e8ff07e3f35e250d366e748c7f5e712c13
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Apr 23 15:51:58 2012 +0300

    Bugfixes.
    
    * libproto/mailer/smtp.c (_smtp_set_rcpt): Assign rcpt_to a copy of the
    recipient address.
    * mail/util.c (util_header_expand): Make sure exp is always initialized.
    * mh/send.c (main): Process mtstailor before checking input files, so
    its settings affect creation of additional headers and adresses. In
    particular, this allows for setting the sender address in mtstailor.

-----------------------------------------------------------------------

Summary of changes:
 libproto/mailer/smtp.c |    4 +++-
 mail/util.c            |    4 +++-
 mh/send.c              |    9 ++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/libproto/mailer/smtp.c b/libproto/mailer/smtp.c
index 5f9a991..dbc5420 100644
--- a/libproto/mailer/smtp.c
+++ b/libproto/mailer/smtp.c
@@ -338,7 +338,9 @@ _smtp_set_rcpt (struct _smtp_mailer *smp, mu_message_t msg, 
mu_address_t to)
                    ("mu_mailer_send_message(): explicit to not valid"));
          return status;
        }
-      smp->rcpt_to = to;
+      smp->rcpt_to = mu_address_dup (to);
+      if (!smp->rcpt_to)
+        return ENOMEM;
 
       if (status)
        return status;
diff --git a/mail/util.c b/mail/util.c
index 8f0023c..f748fa1 100644
--- a/mail/util.c
+++ b/mail/util.c
@@ -949,7 +949,9 @@ util_header_expand (mu_header_t *phdr)
              if (mailvar_get (NULL, "inplacealiases",
                               mailvar_type_boolean, 0))
                exp = alias_expand (p);
-             rc = mu_address_create (&new_addr, exp ? exp : p);
+             else
+               exp = p;
+             rc = mu_address_create (&new_addr, p);
              if (rc)
                {
                  errcnt++;
diff --git a/mh/send.c b/mh/send.c
index a6911d6..f9617a0 100644
--- a/mh/send.c
+++ b/mh/send.c
@@ -772,7 +772,9 @@ main (int argc, char **argv)
                 opt_handler, NULL, &index);
 
   mh_read_aliases ();
-  
+  /* Process the mtstailor file */
+  read_mts_profile ();
+ 
   argc -= index;
   argv += index;
 
@@ -823,10 +825,7 @@ main (int argc, char **argv)
          return 1;
     }
 
-  /* Process the mtstailor file and detach from the console if
-     required */
-  read_mts_profile ();
-  
+  /* Detach from the console if required */
   if (background && daemon (0, 0) < 0)
     {
       mu_error (_("cannot switch to background: %s"), mu_strerror (errno));


hooks/post-receive
-- 
GNU Mailutils