===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/pwd_check.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/usr.bin/passwd/pwd_check.c	2001/06/18 21:09:23	1.4
+++ src/usr.bin/passwd/pwd_check.c	2002/05/27 21:12:54	1.5
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd_check.c,v 1.4 2001/06/18 21:09:23 millert Exp $	*/
+/*	$OpenBSD: pwd_check.c,v 1.5 2002/05/27 21:12:54 itojun Exp $	*/
 /*
  * Copyright 2000 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -123,6 +123,14 @@
 
 			grp = getgrgid(pwd->pw_gid);
 			if (grp != NULL) {
+				snprintf(grpkey, LINE_MAX-1, ":%s",
+				    grp->gr_name);
+				grpkey[LINE_MAX-1] = 0;
+				pw_getconf(option, LINE_MAX, grpkey,
+				    "pwdcheck");
+			}
+			if (grp != NULL && *option == 0 &&
+			    strchr(pwd->pw_name, '.') == NULL) {
 				snprintf(grpkey, LINE_MAX-1, ".%s",
 				    grp->gr_name);
 				grpkey[LINE_MAX-1] = 0;
@@ -209,6 +217,12 @@
 
 		grp = getgrgid(pwd->pw_gid);
 		if (grp != NULL) {
+			snprintf(grpkey, LINE_MAX-1, ":%s", grp->gr_name);
+			grpkey[LINE_MAX-1] = 0;
+			pw_getconf(option, LINE_MAX, grpkey, "pwdtries");
+		}
+		if (grp != NULL && *option == 0 &&
+		    strchr(pwd->pw_name, '.') == NULL) {
 			snprintf(grpkey, LINE_MAX-1, ".%s", grp->gr_name);
 			grpkey[LINE_MAX-1] = 0;
 			pw_getconf(option, LINE_MAX, grpkey, "pwdtries");