[SCM] GNU Mailutils branch, master, updated. rel-2_1-49-gaa3531f

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

The branch, master has been updated
       via  aa3531ff8751fffe8de970b251de4d93b255b1ef (commit)
       via  5a48abe69bcf247e6b481085bb22b144d1ce2bae (commit)
      from  735a362267d81a625fe2ddf31a8ce617e6bfacf5 (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 aa3531ff8751fffe8de970b251de4d93b255b1ef
Author: Sergey Poznyakoff <address@hidden>
Date:   Fri Mar 19 12:12:51 2010 +0200

    Minor change.
    
    * bootstrap.conf: Define COPYRIGHT_HOLDER.

commit 5a48abe69bcf247e6b481085bb22b144d1ce2bae
Author: Simon Josefsson <address@hidden>
Date:   Fri Mar 19 12:11:55 2010 +0200

    Bugfix.
    
    * imap4d/auth_gsasl.c (auth_gsasl): Fix memory management.

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

Summary of changes:
 bootstrap.conf      |    1 +
 imap4d/auth_gsasl.c |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index d9e2c48..f61b6d6 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -31,6 +31,7 @@ gnulib_modules="$avoided_gnulib_modules
 `grep '^[^#]' gnulib.modules`
 "
 
+COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
 XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=_:1:pass-c-format\\\
diff --git a/imap4d/auth_gsasl.c b/imap4d/auth_gsasl.c
index 3f137b0..cf3e201 100644
--- a/imap4d/auth_gsasl.c
+++ b/imap4d/auth_gsasl.c
@@ -86,7 +86,7 @@ auth_gsasl (struct imap4d_command *command, char *auth_type, 
char **username)
   if (rc != GSASL_OK)
     {
       mu_diag_output (MU_DIAG_NOTICE, _("SASL gsasl_server_start: %s"),
-             gsasl_strerror(rc));
+                     gsasl_strerror (rc));
       return 0;
     }
 
@@ -100,11 +100,11 @@ auth_gsasl (struct imap4d_command *command, char 
*auth_type, char **username)
       imap4d_getline (&input_str, &input_size, &input_len);
     }
   
-  free (input_str);
   if (rc != GSASL_OK)
     {
       mu_diag_output (MU_DIAG_NOTICE, _("GSASL error: %s"),
                      gsasl_strerror (rc));
+      free (input_str);
       free (output);
       return RESP_NO;
     }
@@ -118,10 +118,13 @@ auth_gsasl (struct imap4d_command *command, char 
*auth_type, char **username)
       if (input_len != 0)
        {
          mu_diag_output (MU_DIAG_NOTICE, _("non-empty client response"));
+          free (input_str);
+          free (output);
          return RESP_NO;
        }
     }
 
+  free (input_str);
   free (output);
 
   if (*username == NULL)


hooks/post-receive
-- 
GNU Mailutils