===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2-passwd.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- src/usr.bin/ssh/auth2-passwd.c	2022/05/27 04:29:40	1.21
+++ src/usr.bin/ssh/auth2-passwd.c	2024/05/17 00:30:23	1.22
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-passwd.c,v 1.21 2022/05/27 04:29:40 dtucker Exp $ */
+/* $OpenBSD: auth2-passwd.c,v 1.22 2024/05/17 00:30:23 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -45,6 +45,7 @@
 
 /* import */
 extern ServerOptions options;
+extern struct authmethod_cfg methodcfg_passwd;
 
 static int
 userauth_passwd(struct ssh *ssh, const char *method)
@@ -64,15 +65,13 @@
 
 	if (change)
 		logit("password change not supported");
-	else if (PRIVSEP(auth_password(ssh, password)) == 1)
+	else if (mm_auth_password(ssh, password) == 1)
 		authenticated = 1;
 	freezero(password, len);
 	return authenticated;
 }
 
 Authmethod method_passwd = {
-	"password",
-	NULL,
+	&methodcfg_passwd,
 	userauth_passwd,
-	&options.password_authentication
 };