git: 8f4c3ef048e3 - stable/13 - login.conf(5): Default values: Rename column, elaborate on absence of such

From: Olivier Certner <olce_at_FreeBSD.org>
Date: Thu, 01 Feb 2024 21:26:08 UTC
The branch stable/13 has been updated by olce:

URL: https://cgit.FreeBSD.org/src/commit/?id=8f4c3ef048e3cc6df1d1648b431ccb6b383b3bb3

commit 8f4c3ef048e3cc6df1d1648b431ccb6b383b3bb3
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2023-05-29 14:06:37 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
CommitDate: 2024-02-01 21:23:30 +0000

    login.conf(5): Default values: Rename column, elaborate on absence of such
    
    Column "Notes" in fact only contains default values for capabilities, so
    make this clear by renaming it to "Default".
    
    Add a small introductory text mentioning it, and what an absence of
    default value means (inheritance).
    
    PR:                     271748
    Reviewed by:            emaste
    Approved by:            emaste (mentor)
    MFC after:              3 days
    Sponsored by:           Kumacom SAS
    Differential Revision:  https://reviews.freebsd.org/D40347
    
    (cherry picked from commit 92b2c4358f57ef84f161efd8370ba4832bd9261a)
    
    Approved by:            markj (mentor)
---
 lib/libutil/login.conf.5 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index b2478bb7a88c..35ca11452811 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -181,9 +181,15 @@ are considered infinite values.
 The usual convention to interpolate capability entries using the special
 .Em tc=value
 notation may be used.
+.Pp
+Default values are specified in the
+.Ql Default
+column.
+If there is no default, the value is inherited from the process setting up the
+login environment.
 .Sh RESOURCE LIMITS
 .Bl -column pseudoterminals indent indent
-.It Sy "Name	Type	Notes	Description"
+.It Sy "Name	Type	Default	Description"
 .It "coredumpsize	size		Maximum coredump size limit."
 .It "cputime	time		CPU usage limit."
 .It "datasize	size		Maximum data size limit."
@@ -209,7 +215,7 @@ The maximum and current limits may be specified individually by appending a
 -max or -cur to the capability name.
 .Sh ENVIRONMENT
 .Bl -column ignorenologin indent xbinxxusrxbin
-.It Sy "Name	Type	Notes	Description"
+.It Sy "Name	Type	Default	Description"
 .It "charset	string		Set $MM_CHARSET environment variable to the specified"
 value.
 .It "cpumask	string		List of cpus to bind the user to."
@@ -262,7 +268,7 @@ explicitly indicates not to change the umask.
 .El
 .Sh AUTHENTICATION
 .Bl -column passwd_prompt indent indent
-.It Sy "Name	Type	Notes	Description"
+.It Sy "Name	Type	Default	Description"
 .\" .It "approve	program 	Program to approve login.
 .It "copyright	file		File containing additional copyright information"
 .It "host.allow	list		List of remote host wildcards from which users in"
@@ -406,7 +412,7 @@ The following capabilities are reserved for the purposes indicated and
 may be supported by third-party software.
 They are not implemented in the base system.
 .Bl -column host.accounted indent indent
-.It Sy "Name	Type	Notes	Description"
+.It Sy "Name	Type	Default	Description"
 .It "accounted	bool	false	Enable session time accounting for all users"
 in this class.
 .It "auth	list	passwd	Allowed authentication styles."