[src/netbsd-3]: src/usr.bin/login Pull up following revision(s) (requested by...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6ec57d5e5bcd
branches:  netbsd-3
changeset: 577869:6ec57d5e5bcd
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Mar 09 16:54:10 2006 +0000

description:
Pull up following revision(s) (requested by jnemeth in ticket #1199):
        usr.bin/login/login_pam.c: revision 1.13
PR/30923: Zafer Aydogan: pam too verbose
Don't display a different message for root logins on insecure terminals.
Approved by christos@.

diffstat:

 usr.bin/login/login_pam.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 1d7c5d3ee10c -r 6ec57d5e5bcd usr.bin/login/login_pam.c
--- a/usr.bin/login/login_pam.c Thu Mar 09 16:48:46 2006 +0000
+++ b/usr.bin/login/login_pam.c Thu Mar 09 16:54:10 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: login_pam.c,v 1.4.2.4 2005/07/09 22:42:12 tron Exp $       */
+/*     $NetBSD: login_pam.c,v 1.4.2.5 2006/03/09 16:54:10 tron Exp $       */
 
 /*-
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)login.c    8.4 (Berkeley) 4/2/94";
 #endif
-__RCSID("$NetBSD: login_pam.c,v 1.4.2.4 2005/07/09 22:42:12 tron Exp $");
+__RCSID("$NetBSD: login_pam.c,v 1.4.2.5 2006/03/09 16:54:10 tron Exp $");
 #endif /* not lint */
 
 /*
@@ -388,6 +388,12 @@
                                        PAM_END("pam_chauthtok");
                                break;
 
+                       case PAM_AUTH_ERR:
+                       case PAM_USER_UNKNOWN:
+                       case PAM_MAXTRIES:
+                               auth_passed = 0;
+                               break;
+
                        default:
                                PAM_END("pam_acct_mgmt");
                                break;
@@ -415,7 +421,7 @@
                if (pwd && auth_passed)
                        break;
 
-               (void)printf("Login incorrect\n");
+               (void)printf("Login incorrect or refused on this terminal.\n");
                failures++;
                cnt++;
                /* we allow 10 tries, but after 3 we start backing off */