Module Name: src
Committed By: snj
Date: Wed Feb 11 08:34:17 UTC 2015
Modified Files:
src/usr.bin/login [netbsd-7]: login.c login_pam.c
Log Message:
Pull up following revision(s) (requested by aymeric in ticket #506):
usr.bin/login/login.c: revision 1.105
usr.bin/login/login_pam.c: revision 1.24
Remove the syslogging of a dial out login warning based on the tty name, because
the test is sloppy and doesn't correspond to the current naming anyway.
OK gdt@
PR#377 can remain closed.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.104.4.1 src/usr.bin/login/login.c
cvs rdiff -u -r1.23 -r1.23.4.1 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.c
diff -u src/usr.bin/login/login.c:1.104 src/usr.bin/login/login.c:1.104.4.1
--- src/usr.bin/login/login.c:1.104 Sun Mar 16 00:33:13 2014
+++ src/usr.bin/login/login.c Wed Feb 11 08:34:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: login.c,v 1.104 2014/03/16 00:33:13 dholland Exp $ */
+/* $NetBSD: login.c,v 1.104.4.1 2015/02/11 08:34:17 snj 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.c,v 1.104 2014/03/16 00:33:13 dholland Exp $");
+__RCSID("$NetBSD: login.c,v 1.104.4.1 2015/02/11 08:34:17 snj Exp $");
#endif /* not lint */
/*
@@ -637,9 +637,6 @@ main(int argc, char *argv[])
(void)setenv("KRB5CCNAME", krb5tkfile_env, 1);
#endif
- if (tty[sizeof("tty")-1] == 'd')
- syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
-
/* If fflag is on, assume caller/authenticator has logged root login. */
if (rootlogin && fflag == 0) {
if (hostname)
Index: src/usr.bin/login/login_pam.c
diff -u src/usr.bin/login/login_pam.c:1.23 src/usr.bin/login/login_pam.c:1.23.4.1
--- src/usr.bin/login/login_pam.c:1.23 Fri Oct 18 20:47:06 2013
+++ src/usr.bin/login/login_pam.c Wed Feb 11 08:34:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: login_pam.c,v 1.23 2013/10/18 20:47:06 christos Exp $ */
+/* $NetBSD: login_pam.c,v 1.23.4.1 2015/02/11 08:34:17 snj 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.23 2013/10/18 20:47:06 christos Exp $");
+__RCSID("$NetBSD: login_pam.c,v 1.23.4.1 2015/02/11 08:34:17 snj Exp $");
#endif /* not lint */
/*
@@ -467,10 +467,6 @@ skip_auth:
exit(EXIT_FAILURE);
}
- if (tty[sizeof("tty")-1] == 'd')
- syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
-
-
/*
* Establish groups
*/
