tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate code from PAM. ok djm@

This commit is contained in:
Darren Tucker 2016-06-17 14:34:09 +10:00
parent e690fe8575
commit 009891afc8
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
auth-pam.c
View File

@ -365,17 +365,6 @@ sshpam_thread_conv(int n, sshpam_const struct pam_message **msg,
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
switch (PAM_MSG_MEMBER(msg, i, msg_style)) { switch (PAM_MSG_MEMBER(msg, i, msg_style)) {
case PAM_PROMPT_ECHO_OFF: case PAM_PROMPT_ECHO_OFF:
buffer_put_cstring(&buffer,
PAM_MSG_MEMBER(msg, i, msg));
if (ssh_msg_send(ctxt->pam_csock,
PAM_MSG_MEMBER(msg, i, msg_style), &buffer) == -1)
goto fail;
if (ssh_msg_recv(ctxt->pam_csock, &buffer) == -1)
goto fail;
if (buffer_get_char(&buffer) != PAM_AUTHTOK)
goto fail;
reply[i].resp = buffer_get_string(&buffer, NULL);
break;
case PAM_PROMPT_ECHO_ON: case PAM_PROMPT_ECHO_ON:
buffer_put_cstring(&buffer, buffer_put_cstring(&buffer,
PAM_MSG_MEMBER(msg, i, msg)); PAM_MSG_MEMBER(msg, i, msg));
@ -389,12 +378,6 @@ sshpam_thread_conv(int n, sshpam_const struct pam_message **msg,
reply[i].resp = buffer_get_string(&buffer, NULL); reply[i].resp = buffer_get_string(&buffer, NULL);
break; break;
case PAM_ERROR_MSG: case PAM_ERROR_MSG:
buffer_put_cstring(&buffer,
PAM_MSG_MEMBER(msg, i, msg));
if (ssh_msg_send(ctxt->pam_csock,
PAM_MSG_MEMBER(msg, i, msg_style), &buffer) == -1)
goto fail;
break;
case PAM_TEXT_INFO: case PAM_TEXT_INFO:
buffer_put_cstring(&buffer, buffer_put_cstring(&buffer,
PAM_MSG_MEMBER(msg, i, msg)); PAM_MSG_MEMBER(msg, i, msg));