8ff60a
From 069ba5774a5ccc72dcc3567bc6d17141d68ddff5 Mon Sep 17 00:00:00 2001
8ff60a
From: Andreas Schneider <asn@samba.org>
8ff60a
Date: Thu, 9 Jul 2020 11:48:26 +0200
8ff60a
Subject: [PATCH] docs: Fix documentation for require_membership_of of
8ff60a
 pam_winbind
8ff60a
8ff60a
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14358
8ff60a
8ff60a
Signed-off-by: Andreas Schneider <asn@samba.org>
8ff60a
Reviewed-by: Alexander Bokovoy <ab@samba.org>
8ff60a
8ff60a
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
8ff60a
Autobuild-Date(master): Fri Jul 10 09:40:37 UTC 2020 on sn-devel-184
8ff60a
8ff60a
(cherry picked from commit 4c74db6978c682f8ba4e74a6ee8157cfcbb54971)
8ff60a
---
8ff60a
 docs-xml/manpages/pam_winbind.8.xml | 8 +++++---
8ff60a
 1 file changed, 5 insertions(+), 3 deletions(-)
8ff60a
8ff60a
diff --git a/docs-xml/manpages/pam_winbind.8.xml b/docs-xml/manpages/pam_winbind.8.xml
8ff60a
index a9a227f1647..a61fb2d58e5 100644
8ff60a
--- a/docs-xml/manpages/pam_winbind.8.xml
8ff60a
+++ b/docs-xml/manpages/pam_winbind.8.xml
8ff60a
@@ -84,9 +84,11 @@
8ff60a
 		If this option is set, pam_winbind will only succeed if the user is a member of the given SID or NAME. A SID
8ff60a
 		can be either a group-SID, an alias-SID or even an user-SID. It is also possible to give a NAME instead of the
8ff60a
 		SID. That name must have the form: <parameter>MYDOMAIN\mygroup</parameter> or
8ff60a
-		<parameter>MYDOMAIN\myuser</parameter>.  pam_winbind will, in that case, lookup the SID internally. Note that
8ff60a
-		NAME may not contain any spaces. It is thus recommended to only use SIDs. You can verify the list of SIDs a
8ff60a
-		user is a member of with <command>wbinfo --user-sids=SID</command>.
8ff60a
+		<parameter>MYDOMAIN\myuser</parameter> (where '\' character corresponds to the value of
8ff60a
+		<parameter>winbind separator</parameter> parameter). It is also possible to use a UPN in the form
8ff60a
+		<parameter>user@REALM</parameter> or <parameter>group@REALM</parameter>. pam_winbind will, in that case, lookup
8ff60a
+		the SID internally. Note that NAME may not contain any spaces. It is thus recommended to only use SIDs. You can
8ff60a
+		verify the list of SIDs a user is a member of with <command>wbinfo --user-sids=SID</command>.
8ff60a
 		</para>
8ff60a
 
8ff60a
 		<para>
8ff60a
-- 
8ff60a
2.27.0
8ff60a