The branch, master has been updated
via 71b7140fd0a docs: Fix documentation for require_membership_of of
pam_winbind.conf
from d05fc858bf7 python: samba.compat rejects Python 2
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 71b7140fd0a33e7e8c5bf37c2897cea8224b3f01
Author: Andreas Schneider <a...@samba.org>
Date: Fri Jul 17 12:14:16 2020 +0200
docs: Fix documentation for require_membership_of of pam_winbind.conf
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14358
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Isaac Boukris <ibouk...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Fri Jul 17 13:07:44 UTC 2020 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/pam_winbind.conf.5.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/pam_winbind.conf.5.xml
b/docs-xml/manpages/pam_winbind.conf.5.xml
index c4a7771fb31..0bc288f91a1 100644
--- a/docs-xml/manpages/pam_winbind.conf.5.xml
+++ b/docs-xml/manpages/pam_winbind.conf.5.xml
@@ -69,9 +69,12 @@
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>. This setting is empty by default.
+ <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>.
+ This setting is empty by default.
</para>
<para>This option only operates during password authentication,
and will not restrict access if a password is not required for any reason (such
as SSH key-based login).</para>
</listitem>
--
Samba Shared Repository
