Relevant BUGIDs: Red Hat bz #150537

Purpose of commit: bugfix

Commit summary:
---------------
misc_conv: flush input first then print the prompt - fixes problem
with expect scripts

diff --git a/CHANGELOG b/CHANGELOG
index f7993aee5b69885a4da6ac61daac221cabb69d84..93dba7ceec480d6ccc44f42a7bb0a4294b8a7a6a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -65,6 +65,8 @@ BerliOS Bugs are marked with (BerliOS #XXXX).
 * pam_tally: test for NULL data before dereferencing them (t8m)
 * pam_unix: fix regression introduced in 0.78 - both NIS and local password
   should be changed if possible (t8m)
+* misc_conv: flush input first then print the prompt - fixes problem
+  with expect scripts (t8m)
 
 0.79: Thu Mar 31 16:48:45 CEST 2005
 * pam_tally: added audit option (toady)

diff --git a/libpam_misc/misc_conv.c b/libpam_misc/misc_conv.c
index 56c65c0ffff9bd02ea98a9697a33cd6b9955f002..9bee5884f952ada8e248ea8d5f0395f3fa0537f9 100644 (file)
--- a/libpam_misc/misc_conv.c
+++ b/libpam_misc/misc_conv.c
@@ -170,12 +170,12 @@ static int read_string(int echo, const char *prompt, char **retstr)
 
     /* reading the line */
     while (delay >= 0) {
-
-       fprintf(stderr, "%s", prompt);
        /* this may, or may not set echo off -- drop pending input */
        if (have_term)
            (void) tcsetattr(STDIN_FILENO, TCSAFLUSH, &term_tmp);
 
+       fprintf(stderr, "%s", prompt);
+
        if ( delay > 0 && set_alarm(delay, &old_sig) ) {
            D(("<failed to set alarm>"));
            break;