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 b99f9fdbc2a574ca9df0f09653db2ae0071d7245..1e0ec3ce9be5067e7341c4859c70f438ba6487e3 100644 (file)
--- a/man5/nsswitch.conf.5
+++ b/man5/nsswitch.conf.5
@@ -204,6 +204,8 @@ where
 .B return
 |
 .B continue
+|
+.B merge
 .RE
 .LP
 The ! negates the test, matching all possible results except the
@@ -257,6 +259,16 @@ 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