diff options
author | Darren Tucker <dtucker@zip.com.au> | 2016-06-17 14:34:09 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-06-17 14:34:09 +1000 |
commit | 009891afc8df37bc2101e15d1e0b6433cfb90549 (patch) | |
tree | adccdb77b17fdcc04af500527fd59d6d8692c40a /auth-pam.c | |
parent | e690fe85750e93fca1fb7c7c8587d4130a4f7aba (diff) |
Remove duplicate code from PAM. ok djm@
Diffstat (limited to 'auth-pam.c')
-rw-r--r-- | auth-pam.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/auth-pam.c b/auth-pam.c index f80278c3a..451de78cd 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -365,17 +365,6 @@ sshpam_thread_conv(int n, sshpam_const struct pam_message **msg, | |||
365 | for (i = 0; i < n; ++i) { | 365 | for (i = 0; i < n; ++i) { |
366 | switch (PAM_MSG_MEMBER(msg, i, msg_style)) { | 366 | switch (PAM_MSG_MEMBER(msg, i, msg_style)) { |
367 | case PAM_PROMPT_ECHO_OFF: | 367 | case PAM_PROMPT_ECHO_OFF: |
368 | buffer_put_cstring(&buffer, | ||
369 | PAM_MSG_MEMBER(msg, i, msg)); | ||
370 | if (ssh_msg_send(ctxt->pam_csock, | ||
371 | PAM_MSG_MEMBER(msg, i, msg_style), &buffer) == -1) | ||
372 | goto fail; | ||
373 | if (ssh_msg_recv(ctxt->pam_csock, &buffer) == -1) | ||
374 | goto fail; | ||
375 | if (buffer_get_char(&buffer) != PAM_AUTHTOK) | ||
376 | goto fail; | ||
377 | reply[i].resp = buffer_get_string(&buffer, NULL); | ||
378 | break; | ||
379 | case PAM_PROMPT_ECHO_ON: | 368 | case PAM_PROMPT_ECHO_ON: |
380 | buffer_put_cstring(&buffer, | 369 | buffer_put_cstring(&buffer, |
381 | PAM_MSG_MEMBER(msg, i, msg)); | 370 | PAM_MSG_MEMBER(msg, i, msg)); |
@@ -389,12 +378,6 @@ sshpam_thread_conv(int n, sshpam_const struct pam_message **msg, | |||
389 | reply[i].resp = buffer_get_string(&buffer, NULL); | 378 | reply[i].resp = buffer_get_string(&buffer, NULL); |
390 | break; | 379 | break; |
391 | case PAM_ERROR_MSG: | 380 | case PAM_ERROR_MSG: |
392 | buffer_put_cstring(&buffer, | ||
393 | PAM_MSG_MEMBER(msg, i, msg)); | ||
394 | if (ssh_msg_send(ctxt->pam_csock, | ||
395 | PAM_MSG_MEMBER(msg, i, msg_style), &buffer) == -1) | ||
396 | goto fail; | ||
397 | break; | ||
398 | case PAM_TEXT_INFO: | 381 | case PAM_TEXT_INFO: |
399 | buffer_put_cstring(&buffer, | 382 | buffer_put_cstring(&buffer, |
400 | PAM_MSG_MEMBER(msg, i, msg)); | 383 | PAM_MSG_MEMBER(msg, i, msg)); |