CVS commit: [netbsd-6] src/usr.bin/login

[Stephen Borrill]

Module Name:    src
Committed By:   sborrill
Date:           Tue May  8 13:38:13 UTC 2012

Modified Files:
        src/usr.bin/login [netbsd-6]: login_pam.c

Log Message:
Pull up the following revisions(s) (requested by martin in ticket #215):
        usr.bin/login/login_pam.c:      revision 1.22

Fix build.
trimusername (which does not exist) should be trimloginname.


To generate a diff of this commit:
cvs rdiff -u -r1.20.8.1 -r1.20.8.2 src/usr.bin/login/login_pam.c

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


Modified files:

Index: src/usr.bin/login/login_pam.c
diff -u src/usr.bin/login/login_pam.c:1.20.8.1 src/usr.bin/login/login_pam.c:1.20.8.2
--- src/usr.bin/login/login_pam.c:1.20.8.1	Mon May  7 16:24:07 2012
+++ src/usr.bin/login/login_pam.c	Tue May  8 13:38:13 2012
@@ -1,4 +1,4 @@
-/*     $NetBSD: login_pam.c,v 1.20.8.1 2012/05/07 16:24:07 riz Exp $       */
+/*     $NetBSD: login_pam.c,v 1.20.8.2 2012/05/08 13:38:13 sborrill Exp $       */
 
 /*-
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
 #if 0
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
-__RCSID("$NetBSD: login_pam.c,v 1.20.8.1 2012/05/07 16:24:07 riz Exp $");
+__RCSID("$NetBSD: login_pam.c,v 1.20.8.2 2012/05/08 13:38:13 sborrill Exp $");
 #endif /* not lint */
 
 /*
@@ -240,7 +240,7 @@ main(int argc, char *argv[])
 	for (cnt = 0;; ask = 1) {
 		if (ask) {
 			fflag = 0;
-			username = trimusername(getloginname());
+			username = trimloginname(getloginname());
 		}
 		rootlogin = 0;
 		auth_passed = 0;