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