From ba03913cf0ac1a4495e199831d4bb7604a953228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Wed, 18 Jun 2003 11:14:58 +0000 Subject: [PATCH] Checking the return value from pam_get_item(3) isn't enough, we also have to check that the item isn't NULL. Submitted by: marcus git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@258 185d5e19-27fe-0310-9dcf-9bff6b9f3609 --- lib/pam_get_user.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pam_get_user.c b/lib/pam_get_user.c index 3c30f5f..413056c 100644 --- a/lib/pam_get_user.c +++ b/lib/pam_get_user.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_user.c#17 $ + * $P4: //depot/projects/openpam/lib/pam_get_user.c#18 $ */ #include @@ -43,7 +43,7 @@ #include "openpam_impl.h" -const char user_prompt[] = "Login:"; +static const char user_prompt[] = "Login:"; /* * XSSO 4.2.1 @@ -64,7 +64,7 @@ pam_get_user(pam_handle_t *pamh, if (pamh == NULL || user == NULL) RETURNC(PAM_SYSTEM_ERR); r = pam_get_item(pamh, PAM_USER, (const void **)user); - if (r == PAM_SUCCESS) + if (r == PAM_SUCCESS && *user != NULL) RETURNC(PAM_SUCCESS); if (prompt == NULL) { r = pam_get_item(pamh, PAM_USER_PROMPT, (const void **)&prompt);