From bc707b347e558bb3ef99e50ecf17cfbbf7e0a096 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 20 Aug 2008 11:54:30 -0700 Subject: 055_pam_unix_nullok_secure: don't call _pammodutil_tty_secure with a NULL tty argument, since this will cause our helper to segfault instead of returning a useful value. Thanks to Troy Davis for the report. Closes: #495806. --- debian/patches-applied/055_pam_unix_nullok_secure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/patches-applied/055_pam_unix_nullok_secure') diff --git a/debian/patches-applied/055_pam_unix_nullok_secure b/debian/patches-applied/055_pam_unix_nullok_secure index 6e4c561b..7ef6a6a2 100644 --- a/debian/patches-applied/055_pam_unix_nullok_secure +++ b/debian/patches-applied/055_pam_unix_nullok_secure @@ -56,11 +56,11 @@ Index: pam.deb/modules/pam_unix/support.c + if (on(UNIX_NULLOK_SECURE, ctrl)) { + const void *uttyname; + retval = pam_get_item(pamh, PAM_TTY, &uttyname); -+ if (retval != PAM_SUCCESS || uttyname == NULL) ++ if (retval != PAM_SUCCESS || uttyname == NULL ++ || _pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) ++ { + nullok = 0; -+ -+ if (_pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) -+ nullok = 0; ++ } + } + + if (nullok) { -- cgit v1.2.3