merge r196650 from head (via stable/8): tty might be NULL

Approved by:	re (kib@)
This commit is contained in:
Dag-Erling Smørgrav 2010-06-22 19:56:07 +00:00
parent 5483bc18e4
commit 838357d317
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/releng/8.1/; revision=209441

View File

@ -183,6 +183,11 @@ pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused,
pam_err = pam_get_item(pamh, PAM_TTY, (const void **)&tty);
if (pam_err != PAM_SUCCESS)
goto err;
if (tty == NULL) {
PAM_LOG("No PAM_TTY");
pam_err = PAM_SERVICE_ERR;
goto err;
}
if (strncmp(tty, _PATH_DEV, strlen(_PATH_DEV)) == 0)
tty = (const char *)tty + strlen(_PATH_DEV);
if (*(const char *)tty == '\0')