===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/local_passwd.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- src/usr.bin/passwd/local_passwd.c	2022/02/10 13:06:46	1.63
+++ src/usr.bin/passwd/local_passwd.c	2023/05/08 17:15:43	1.64
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local_passwd.c,v 1.63 2022/02/10 13:06:46 robert Exp $	*/
+/*	$OpenBSD: local_passwd.c,v 1.64 2023/05/08 17:15:43 tobias Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -202,7 +202,7 @@
 
 	pwd_tries = pwd_gettries(lc);
 
-	for (newpass[0] = '\0', tries = 0;;) {
+	for (newpass[0] = '\0', tries = -1;;) {
 		char repeat[1024];
 
 		p = readpassphrase("New password:", newpass, sizeof(newpass),
@@ -217,7 +217,7 @@
 			continue;
 		}
 
-		if ((tries++ < pwd_tries || pwd_tries == 0) &&
+		if ((pwd_tries == 0 || ++tries < pwd_tries) &&
 		    pwd_check(lc, p) == 0)
 			continue;
 		p = readpassphrase("Retype new password:", repeat, sizeof(repeat),