[src/netbsd-7]: src/crypto/external/bsd/openssh/dist Pull up following revisi...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71a428dbe5a9
branches:  netbsd-7
changeset: 799570:71a428dbe5a9
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Aug 14 05:32:39 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #950):

crypto/external/bsd/openssh/dist/monitor.c      patch

        OpenSSH PAM fix (BFS-SA-2015-002).

diffstat:

 crypto/external/bsd/openssh/dist/monitor.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 7e4b3548002b -r 71a428dbe5a9 crypto/external/bsd/openssh/dist/monitor.c
--- a/crypto/external/bsd/openssh/dist/monitor.c        Fri Aug 14 05:29:14 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/monitor.c        Fri Aug 14 05:32:39 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: monitor.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $     */
+/*     $NetBSD: monitor.c,v 1.12.4.2 2015/08/14 05:32:39 msaitoh Exp $ */
 /* $OpenBSD: monitor.c,v 1.145 2015/02/20 22:17:21 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos%citi.umich.edu@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: monitor.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: monitor.c,v 1.12.4.2 2015/08/14 05:32:39 msaitoh Exp $");
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
@@ -1061,9 +1061,7 @@
 int
 mm_answer_pam_init_ctx(int sock, Buffer *m)
 {
-
        debug3("%s", __func__);
-       authctxt->user = buffer_get_string(m, NULL);
        sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
        sshpam_authok = NULL;
        buffer_clear(m);
@@ -1145,13 +1143,15 @@
 int
 mm_answer_pam_free_ctx(int sock, Buffer *m)
 {
+       int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt;
 
        debug3("%s", __func__);
        (sshpam_device.free_ctx)(sshpam_ctxt);
+       sshpam_ctxt = sshpam_authok = NULL;
        buffer_clear(m);
        mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
        auth_method = "keyboard-interactive/pam";
-       return (sshpam_authok == sshpam_ctxt);
+       return r;
 }
 #endif