On Tue, Dec 28, 2021 at 06:46:03PM +0000, Raf Czlonka wrote: > Hello, > > Most changes touch the same files hence a single email and diff: > > - login_ldap(8) is missing from login.conf(5) > - capitalise 'radius' where talking about the protocol, and use an > indefinite article where relevant > - remove 'tis' style - moved to the attic a while ago[0] > > I was also thinking of normalising 'snk' as it is described as: > > "Digital Pathways SecureNet Key authentication" > > in login.conf(5), but: > > "SNK-004 authentication" > > in all of its manual pages - login_snk(8), snkadm(8), and snkinit(8). > Also, the other token authentication styles in login.conf(5) file > mention (ANSI) X9.9 and the 'snk' line does not. Either way, I wasn't > sure which way around to go. > > [0] https://marc.info/?l=openbsd-cvs&m=144805192217767&w=2 > > Regards, > > Raf >
hi. this all looks fine to me, but maybe another developer could add a second ok? jmc > cvs server: Diffing etc/etc.alpha > Index: etc/etc.alpha/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.alpha/login.conf,v > retrieving revision 1.10 > diff -u -p -r1.10 login.conf > --- etc/etc.alpha/login.conf 25 Apr 2021 16:36:56 -0000 1.10 > +++ etc/etc.alpha/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.amd64 > Index: etc/etc.amd64/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.amd64/login.conf,v > retrieving revision 1.20 > diff -u -p -r1.20 login.conf > --- etc/etc.amd64/login.conf 12 Nov 2021 15:40:19 -0000 1.20 > +++ etc/etc.amd64/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.arm64 > Index: etc/etc.arm64/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.arm64/login.conf,v > retrieving revision 1.11 > diff -u -p -r1.11 login.conf > --- etc/etc.arm64/login.conf 12 Nov 2021 15:40:20 -0000 1.11 > +++ etc/etc.arm64/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.armv7 > Index: etc/etc.armv7/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.armv7/login.conf,v > retrieving revision 1.11 > diff -u -p -r1.11 login.conf > --- etc/etc.armv7/login.conf 25 Apr 2021 16:36:56 -0000 1.11 > +++ etc/etc.armv7/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.hppa > Index: etc/etc.hppa/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.hppa/login.conf,v > retrieving revision 1.12 > diff -u -p -r1.12 login.conf > --- etc/etc.hppa/login.conf 25 Apr 2021 16:36:56 -0000 1.12 > +++ etc/etc.hppa/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.i386 > Index: etc/etc.i386/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.i386/login.conf,v > retrieving revision 1.14 > diff -u -p -r1.14 login.conf > --- etc/etc.i386/login.conf 12 Nov 2021 15:40:20 -0000 1.14 > +++ etc/etc.i386/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.landisk > Index: etc/etc.landisk/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.landisk/login.conf,v > retrieving revision 1.10 > diff -u -p -r1.10 login.conf > --- etc/etc.landisk/login.conf 25 Apr 2021 16:36:56 -0000 1.10 > +++ etc/etc.landisk/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.loongson > Index: etc/etc.loongson/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.loongson/login.conf,v > retrieving revision 1.15 > diff -u -p -r1.15 login.conf > --- etc/etc.loongson/login.conf 25 Apr 2021 16:36:56 -0000 1.15 > +++ etc/etc.loongson/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.luna88k > Index: etc/etc.luna88k/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.luna88k/login.conf,v > retrieving revision 1.10 > diff -u -p -r1.10 login.conf > --- etc/etc.luna88k/login.conf 25 Apr 2021 16:36:56 -0000 1.10 > +++ etc/etc.luna88k/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.macppc > Index: etc/etc.macppc/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.macppc/login.conf,v > retrieving revision 1.16 > diff -u -p -r1.16 login.conf > --- etc/etc.macppc/login.conf 19 Sep 2021 18:49:09 -0000 1.16 > +++ etc/etc.macppc/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.octeon > Index: etc/etc.octeon/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.octeon/login.conf,v > retrieving revision 1.13 > diff -u -p -r1.13 login.conf > --- etc/etc.octeon/login.conf 25 Apr 2021 16:36:57 -0000 1.13 > +++ etc/etc.octeon/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.powerpc64 > Index: etc/etc.powerpc64/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.powerpc64/login.conf,v > retrieving revision 1.4 > diff -u -p -r1.4 login.conf > --- etc/etc.powerpc64/login.conf 25 Apr 2021 16:36:57 -0000 1.4 > +++ etc/etc.powerpc64/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.riscv64 > Index: etc/etc.riscv64/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.riscv64/login.conf,v > retrieving revision 1.2 > diff -u -p -r1.2 login.conf > --- etc/etc.riscv64/login.conf 12 Nov 2021 15:40:20 -0000 1.2 > +++ etc/etc.riscv64/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > cvs server: Diffing etc/etc.sparc64 > Index: etc/etc.sparc64/login.conf > =================================================================== > RCS file: /cvs/src/etc/etc.sparc64/login.conf,v > retrieving revision 1.17 > diff -u -p -r1.17 login.conf > --- etc/etc.sparc64/login.conf 12 Nov 2021 15:40:20 -0000 1.17 > +++ etc/etc.sparc64/login.conf 28 Dec 2021 17:39:42 -0000 > @@ -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 > # > Index: share/man/man5/login.conf.5 > =================================================================== > RCS file: /cvs/src/share/man/man5/login.conf.5,v > retrieving revision 1.66 > diff -u -p -r1.66 login.conf.5 > --- share/man/man5/login.conf.5 2 Sep 2019 21:18:41 -0000 1.66 > +++ share/man/man5/login.conf.5 28 Dec 2021 18:38:18 -0000 > @@ -460,13 +460,18 @@ Change user's local password. > See > .Xr login_lchpass 8 . > .\" > +.It Li ldap > +Authenticate using an LDAP server. > +See > +.Xr login_ldap 8 . > +.\" > .It Li passwd > Request a password and check it against the password in the master.passwd > file. > See > .Xr login_passwd 8 . > .\" > .It Li radius > -Normally linked to another authentication type, contact the radius server > +Normally linked to another authentication type, contact a RADIUS server > to do authentication. > See > .Xr login_radius 8 . > Index: libexec/login_radius/login_radius.8 > =================================================================== > RCS file: /cvs/src/libexec/login_radius/login_radius.8,v > retrieving revision 1.14 > diff -u -p -r1.14 login_radius.8 > --- libexec/login_radius/login_radius.8 2 Oct 2015 13:50:17 -0000 > 1.14 > +++ libexec/login_radius/login_radius.8 28 Dec 2021 18:38:51 -0000 > @@ -94,7 +94,7 @@ It is expected that rather than requesti > .Nm > will be linked to the various mechanisms desired. > For instance, to have all CRYPTOCard and ActivCard authentication take > -place on a remote server via the radius protocol, remove the > +place on a remote server via the RADIUS protocol, remove the > .Pa login_activ > and > .Pa login_crypto >
