Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libpam/modules/pam_unix/pam_unix.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libpam/modules/pam_unix/pam_unix.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- src/lib/libpam/modules/pam_unix/pam_unix.c	2009/11/18 17:06:23	1.14
+++ src/lib/libpam/modules/pam_unix/pam_unix.c	2013/06/20 20:54:52	1.15
@@ -1,4 +1,4 @@
-/*	$NetBSD: pam_unix.c,v 1.14 2009/11/18 17:06:23 drochner Exp $	*/
+/*	$NetBSD: pam_unix.c,v 1.15 2013/06/20 20:54:52 christos Exp $	*/
 
 /*-
  * Copyright 1998 Juniper Networks, Inc.
@@ -40,7 +40,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.49 2004/02/10 10:13:21 des Exp $");
 #else
-__RCSID("$NetBSD: pam_unix.c,v 1.14 2009/11/18 17:06:23 drochner Exp $");
+__RCSID("$NetBSD: pam_unix.c,v 1.15 2013/06/20 20:54:52 christos Exp $");
 #endif
 
 
@@ -111,12 +111,11 @@ pam_sm_authenticate(pam_handle_t *pamh, 
 				return (PAM_SUCCESS);
 			realpw = "*";
 		}
-		lc = login_getpwclass(pwd);
 	} else {
 		PAM_LOG("Doing dummy authentication");
 		realpw = "*";
-		lc = login_getclass(NULL);
 	}
+	lc = login_getpwclass(pwd);
 	retval = pam_get_authtok(pamh, PAM_AUTHTOK, &pass, NULL);
 	login_close(lc);
 	if (retval != PAM_SUCCESS)
@@ -543,7 +542,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int
 
 		PAM_LOG("UPDATE round");
 
-		if ((lc = login_getclass(pwd->pw_class)) != NULL) {
+		if ((lc = login_getpwclass(pwd)) != NULL) {
 			min_pw_len = (int) login_getcapnum(lc,
 			    "minpasswordlen", (quad_t)0, (quad_t)0);
 			pw_expiry = (int) login_getcapnum(lc,