- (dtucker) [auth-pam.c] Bug #1028: send final non-query messages from

   PAM via keyboard-interactive.  Patch tested by the folks at Vintela.

diff --git a/ChangeLog b/ChangeLog
index 19e025a4e0e5864499d5dd114306892d3d7da6e2..248af546bd2c761ff66a9332e3bb63f6181a5d2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20050928
  - (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency.
+ - (dtucker) [auth-pam.c] Bug #1028: send final non-query messages from
+   PAM via keyboard-interactive.  Patch tested by the folks at Vintela.
 
 20050927
  - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid

diff --git a/auth-pam.c b/auth-pam.c
index 4cbde4ecdae3fbfee26c76d4e5b0a3f0a5147a98..3defe5851727c8d4009c91e6f10252bf7762f76d 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -716,8 +716,18 @@ sshpam_query(void *ctx, char **name, char **info,
                        plen++;
                        xfree(msg);
                        break;
-               case PAM_SUCCESS:
                case PAM_AUTH_ERR:
+                       debug3("PAM: PAM_AUTH_ERR");
+                       if (**prompts != NULL && strlen(**prompts) != 0) {
+                               *info = **prompts;
+                               **prompts = NULL;
+                               *num = 0;
+                               **echo_on = 0;
+                               ctxt->pam_done = -1;
+                               return 0;
+                       }
+                       /* FALLTHROUGH */
+               case PAM_SUCCESS:
                        if (**prompts != NULL) {
                                /* drain any accumulated messages */
                                debug("PAM: %s", **prompts);