From 50a06ececa941383813e06fd1c44b8e7284b0546 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 27 Jun 2006 08:38:14 +0000 Subject: Relevant BUGIDs: Purpose of commit: bugfix Commit summary: --------------- * modules/pam_unix/pam_unix_acct.c (_unix_run_verify_binary): signal() fails with SIG_ERR return * modules/pam_unix/pam_unix_passwd.c(_unix_run_shadow_binary): Likewise. * modules/pam_unix/support.c(_unix_run_helper_binary): Likewise. --- ChangeLog | 9 +++++++++ modules/pam_unix/pam_unix_acct.c | 2 +- modules/pam_unix/pam_unix_passwd.c | 2 +- modules/pam_unix/support.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 637100c3..a7c533f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-06-27 Tomas Mraz + + * modules/pam_unix/pam_unix_acct.c (_unix_run_verify_binary): + signal() fails with SIG_ERR return + * modules/pam_unix/pam_unix_passwd.c(_unix_run_shadow_binary): + Likewise. + * modules/pam_unix/support.c(_unix_run_helper_binary): + Likewise. + 2006-06-25 Thorsten Kukuk * doc/man/misc_conv.3.xml: New. diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c index 6894cd09..cb2550df 100644 --- a/modules/pam_unix/pam_unix_acct.c +++ b/modules/pam_unix/pam_unix_acct.c @@ -170,7 +170,7 @@ struct spwd *_unix_run_verify_binary(pam_handle_t *pamh, unsigned int ctrl, cons } close(fds[0]); } - if (sighandler != NULL) { + if (sighandler != SIG_ERR) { (void) signal(SIGCHLD, sighandler); /* restore old signal handler */ } D(("Returning %d",retval)); diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index da96d3df..dcd123c8 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -309,7 +309,7 @@ static int _unix_run_shadow_binary(pam_handle_t *pamh, unsigned int ctrl, const retval = PAM_AUTH_ERR; } - if (sighandler != NULL) { + if (sighandler != SIG_ERR) { (void) signal(SIGCHLD, sighandler); /* restore old signal handler */ } diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index 2dc49b80..b695b8db 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -565,7 +565,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, retval = PAM_AUTH_ERR; } - if (sighandler != NULL) { + if (sighandler != SIG_ERR) { (void) signal(SIGCHLD, sighandler); /* restore old signal handler */ } -- cgit v1.2.3