tedu ~/.klogin

ok henning@ deraadt@

diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 1b19266..5a860f8 100644 (file)
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -205,7 +205,6 @@
 ./root/.Xdefaults
 ./root/.cshrc
 ./root/.cvsrc
-./root/.klogin
 ./root/.login
 ./root/.profile
 ./var/crash/minfree

diff --git a/etc/Makefile b/etc/Makefile
index c51e770..f24fcec 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.356 2014/04/24 15:05:10 tedu Exp $
+#      $OpenBSD: Makefile,v 1.357 2014/04/29 21:30:20 dcoppa Exp $
 
 TZDIR=         /usr/share/zoneinfo
 LOCALTIME=     Canada/Mountain
@@ -131,8 +131,6 @@ distribution-etc-root-var: distrib-dirs
        cd root; \
                ${INSTALL} -c -o root -g wheel -m 644 dot.cshrc \
                    ${DESTDIR}/root/.cshrc; \
-               ${INSTALL} -c -o root -g wheel -m 600 dot.klogin \
-                   ${DESTDIR}/root/.klogin; \
                ${INSTALL} -c -o root -g wheel -m 644 dot.login \
                    ${DESTDIR}/root/.login; \
                ${INSTALL} -c -o root -g wheel -m 644 dot.profile \

diff --git a/etc/changelist b/etc/changelist
index 90cb43f..8c34141 100644 (file)
--- a/etc/changelist
+++ b/etc/changelist
@@ -1,4 +1,4 @@
-#      $OpenBSD: changelist,v 1.86 2014/04/22 10:24:29 reyk Exp $
+#      $OpenBSD: changelist,v 1.87 2014/04/29 21:30:20 dcoppa Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -153,7 +153,6 @@
 /etc/ypldap.conf
 /root/.Xdefaults
 /root/.cshrc
-/root/.klogin
 /root/.login
 /root/.profile
 /root/.rhosts

diff --git a/etc/mtree/special b/etc/mtree/special
index 8d7ce4d..a597743 100644 (file)
--- a/etc/mtree/special
+++ b/etc/mtree/special
@@ -1,4 +1,4 @@
-#      $OpenBSD: special,v 1.103 2014/04/22 10:48:36 reyk Exp $
+#      $OpenBSD: special,v 1.104 2014/04/29 21:30:20 dcoppa Exp $
 #      $NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #      @(#)special     8.2 (Berkeley) 1/23/94
 #
@@ -118,7 +118,6 @@ uucp                type=dir mode=0755 uname=root gname=wheel optional ignore
 
 root           type=dir mode=0700 uname=root gname=wheel
 .cshrc         type=file mode=0644 uname=root gname=wheel
-.klogin                type=file mode=0600 uname=root gname=wheel optional
 .login         type=file mode=0644 uname=root gname=wheel
 .profile       type=file mode=0644 uname=root gname=wheel
 .rhosts                type=file mode=0600 uname=root gname=wheel optional

diff --git a/etc/root/dot.klogin b/etc/root/dot.klogin
deleted file mode 100644 (file)
index 9b64155..0000000
--- a/etc/root/dot.klogin
+++ /dev/null
@@ -1,4 +0,0 @@
-#      $OpenBSD: dot.klogin,v 1.4 2002/06/09 06:15:15 todd Exp $
-
-#user1.root@your.realm.wherever
-#user2.root@your.realm.wherever

diff --git a/libexec/security/security b/libexec/security/security
index a7ab2df..aed24bc 100644 (file)
--- a/libexec/security/security
+++ b/libexec/security/security
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 
-# $OpenBSD: security,v 1.26 2014/04/21 15:46:03 sthen Exp $
+# $OpenBSD: security,v 1.27 2014/04/29 21:30:20 dcoppa Exp $
 #
 # Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
@@ -103,7 +103,7 @@ sub check_passwd {
                            "\t by root; cannot check for existence " .
                            "of alternate access files."
                        or check_access_file "$home/.$_", $name
-                           foreach qw(ssh rhosts shosts klogin);
+                           foreach qw(ssh rhosts shosts);
                }
                nag $uid == 0 && $name ne 'root',
                    "Login $name has a user ID of 0.";
@@ -407,7 +407,7 @@ sub check_dot_writeable {
        return if $name =~ /^[+-]/;  # skip YP lines
        foreach my $f (qw(
            .bashrc .bash_profile .bash_login .bash_logout .cshrc
-           .emacs .exrc .forward .fvwmrc .inputrc .klogin .kshrc .login
+           .emacs .exrc .forward .fvwmrc .inputrc .kshrc .login
            .logout .nexrc .profile .screenrc .ssh .ssh/config
            .ssh/authorized_keys .ssh/authorized_keys2 .ssh/environment
            .ssh/known_hosts .ssh/rc .tcshrc .twmrc .xsession .xinitrc