Jason McIntyre <[email protected]> wrote:
> On Fri, May 31, 2019 at 10:20:16PM +0100, Larry Hynes wrote:
> > - Use "user's password" (instead of "users password") consistently
>
> agreed
>
> > - Change "to be read something like" to "to something like"
>
> i think it was probably intended to be "to read something like", which i
> think reads better than your proposal.
>
> > - Change "Be sure reset" to "Be sure to reset" (I'm not sure if line
> > length is an issue here, so I deleted the arguably superfluous "back"
> > from "reset these vales back", in case it is)
>
> agreed
>
> > Following is a patch for etc.amd64/login.conf against -current. If/when
> > there is agreement on the proposed changes, I will send patches for
> > other archs.
>
> if you can update per second comment and do for all archs, it's ok me.
> if no one else picks it up, i'll commit myself.
Thanks Jason
Following are diffs for all archs, as per above.
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.alpha/login.conf,v
retrieving revision 1.6
diff -u -p -r1.6 login.conf
--- login.conf 6 Feb 2017 18:11:33 -0000 1.6
+++ login.conf 31 May 2019 23:32:54 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.amd64/login.conf,v
retrieving revision 1.10
diff -u -p -r1.10 login.conf
--- login.conf 2 May 2019 08:35:10 -0000 1.10
+++ login.conf 31 May 2019 23:33:51 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.arm64/login.conf,v
retrieving revision 1.3
diff -u -p -r1.3 login.conf
--- login.conf 24 Jan 2019 13:14:10 -0000 1.3
+++ login.conf 31 May 2019 23:34:44 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.armv7/login.conf,v
retrieving revision 1.6
diff -u -p -r1.6 login.conf
--- login.conf 6 Feb 2017 18:11:33 -0000 1.6
+++ login.conf 31 May 2019 23:35:23 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.hppa/login.conf,v
retrieving revision 1.8
diff -u -p -r1.8 login.conf
--- login.conf 19 Feb 2019 01:51:31 -0000 1.8
+++ login.conf 31 May 2019 23:35:45 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.i386/login.conf,v
retrieving revision 1.7
diff -u -p -r1.7 login.conf
--- login.conf 6 Feb 2017 18:11:33 -0000 1.7
+++ login.conf 31 May 2019 23:36:06 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.landisk/login.conf,v
retrieving revision 1.6
diff -u -p -r1.6 login.conf
--- login.conf 6 Feb 2017 18:11:33 -0000 1.6
+++ login.conf 31 May 2019 23:36:24 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.loongson/login.conf,v
retrieving revision 1.7
diff -u -p -r1.7 login.conf
--- login.conf 16 Aug 2017 18:06:55 -0000 1.7
+++ login.conf 31 May 2019 23:36:44 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.luna88k/login.conf,v
retrieving revision 1.6
diff -u -p -r1.6 login.conf
--- login.conf 6 Feb 2017 18:11:33 -0000 1.6
+++ login.conf 31 May 2019 23:36:58 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.macppc/login.conf,v
retrieving revision 1.7
diff -u -p -r1.7 login.conf
--- login.conf 6 Feb 2017 18:11:33 -0000 1.7
+++ login.conf 31 May 2019 23:37:12 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.octeon/login.conf,v
retrieving revision 1.7
diff -u -p -r1.7 login.conf
--- login.conf 16 Aug 2017 18:06:55 -0000 1.7
+++ login.conf 31 May 2019 23:37:27 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.sgi/login.conf,v
retrieving revision 1.7
diff -u -p -r1.7 login.conf
--- login.conf 16 Aug 2017 18:06:55 -0000 1.7
+++ login.conf 31 May 2019 23:37:43 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
Index: login.conf
===================================================================
RCS file: /cvs/src/etc/etc.sparc64/login.conf,v
retrieving revision 1.9
diff -u -p -r1.9 login.conf
--- login.conf 19 Feb 2019 01:51:31 -0000 1.9
+++ login.conf 31 May 2019 23:38:09 -0000
@@ -8,7 +8,7 @@
# Standard authentication styles:
#
# passwd Use only the local password file
-# chpass Do not authenticate, but change users password (change
+# chpass Do not authenticate, but change user's password (change
# the YP password if the user has one, else change the
# local password)
# lchpass Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
# The default values
# To alter the default authentication types change the line:
# :tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
# :auth=passwd,myauth,activ:\
# Any value changed in the daemon class should be reset in default
# class.
@@ -55,7 +55,7 @@ default:\
#
# Settings used by /etc/rc and root
# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
#
daemon:\
:ignorenologin:\
