svn commit: r355160 - stable/12/crypto/openssh

[Ed Maste]

Author: emaste
Date: Thu Nov 28 02:18:19 2019
New Revision: 355160
URL: https://svnweb.freebsd.org/changeset/base/355160

Log:
  MFC r354897: sshd: make getpwclass wrapper MON_ISAUTH not MON_AUTH
  
  In r339216 a privsep wrapper was added for login_getpwclass to address
  PR 231172.  Unfortunately the change used the MON_AUTH flag in the
  wrapper, and MON_AUTH includes MON_AUTHDECIDE which triggers an
  auth_log() on each invocation.  getpwclass() does not participate in the
  authentication decision, so should be MON_ISAUTH instead.
  
  PR:		234793
  Submitted by:	Henry Hu
  Reviewed by:	Yuichiro NAITO
  MFC after:	1 week

Modified:
  stable/12/crypto/openssh/monitor.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/crypto/openssh/monitor.c
==============================================================================
--- stable/12/crypto/openssh/monitor.c	Thu Nov 28 02:15:45 2019	(r355159)
+++ stable/12/crypto/openssh/monitor.c	Thu Nov 28 02:18:19 2019	(r355160)
@@ -193,7 +193,7 @@ struct mon_table mon_dispatch_proto20[] = {
 #endif
     {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
 #ifdef HAVE_LOGIN_CAP
-    {MONITOR_REQ_GETPWCLASS, MON_AUTH, mm_answer_login_getpwclass},
+    {MONITOR_REQ_GETPWCLASS, MON_ISAUTH, mm_answer_login_getpwclass},
 #endif
     {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
     {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},