From 0b6d3f347f255e55e16e43129184f5ef44f2e14f Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Tue, 22 Apr 2014 11:03:40 +0000
Subject: [PATCH] Remove the kerberos login methods.

ok henning@
---
 src/etc/etc.alpha/login.conf    | 4 +---
 src/etc/etc.amd64/login.conf    | 4 +---
 src/etc/etc.armish/login.conf   | 4 +---
 src/etc/etc.armv7/login.conf    | 4 +---
 src/etc/etc.aviion/login.conf   | 4 +---
 src/etc/etc.hppa/login.conf     | 4 +---
 src/etc/etc.hppa64/login.conf   | 4 +---
 src/etc/etc.i386/login.conf     | 4 +---
 src/etc/etc.landisk/login.conf  | 4 +---
 src/etc/etc.loongson/login.conf | 4 +---
 src/etc/etc.luna88k/login.conf  | 4 +---
 src/etc/etc.macppc/login.conf   | 4 +---
 src/etc/etc.octeon/login.conf   | 4 +---
 src/etc/etc.sgi/login.conf      | 4 +---
 src/etc/etc.socppc/login.conf   | 4 +---
 src/etc/etc.sparc/login.conf    | 4 +---
 src/etc/etc.sparc64/login.conf  | 4 +---
 src/etc/etc.vax/login.conf      | 4 +---
 src/etc/etc.zaurus/login.conf   | 4 +---
 19 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/src/etc/etc.alpha/login.conf b/src/etc/etc.alpha/login.conf
index 8a4d9148..b7f4c928 100644
--- a/src/etc/etc.alpha/login.conf
+++ b/src/etc/etc.alpha/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:00 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:39 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.amd64/login.conf b/src/etc/etc.amd64/login.conf
index 8a4d9148..75577c07 100644
--- a/src/etc/etc.amd64/login.conf
+++ b/src/etc/etc.amd64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:00 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.armish/login.conf b/src/etc/etc.armish/login.conf
index 8a4d9148..75577c07 100644
--- a/src/etc/etc.armish/login.conf
+++ b/src/etc/etc.armish/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:00 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.armv7/login.conf b/src/etc/etc.armv7/login.conf
index 8a4d9148..75577c07 100644
--- a/src/etc/etc.armv7/login.conf
+++ b/src/etc/etc.armv7/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:00 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.aviion/login.conf b/src/etc/etc.aviion/login.conf
index 8a4d9148..75577c07 100644
--- a/src/etc/etc.aviion/login.conf
+++ b/src/etc/etc.aviion/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:00 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.hppa/login.conf b/src/etc/etc.hppa/login.conf
index 8a4d9148..75577c07 100644
--- a/src/etc/etc.hppa/login.conf
+++ b/src/etc/etc.hppa/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:00 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.hppa64/login.conf b/src/etc/etc.hppa64/login.conf
index 8a4d9148..75577c07 100644
--- a/src/etc/etc.hppa64/login.conf
+++ b/src/etc/etc.hppa64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:00 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.i386/login.conf b/src/etc/etc.i386/login.conf
index 8a4d9148..75577c07 100644
--- a/src/etc/etc.i386/login.conf
+++ b/src/etc/etc.i386/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:00 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.landisk/login.conf b/src/etc/etc.landisk/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.landisk/login.conf
+++ b/src/etc/etc.landisk/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.loongson/login.conf b/src/etc/etc.loongson/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.loongson/login.conf
+++ b/src/etc/etc.loongson/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.luna88k/login.conf b/src/etc/etc.luna88k/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.luna88k/login.conf
+++ b/src/etc/etc.luna88k/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.macppc/login.conf b/src/etc/etc.macppc/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.macppc/login.conf
+++ b/src/etc/etc.macppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.octeon/login.conf b/src/etc/etc.octeon/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.octeon/login.conf
+++ b/src/etc/etc.octeon/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.sgi/login.conf b/src/etc/etc.sgi/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.sgi/login.conf
+++ b/src/etc/etc.sgi/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.socppc/login.conf b/src/etc/etc.socppc/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.socppc/login.conf
+++ b/src/etc/etc.socppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.sparc/login.conf b/src/etc/etc.sparc/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.sparc/login.conf
+++ b/src/etc/etc.sparc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.sparc64/login.conf b/src/etc/etc.sparc64/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.sparc64/login.conf
+++ b/src/etc/etc.sparc64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.vax/login.conf b/src/etc/etc.vax/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.vax/login.conf
+++ b/src/etc/etc.vax/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)
diff --git a/src/etc/etc.zaurus/login.conf b/src/etc/etc.zaurus/login.conf
index 04c02ecb..75577c07 100644
--- a/src/etc/etc.zaurus/login.conf
+++ b/src/etc/etc.zaurus/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2014/03/26 20:17:01 tedu Exp $
+# $OpenBSD: login.conf,v 1.2 2014/04/22 11:03:40 reyk Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -7,9 +7,7 @@
 #
 # Standard authentication styles:
 #
-# krb5-or-pwd	First try Kerberos V password, then local password file
 # passwd	Use only the local password file
-# krb5		Use only the Kerberos V password
 # chpass	Do not authenticate, but change users password (change
 #		the YP password if the user has one, else change the
 #		local password)