Relevant BUGIDs: Debian bug #1708

Purpose of commit: cleanup (behavior change)

Commit summary:
---------------
2007-09-03  Steve Langasek  <vorlon@debian.org>

        * libpam_misc/misc_conv.c: don't block SIGINT in misc_conv; it's
        perfectly valid to allow the user to interrupt at a prompt.  If
        an application wants prompts to not be interruptable, the
        application should take responsibility for blocking SIGINT.

diff --git a/ChangeLog b/ChangeLog
index bbc4bb726deda605c66005ae4a3e1ae6cf7f4d14..841b028f6076ebda34f579582c6bcf28579d9043 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-03  Steve Langasek  <vorlon@debian.org>
+
+       * libpam_misc/misc_conv.c: don't block SIGINT in misc_conv; it's
+       perfectly valid to allow the user to interrupt at a prompt.  If
+       an application wants prompts to not be interruptable, the
+       application should take responsibility for blocking SIGINT.
+
 2007-09-02  Thorsten Kukuk  <kukuk@thkukuk.de>
 
        * examples/Makefile.am: Fix usage of LIBADD, LDADD and LDFLAGS.

diff --git a/NEWS b/NEWS
index 4432cf31065206fb0178915b5f68ebe67cf90830..9b67704718166ae12c0792bc5d1e18c3dc57f3ad 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 Linux-PAM NEWS -- history of user-visible changes.
 
+* misc_conv no longer blocks SIGINT; applications that don't want
+  user-interruptable prompts should block SIGINT themselves.
 
 Release 0.99.8.1
 * Fix a regression in audit code introduced with last release

diff --git a/libpam_misc/misc_conv.c b/libpam_misc/misc_conv.c
index 8db24d74b41b1ad0dd907b2df02f41bc1ca8f0df..3f82de1bbb975b7b7db2baa543bc805be0bcc810 100644 (file)
--- a/libpam_misc/misc_conv.c
+++ b/libpam_misc/misc_conv.c
@@ -150,12 +150,11 @@ static int read_string(int echo, const char *prompt, char **retstr)
        have_term = 1;
 
        /*
-        * We make a simple attempt to block TTY signals from terminating
+        * We make a simple attempt to block TTY signals from suspending
         * the conversation without giving PAM a chance to clean up.
         */
 
        sigemptyset(&nset);
-       sigaddset(&nset, SIGINT);
        sigaddset(&nset, SIGTSTP);
        (void) sigprocmask(SIG_BLOCK, &nset, &oset);