[SCM] GNU Mailutils branch, master, updated. release-2.2-565-ga52e922

[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=a52e9228196390c2eca97727c805ac368d54484c

The branch, master has been updated
       via  a52e9228196390c2eca97727c805ac368d54484c (commit)
       via  e310eac5f53df1cfde0165ce71c745e55d5a9f4c (commit)
      from  eee22f41d639aa148317afe2c30a515c4cae351b (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 a52e9228196390c2eca97727c805ac368d54484c
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Jan 11 11:34:43 2012 +0200

    Assorted fixes.
    
    * libmailutils/mailer/mailer.c (mu_mailer_send_fragments): Fix
    3rd argument to _set_to.
    * libproto/mailer/smtp.c (smtp_send_message): SIZE capability
    can appear alone, without specifying maximum size.
    * mh/mh_whom.c (mh_alias_expand): Recreate domain part for addresses
    missing it.

commit e310eac5f53df1cfde0165ce71c745e55d5a9f4c
Author: Sergey Poznyakoff <address@hidden>
Date:   Sun Jan 8 00:39:04 2012 +0200

    Restore extra quoting in test mhn-store-pipe of mh/tests/mhn.at
    
    Extra quoting is necessary because the argument includes unbalanced
    parentheses.  It was first implemented in commit 1b5098c9 on 2011-05-05,
    but was accidentally removed in commit 1e33c774 on 2011-10-16.

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

Summary of changes:
 libmailutils/mailer/mailer.c |    2 +-
 libproto/mailer/smtp.c       |    9 ++++++---
 mh/mh_whom.c                 |   28 ++++++++++++++++------------
 mh/tests/mhn.at              |    4 +++-
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/libmailutils/mailer/mailer.c b/libmailutils/mailer/mailer.c
index 1b504b0..3558630 100644
--- a/libmailutils/mailer/mailer.c
+++ b/libmailutils/mailer/mailer.c
@@ -666,7 +666,7 @@ mu_mailer_send_fragments (mu_mailer_t mailer,
   if (sender_addr)
     from = sender_addr;
 
-  status = _set_to (&rcpt_addr, msg, from, mailer);
+  status = _set_to (&rcpt_addr, msg, to, mailer);
   if (status)
     return status;
   if (rcpt_addr)
diff --git a/libproto/mailer/smtp.c b/libproto/mailer/smtp.c
index 8d7e761..7d92d5e 100644
--- a/libproto/mailer/smtp.c
+++ b/libproto/mailer/smtp.c
@@ -467,10 +467,13 @@ smtp_send_message (mu_mailer_t mailer, mu_message_t msg,
       mu_message_lines (msg, &lines) == 0)
     {
       size_t msgsize = size + lines;
-      size_t maxsize = strtoul (size_str + 5, NULL, 10);
+      if (strncmp (size_str, "SIZE=", 5) == 0)
+       {
+         size_t maxsize = strtoul (size_str + 5, NULL, 10);
 
-      if (msgsize && msgsize > maxsize)
-       return EFBIG;
+         if (msgsize && maxsize && msgsize > maxsize)
+           return EFBIG;
+       }
       status = mu_smtp_mail_basic (smtp, mail_from,
                                   "SIZE=%lu",
                                   (unsigned long) msgsize);
diff --git a/mh/mh_whom.c b/mh/mh_whom.c
index 690ae70..fe8dde9 100644
--- a/mh/mh_whom.c
+++ b/mh/mh_whom.c
@@ -81,19 +81,23 @@ mh_alias_expand (const char *str, mu_address_t *paddr, int 
*incl)
 
       if (mu_address_sget_domain (addr, i, &key) == 0 && key == NULL)
        {
-         if (mu_address_sget_local_part (addr, i, &key) == 0
-             && mh_alias_get_address (key, paddr, incl) == 0)
-           continue;
+         if (mu_address_sget_local_part (addr, i, &key) ||
+             mh_alias_get_address (key, paddr, incl) == 0 ||
+             /* Recreating address from local part adds the default
+                domain to it: */
+              mu_address_create (&subaddr, key))
+            continue;
        }
-
-      status = mu_address_get_nth (addr, i, &subaddr);
-      if (status)
-       {
-         mu_error (_("%s: cannot get address #%lu: %s"),
-                   str, (unsigned long) i, mu_strerror (status));
-         continue;
-       }
-
+      else 
+        {
+          status = mu_address_get_nth (addr, i, &subaddr);
+          if (status)
+           {
+             mu_error (_("%s: cannot get address #%lu: %s"),
+                       str, (unsigned long) i, mu_strerror (status));
+             continue;
+           }
+        }   
       mu_address_union (paddr, subaddr);
       mu_address_destroy (&subaddr);
     }
diff --git a/mh/tests/mhn.at b/mh/tests/mhn.at
index 69c2a43..4625b39 100644
--- a/mh/tests/mhn.at
+++ b/mh/tests/mhn.at
@@ -260,7 +260,9 @@ MUT_MBCHMOD(Mail/inbox, 700)
 
 echo "Current-Folder: inbox" > Mail/context
 echo "mhn-store-text: | $abs_top_srcdir/mh/tests/mhed -" >> $MH
-mhn +inbox -store -part 1 4 | sed "s|$abs_top_srcdir/mh/tests/||;s|(cd 
\(.*\)\;|(cd home\;|;s|  *$||" || exit $?
+dnl ! Note extra quoting in the sed argument below, necessary because of
+dnl ! unbalanced parentheses.
+mhn +inbox -store -part 1 4 | sed ["s|$abs_top_srcdir/mh/tests/||;s|(cd 
\(.*\)\;|(cd home\;|;s|  *$||"] || exit $?
 ],
 [0],
 [-- Editor invocation: -


hooks/post-receive
-- 
GNU Mailutils