- add LDAP

- capitalise RADIUS when referring to the protocol
- remove tis

from raf czlonka
ok sthen ajacoutot

14 files changed, 42 insertions, 42 deletions

diff --git a/etc/etc.alpha/login.conf b/etc/etc.alpha/login.conf
index 9c8776e1dd3..a05581284cd 100644
--- a/etc/etc.alpha/login.conf
+++ b/etc/etc.alpha/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.10 2021/04/25 16:36:56 mortimer Exp $
+# $OpenBSD: login.conf,v 1.11 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.amd64/login.conf b/etc/etc.amd64/login.conf
index edb9421811c..6dcadd06206 100644
--- a/etc/etc.amd64/login.conf
+++ b/etc/etc.amd64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.20 2021/11/12 15:40:19 ajacoutot Exp $
+# $OpenBSD: login.conf,v 1.21 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.arm64/login.conf b/etc/etc.arm64/login.conf
index 28d1b6eca42..1b7ea299369 100644
--- a/etc/etc.arm64/login.conf
+++ b/etc/etc.arm64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.11 2021/11/12 15:40:20 ajacoutot Exp $
+# $OpenBSD: login.conf,v 1.12 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.armv7/login.conf b/etc/etc.armv7/login.conf
index 124a70eda6f..29066c4fb96 100644
--- a/etc/etc.armv7/login.conf
+++ b/etc/etc.armv7/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.11 2021/04/25 16:36:56 mortimer Exp $
+# $OpenBSD: login.conf,v 1.12 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.hppa/login.conf b/etc/etc.hppa/login.conf
index 7a4eb84a719..2e09c5ea729 100644
--- a/etc/etc.hppa/login.conf
+++ b/etc/etc.hppa/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.12 2021/04/25 16:36:56 mortimer Exp $
+# $OpenBSD: login.conf,v 1.13 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.i386/login.conf b/etc/etc.i386/login.conf
index ba5e2e40f2d..114a401000b 100644
--- a/etc/etc.i386/login.conf
+++ b/etc/etc.i386/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.14 2021/11/12 15:40:20 ajacoutot Exp $
+# $OpenBSD: login.conf,v 1.15 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.landisk/login.conf b/etc/etc.landisk/login.conf
index 9c8776e1dd3..a05581284cd 100644
--- a/etc/etc.landisk/login.conf
+++ b/etc/etc.landisk/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.10 2021/04/25 16:36:56 mortimer Exp $
+# $OpenBSD: login.conf,v 1.11 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.loongson/login.conf b/etc/etc.loongson/login.conf
index b935b0b1a74..5396087e95b 100644
--- a/etc/etc.loongson/login.conf
+++ b/etc/etc.loongson/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.15 2021/04/25 16:36:56 mortimer Exp $
+# $OpenBSD: login.conf,v 1.16 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.luna88k/login.conf b/etc/etc.luna88k/login.conf
index 9c8776e1dd3..a05581284cd 100644
--- a/etc/etc.luna88k/login.conf
+++ b/etc/etc.luna88k/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.10 2021/04/25 16:36:56 mortimer Exp $
+# $OpenBSD: login.conf,v 1.11 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.macppc/login.conf b/etc/etc.macppc/login.conf
index cc5c2485cdf..fa8e58fcfb7 100644
--- a/etc/etc.macppc/login.conf
+++ b/etc/etc.macppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.16 2021/09/19 18:49:09 cwen Exp $
+# $OpenBSD: login.conf,v 1.17 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.octeon/login.conf b/etc/etc.octeon/login.conf
index f94778573de..800ef6f7049 100644
--- a/etc/etc.octeon/login.conf
+++ b/etc/etc.octeon/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.13 2021/04/25 16:36:57 mortimer Exp $
+# $OpenBSD: login.conf,v 1.14 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.powerpc64/login.conf b/etc/etc.powerpc64/login.conf
index 6e863c9bddf..4811f6248f9 100644
--- a/etc/etc.powerpc64/login.conf
+++ b/etc/etc.powerpc64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2021/04/25 16:36:57 mortimer Exp $
+# $OpenBSD: login.conf,v 1.5 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.riscv64/login.conf b/etc/etc.riscv64/login.conf
index 18a98adf5e2..f1f6ec5f001 100644
--- a/etc/etc.riscv64/login.conf
+++ b/etc/etc.riscv64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.2 2021/11/12 15:40:20 ajacoutot Exp $
+# $OpenBSD: login.conf,v 1.3 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #
diff --git a/etc/etc.sparc64/login.conf b/etc/etc.sparc64/login.conf
index bb9c527919c..76efe7716f7 100644
--- a/etc/etc.sparc64/login.conf
+++ b/etc/etc.sparc64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.17 2021/11/12 15:40:20 ajacoutot Exp $
+# $OpenBSD: login.conf,v 1.18 2022/01/04 13:43:14 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -12,13 +12,13 @@
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
+# ldap		Use LDAP authentication
+# radius	Use RADIUS authentication
 # reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
 # yubikey	YubiKey authentication
 #