user_namespaces.7: ffix

[thirdparty/man-pages.git] / man5 / nsswitch.conf.5

diff --git a/man5/nsswitch.conf.5 b/man5/nsswitch.conf.5
index c99073385ae6c06ed8aecc6920256211384a7c0f..1e0ec3ce9be5067e7341c4859c70f438ba6487e3 100644 (file)
--- a/man5/nsswitch.conf.5
+++ b/man5/nsswitch.conf.5
@@ -22,7 +22,7 @@
 .\" <http://www.gnu.org/licenses/>.
 .\" %%%LICENSE_END
 .\"
-.TH NSSWITCH.CONF 5 2013-02-12 "Linux" "Linux Programmer's Manual"
+.TH NSSWITCH.CONF 5 2016-03-15 "Linux" "Linux Programmer's Manual"
 .SH NAME
 nsswitch.conf \- Name Service Switch configuration file
 .SH DESCRIPTION
@@ -204,6 +204,8 @@ where
 .B return
 |
 .B continue
+|
+.B merge
 .RE
 .LP
 The ! negates the test, matching all possible results except the
@@ -257,19 +259,35 @@ without affecting the search result.
 .TP
 .B continue
 Call the next lookup function.
+.TP
+.B merge
+.I [SUCCESS=merge]
+is used between two database entries.
+When a group is located in the first of the two group entries,
+processing will continue on to the next one.
+If the group is also found in the next entry (and the group name and GID
+are an exact match), the member list of the second entry will be added
+to the group object to be returned.
+Available since glibc 2.24.
 .RE
 .SS Compatibility mode (compat)
 The NSS "compat" service is similar to "files" except that it
-additionally permits special entries in
-.I /etc/passwd
+additionally permits special entries in corresponding files
 for granting users or members of netgroups access to the system.
 The following entries are valid in this mode:
 .RS 4
+.LP
+For
+.B passwd
+and
+.B shadow
+databases:
+.RS 4
 .TP 12
 .BI + user
 Include the specified
 .I user
-from the NIS passwd map.
+from the NIS passwd/shadow map.
 .TP
 .BI +@ netgroup
 Include all users in the given
@@ -278,7 +296,7 @@ Include all users in the given
 .BI \- user
 Exclude the specified
 .I user
-from the NIS passwd map.
+from the NIS passwd/shadow map.
 .TP
 .BI \-@ netgroup
 Exclude all users in the given
@@ -286,11 +304,33 @@ Exclude all users in the given
 .TP
 .B +
 Include every user, except previously excluded ones, from the
-NIS passwd map.
+NIS passwd/shadow map.
+.RE
+.LP
+For
+.B group
+database:
+.RS 4
+.TP 12
+.BI + group
+Include the specified
+.I group
+from the NIS group map.
+.TP
+.BI \- group
+Exclude the specified
+.I group
+from the NIS group map.
+.TP
+.B +
+Include every group, except previously excluded ones, from the
+NIS group map.
+.RE
 .RE
 .LP
 By default, the source is "nis", but this may be
-overridden by specifying "nisplus" as the source for the pseudo-databases
+overridden by specifying any NSS service except "compat" itself
+as the source for the pseudo-databases
 .BR passwd_compat ,
 .BR group_compat ,
 and