[SCM] GNU Mailutils branch, master, updated. release-2.2-350-g776056e

[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=776056e2e3e7529fc64ca30bf055646fd6f11a2a

The branch, master has been updated
       via  776056e2e3e7529fc64ca30bf055646fd6f11a2a (commit)
      from  42d2ff71265b62e778b89a035efb2be795ce8956 (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 776056e2e3e7529fc64ca30bf055646fd6f11a2a
Author: Sergey Poznyakoff <address@hidden>
Date:   Fri Mar 4 09:32:26 2011 +0200

    Bugfixes
    
    * libmailutils/server/acl.c (_run_entry): Fix log output.
    * mu/shell.c: Fix compilation without readline.

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

Summary of changes:
 libmailutils/server/acl.c |   10 +++-------
 mu/shell.c                |    3 ++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libmailutils/server/acl.c b/libmailutils/server/acl.c
index b7f508a..0b7a507 100644
--- a/libmailutils/server/acl.c
+++ b/libmailutils/server/acl.c
@@ -673,17 +673,13 @@ _run_entry (void *item, void *data)
            char *s;
            if (ent->arg && expand_arg (ent->arg, rp, &s) == 0)
              {
-               if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9))
-                 mu_debug_log_end ("%s", s);
+               mu_diag_output (MU_DIAG_INFO, "%s", s);
                free (s);
              }
            else
              {
-               if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9))
-                 {
-                   debug_sockaddr (rp->sa, rp->salen);
-                   mu_debug_log_nl ();
-                 }
+               debug_sockaddr (rp->sa, rp->salen);
+               mu_debug_log_nl ();
              }
          }
          break;
diff --git a/mu/shell.c b/mu/shell.c
index 1112dc7..9baceb1 100644
--- a/mu/shell.c
+++ b/mu/shell.c
@@ -412,13 +412,14 @@ shell_history (int argc, char **argv)
 
 #else
 # define finish_readline()
-# define mutool_initialize_readline (const char *name)
+# define mutool_initialize_readline(name)
 
 char *
 readline (char *prompt)
 {
   static size_t size = 0;
   static char *buf = NULL;
+  size_t n;
 
   if (prompt)
     {


hooks/post-receive
-- 
GNU Mailutils