Attachment 15977 Details for Bug 14358 – Proposed patch

[patch] Proposed patch

bug-14358.patch (text/plain), 2.83 KB, created by Karolin Seeger on 2020-05-14 07:23:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2020-05-14 07:23:05 UTC

Size: 2.83 KB

patch

obsolete

>From 2c21e67ad1e72e9b762dcccd3642b109ce629700 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 28 Apr 2020 17:25:35 +0200
>Subject: [PATCH] docs-xml: Fix usernames in pam_winbind manpages
>
>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): Wed Apr 29 09:44:55 UTC 2020 on sn-devel-184
>
>(cherry picked from commit 3abd92d7824e803f1ff53425088ebee30b58894b)
>---
> docs-xml/manpages/pam_winbind.8.xml      | 4 ++--
> docs-xml/manpages/pam_winbind.conf.5.xml | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/docs-xml/manpages/pam_winbind.8.xml b/docs-xml/manpages/pam_winbind.8.xml
>index b8af5b54c58..a9a227f1647 100644
>--- a/docs-xml/manpages/pam_winbind.8.xml
>+++ b/docs-xml/manpages/pam_winbind.8.xml
>@@ -83,8 +83,8 @@
> 		<listitem><para>
> 		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
>+		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>.
> 		</para>
>diff --git a/docs-xml/manpages/pam_winbind.conf.5.xml b/docs-xml/manpages/pam_winbind.conf.5.xml
>index 537007ba2fa..fcac1ee7036 100644
>--- a/docs-xml/manpages/pam_winbind.conf.5.xml
>+++ b/docs-xml/manpages/pam_winbind.conf.5.xml
>@@ -68,8 +68,8 @@
> 		<listitem><para>
> 		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
>+		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.
> 		</para>
>-- 
>2.26.2
>

Flags:

asn: review+
kseeger: review+

Actions: View

Attachments on bug 14358: 15977 | 16124 | 16133