[SCM] GNU Mailutils branch, master, updated. mu-1-2-90-separate-argp-cfg-235-g29b072f

[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=29b072f730bbe6b96d8518987ed125a6020fb5d4

The branch, master has been updated
       via  29b072f730bbe6b96d8518987ed125a6020fb5d4 (commit)
      from  178da060ff84dee3653bd9ad82e4f67d5b804eff (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 29b072f730bbe6b96d8518987ed125a6020fb5d4
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Mar 5 00:37:46 2009 +0200

    Fix coredumps on null passwords in pam and ldap auth.
    
    * libmu_auth/pam.c (mu_pam_service): Initialize to package name.
    (mu_pam_conv): Raise PAM_AUTHTOK_RECOVER_ERR, if password is NULL.
    Fix memory leak on errors.
    (mu_authenticate_pam): Fix return value.
    * libmu_auth/ldap.c (mu_ldap_authenticate): Prevent coredump on empty 
password.

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

Summary of changes:
 libmu_auth/ldap.c |    2 +-
 libmu_auth/pam.c  |   88 ++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/libmu_auth/ldap.c b/libmu_auth/ldap.c
index 7e76926..760c695 100644
--- a/libmu_auth/ldap.c
+++ b/libmu_auth/ldap.c
@@ -769,7 +769,7 @@ mu_ldap_authenticate (struct mu_auth_data **return_data 
MU_ARG_UNUSED,
   char *db_pass = auth_data->passwd;
   char *pass = call_data;
 
-  if (auth_data->passwd == NULL)
+  if (auth_data->passwd == NULL || !pass)
     return EINVAL;
 
   if (db_pass[0] == '{')
diff --git a/libmu_auth/pam.c b/libmu_auth/pam.c
index ed0a0a9..903ba24 100644
--- a/libmu_auth/pam.c
+++ b/libmu_auth/pam.c
@@ -39,63 +39,96 @@
 #ifdef HAVE_CRYPT_H
 # include <crypt.h>
 #endif
-
 #include <mailutils/list.h>
+#include <mailutils/errno.h>
 #include <mailutils/iterator.h>
 #include <mailutils/mailbox.h>
 #include <mailutils/mu_auth.h>
 #include <mailutils/nls.h>
 
-char *mu_pam_service = NULL;
+char *mu_pam_service = PACKAGE;
 
 #ifdef USE_LIBPAM
 #define COPY_STRING(s) (s) ? strdup(s) : NULL
 
 static char *_pwd;
 static char *_user;
-static int _perr = 0;
+
+#define overwrite_and_free(ptr)                        \
+  do                                           \
+    {                                          \
+      char *s = ptr;                           \
+      while (*s)                               \
+       *s++ = 0;                               \
+    }                                          \
+  while (0)
+
 
 static int
 mu_pam_conv (int num_msg, const struct pam_message **msg,
             struct pam_response **resp, void *appdata_ptr MU_ARG_UNUSED)
 {
-  int replies = 0;
+  int status = PAM_SUCCESS;
+  int i;
   struct pam_response *reply = NULL;
 
-  reply = malloc (sizeof (*reply) * num_msg);
+  reply = calloc (num_msg, sizeof (*reply));
   if (!reply)
     return PAM_CONV_ERR;
 
-  for (replies = 0; replies < num_msg; replies++)
+  for (i = 0; i < num_msg && status == PAM_SUCCESS; i++)
     {
-      switch (msg[replies]->msg_style)
+      switch (msg[i]->msg_style)
        {
        case PAM_PROMPT_ECHO_ON:
-         reply[replies].resp_retcode = PAM_SUCCESS;
-         reply[replies].resp = COPY_STRING (_user);
+         reply[i].resp_retcode = PAM_SUCCESS;
+         reply[i].resp = COPY_STRING (_user);
          /* PAM frees resp */
          break;
 
        case PAM_PROMPT_ECHO_OFF:
-         reply[replies].resp_retcode = PAM_SUCCESS;
-         reply[replies].resp = COPY_STRING (_pwd);
-         /* PAM frees resp */
+         if (_pwd)
+           {
+             reply[i].resp_retcode = PAM_SUCCESS;
+             reply[i].resp = COPY_STRING (_pwd);
+             /* PAM frees resp */
+           }
+         else
+           status = PAM_AUTHTOK_RECOVER_ERR;
          break;
 
        case PAM_TEXT_INFO:
        case PAM_ERROR_MSG:
-         reply[replies].resp_retcode = PAM_SUCCESS;
-         reply[replies].resp = NULL;
+         reply[i].resp_retcode = PAM_SUCCESS;
+         reply[i].resp = NULL;
          break;
  
        default:
-         free (reply);
-         _perr = 1;
-         return PAM_CONV_ERR;
+         status = PAM_CONV_ERR;
        }
     }
-  *resp = reply;
-  return PAM_SUCCESS;
+  if (status != PAM_SUCCESS)
+    {
+      for (i = 0; i < num_msg; i++)
+       if (reply[i].resp)
+         {
+           switch (msg[i]->msg_style)
+             {
+             case PAM_PROMPT_ECHO_ON:
+             case PAM_PROMPT_ECHO_OFF:
+               overwrite_and_free (reply[i].resp);
+               break;
+               
+             case PAM_ERROR_MSG:
+             case PAM_TEXT_INFO:
+               free (reply[i].resp);
+             }
+         }
+      free (reply);
+    }
+  else
+    *resp = reply;
+  return status;
 }
 
 static struct pam_conv PAM_conversation = { &mu_pam_conv, NULL };
@@ -111,11 +144,10 @@ mu_authenticate_pam (struct mu_auth_data **return_data 
MU_ARG_UNUSED,
   pam_handle_t *pamh;
   int pamerror;
 
-#define PAM_ERROR if (_perr || (pamerror != PAM_SUCCESS)) \
-    goto pam_errlab;
+#define PAM_ERROR if (pamerror != PAM_SUCCESS) goto pam_errlab;
 
   if (!auth_data)
-    return 1;
+    return EINVAL;
   
   _user = (char *) auth_data->name;
   _pwd = pass;
@@ -128,7 +160,14 @@ mu_authenticate_pam (struct mu_auth_data **return_data 
MU_ARG_UNUSED,
   pamerror = pam_setcred (pamh, PAM_ESTABLISH_CRED);
  pam_errlab:
   pam_end (pamh, PAM_SUCCESS);
-  return pamerror != PAM_SUCCESS;
+  switch (pamerror)
+    {
+    case PAM_SUCCESS:
+      return 0;
+    case PAM_AUTH_ERR:
+      return MU_ERR_AUTH_FAILURE;
+    }
+  return MU_ERR_FAILURE;
 }
 
 #else
@@ -139,8 +178,7 @@ mu_authenticate_pam (struct mu_auth_data **return_data 
MU_ARG_UNUSED,
                     void *func_data MU_ARG_UNUSED,
                     void *call_data MU_ARG_UNUSED)
 {
-  errno = ENOSYS;
-  return 1;
+  return ENOSYS;
 }
 
 #endif


hooks/post-receive
--
GNU Mailutils