Merge branch 'master' into OS-8165OS-8165

2 files changed, 49 insertions, 30 deletions

diff --git a/usr/src/man/man1/ls.1 b/usr/src/man/man1/ls.1
index 37f60ebc87..f18a94f6f4 100644
--- a/usr/src/man/man1/ls.1
+++ b/usr/src/man/man1/ls.1
@@ -45,11 +45,10 @@
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
 .\" Copyright 2014 Nexenta Systems, Inc.  All Rights Reserved.
 .\"
-.TH LS 1 "Nov 24, 2014"
+.TH LS 1 "Apr 25, 2020"
 .SH NAME
 ls \- list contents of directory
 .SH SYNOPSIS
-.LP
 .nf
 \fB/usr/bin/ls\fR [\fB-aAbcCdeEfFghHiklLmnopqrRsStuUwvVx1@\fR]
      [\fB-/ c\fR | \fBv\fR] [\fB-% atime | crtime | ctime | mtime | all\fR]
@@ -74,7 +73,6 @@ ls \- list contents of directory
 .fi
 
 .SH DESCRIPTION
-.LP
 For each \fIfile\fR that is a directory, \fBls\fR lists the contents of the
 directory. For each \fIfile\fR that is an ordinary file, \fBls\fR repeats its
 name and any other information requested. The output is sorted alphabetically
@@ -392,7 +390,6 @@ permissions during access.
 For others permissions, the third position can be occupied by \fBt\fR or
 \fBT\fR. These refer to the state of the sticky bit and execution permissions.
 .SS "Color Output"
-.LP
 If color output is enabled, the environment variable LS_COLORS is checked.  If
 it exists, its contents are used to control the colors used to display
 filenames.  If it is not set, a default list of colors is used. The format of
@@ -849,10 +846,8 @@ The appropriate color codes are chosen by selecting the most specific match,
 starting with the file suffixes and proceeding with the file types until a
 match is found. The \fBno\fR (normal file) type matches any file.
 .SH OPTIONS
-.LP
 The following options are supported:
 .SS "/usr/bin/ls, /usr/xpg4/bin/ls, and /usr/xpg6/bin/ls"
-.LP
 The following options are supported for all three versions:
 .sp
 .ne 2
@@ -2175,7 +2170,7 @@ See \fBCOLOR OUTPUT\fR for information on how to control the output colors.
 .ad
 .sp .6
 .RS 4n
-Display a suffix after a file depending on it's type, similar to the \fB-F\fR
+Display a suffix after a file depending on its type, similar to the \fB-F\fR
 option, except \fB*\fR is not appended to executable files.
 .RE
 
@@ -2378,7 +2373,6 @@ crtime\fR, \fB-% ctime\fR, and \fB-% mtime\fR) determines the timestamps used
 for sorting or in long format listings. The last \fB-t\fR, \fB-S\fR, or
 \fB-U\fR option determines the sorting behavior.
 .SH OPERANDS
-.LP
 The following operand is supported:
 .sp
 .ne 2
@@ -2392,11 +2386,9 @@ diagnostic message is output on standard error.
 .RE
 
 .SH USAGE
-.LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBls\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRViewing File Permissions
 .sp
 .LP
@@ -2643,7 +2635,6 @@ example% ls -%crtime -tl file*
 .LP
 In this example the files are sorted by creation time.
 .SH ENVIRONMENT VARIABLES
-.LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBls\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_COLLATE\fR, \fBLC_CTYPE\fR, \fBLC_TIME\fR, \fBLC_MESSAGES\fR,
@@ -2736,7 +2727,6 @@ terminal information database
 .RE
 
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .SS "/usr/bin/ls"
 
@@ -2814,12 +2804,10 @@ For all options except \fB-A\fR, \fB-b\fR, \fB-e\fR, \fB-E,\fR \fB-h\fR,
 \fB--numeric-uid-gid\fR, \fB--reverse\fR, \fB--recursive\fR, \fB--si\fR,
 \fB--size\fR, and \fB--time-style\fR, see \fBstandards\fR(5).
 .SH SEE ALSO
-.LP
 \fBchmod\fR(1), \fBcp\fR(1), \fBsetfacl\fR(1), \fBfgetattr\fR(3C),
 \fBstrftime\fR(3C), \fBterminfo\fR(4), \fBacl\fR(5), \fBattributes\fR(5),
 \fBenviron\fR(5), \fBfsattr\fR(5), \fBlargefile\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.LP
 Unprintable characters in file names can confuse the columnar output options.
 .sp
 .LP
diff --git a/usr/src/man/man5/pam_list.5 b/usr/src/man/man5/pam_list.5
index 47c3b6d934..78228ce076 100644
--- a/usr/src/man/man5/pam_list.5
+++ b/usr/src/man/man5/pam_list.5
@@ -3,24 +3,23 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PAM_LIST 5 "April 9, 2016"
+.TH PAM_LIST 5 "April 22, 2020"
 .SH NAME
 pam_list \- PAM account management module for UNIX
 .SH SYNOPSIS
-.LP
 .nf
  pam_list.so.1
 .fi
 
 .SH DESCRIPTION
-.LP
 The \fBpam_list\fR module implements \fBpam_sm_acct_mgmt\fR(3PAM), which
 provides  functionality to the PAM account management stack.  The module
 provides functions to validate  that  the  user's account  is  valid on this
-host based on a list of users and/or netgroups in the given file. The users and
-netgroups are separated by newline character. Netgroups are specified with
-character '@' as prefix before name of netgroup in the list. The maximum line
-length is 1023 characters.
+host based on a list of users, groups, and/or netgroups in the given file. The users,
+groups, and netgroups are separated by newline character. Groups are specified
+with character '%' and netgroups are specified with character '@' as prefix
+before name of the group/netgroup in the list. The maximum line length is 1023
+characters.
 .sp
 .LP
 The username is the value of \fBPAM_USER\fR. The host is the value of
@@ -48,8 +47,8 @@ The following options can be passed to the module:
 \fB\fBallow=\fR\fR
 .ad
 .RS 19n
-The full pathname to a file of allowed users and/or netgroups. Only one of
-\fBallow=\fR or \fBdeny=\fR can be specified.
+The full pathname to a file of allowed users, groups, and/or netgroups.
+Only one of \fBallow=\fR or \fBdeny=\fR can be specified.
 .RE
 
 .sp
@@ -67,8 +66,8 @@ Activate \fBcompat\fR mode.
 \fB\fBdeny=\fR\fR
 .ad
 .RS 19n
-The full pathname to a file of denied users and/or netgroups. Only one of
-\fBdeny=\fR or \fBallow=\fR can be specified.
+The full pathname to a file of denied users, groups, and/or netgroups.
+Only one of \fBdeny=\fR or \fBallow=\fR can be specified.
 .RE
 
 .sp
@@ -84,6 +83,15 @@ Provide \fBsyslog\fR(3C) debugging information at the \fBLOG_AUTH\fR |
 .sp
 .ne 2
 .na
+\fB\fBgroup\fR\fR
+.ad
+.RS 19n
+The module should perform group membership matches for the username.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBuser\fR\fR
 .ad
 .RS 19n
@@ -128,7 +136,6 @@ The user and hostname must be in the same netgroup.
 .RE
 
 .SH ERRORS
-.LP
 The following error values are returned:
 .sp
 .ne 2
@@ -186,7 +193,6 @@ No account is present for the user
 .RE
 
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRUsing \fBpam_list\fR in default mode
 .sp
 .LP
@@ -227,7 +233,7 @@ In the case of \fBdefault\fR mode or \fBcompat\fR mode, the important lines in
 .nf
 other   account requisite       pam_roles.so.1
 other   account required        pam_unix_account.so.1
-other   account required        pam_list.so.1 allow=etc/user.allow
+other   account required        pam_list.so.1 allow=/etc/users.allow
 .fi
 .in -2
 
@@ -244,8 +250,34 @@ remoteloginname
 .fi
 .in -2
 
-.SH ATTRIBUTES
 .LP
+\fBExample 3 \fRUsing \fBpam_list\fR with allow file to allow
+members of the 'admins' group access.
+.sp
+.LP
+\fB/etc/pam.conf\fR modification looks like:
+
+.sp
+.in +2
+.nf
+other   account requisite       pam_roles.so.1
+other   account required        pam_unix_account.so.1
+other   account required        pam_list.so.1 group allow=/etc/users.allow
+.fi
+.in -2
+
+.sp
+.LP
+\fB/etc/users.allow\fR contains:
+.sp
+.in +2
+.nf
+root
+%admins
+.fi
+.in -2
+
+.SH ATTRIBUTES
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -266,7 +298,6 @@ MT-Level	MT-Safe with exceptions
 The interfaces in \fBlibpam\fR(3LIB) are MT-Safe only if each thread within the
 multithreaded application uses its own PAM handle.
 .SH SEE ALSO
-.LP
 \fBpam\fR(3PAM), \fBpam_authenticate\fR(3PAM), \fBpam_sm_acct_mgmt\fR(3PAM),
 \fBsyslog\fR(3C), \fBlibpam\fR(3LIB), \fBnsswitch.conf\fR(4),
 \fBpam.conf\fR(4), \fBattributes\fR(5)