Attachment 12878 Details for Bug 12542 – Patch for 4.6 cherry-picked from master

[patch] Patch for 4.6 cherry-picked from master

bug12542-v46.patch (text/plain), 2.65 KB, created by Ralph Böhme on 2017-01-31 06:41:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2017-01-31 06:41:20 UTC

Size: 2.65 KB

patch

obsolete

>From 7538c7b187d14ccafedacaeb0992d9f1de5903ec Mon Sep 17 00:00:00 2001
>From: John Mulligan <jmulligan@nasuni.com>
>Date: Fri, 13 Jan 2017 07:33:01 +0100
>Subject: [PATCH] docs: Improve description of "unix_primary_group" parameter
> in idmap_ad manpage
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12542
>
>Signed-off-by: John Mulligan <jmulligan@nasuni.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Fri Jan 27 20:58:18 CET 2017 on sn-devel-144
>
>(cherry picked from commit f605332e1b87d87e0c454bcae2a374013d3ebf82)
>---
> docs-xml/manpages/idmap_ad.8.xml | 27 +++++++++++++++++++--------
> 1 file changed, 19 insertions(+), 8 deletions(-)
>
>diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
>index 58e7f52..c667695 100644
>--- a/docs-xml/manpages/idmap_ad.8.xml
>+++ b/docs-xml/manpages/idmap_ad.8.xml
>@@ -70,23 +70,34 @@
> 			For SFU 3.0 or 3.5 please choose "sfu", for SFU 2.0
> 			please choose "sfu20".
> 
>-			Please note that primary group membership is currently always calculated
>-			via the "primaryGroupID" LDAP attribute.
>+			Please note that the behavior of primary group membership is
>+			controlled by the <emphasis>unix_primary_group</emphasis> option.
> 		</para></listitem>
> 		</varlistentry>
> 		<varlistentry>
> 		<term>unix_primary_group = yes/no</term>
> 		<listitem><para>
>-		  Defines whether to retrieve the user's primary group
>-		  from the SFU attributes.
>-		</para></listitem>
>+		  Defines whether the user's primary group is fetched from the SFU
>+		  attributes or the AD primary group. If set to
>+		  <parameter>yes</parameter> the primary group membership is fetched
>+		  from the LDAP attributes (gidNumber).
>+		  If set to <parameter>no</parameter> the primary group membership is
>+		  calculated via the "primaryGroupID" LDAP attribute.
>+		</para>
>+		<para>Default: no</para>
>+		</listitem>
> 		</varlistentry>
> 		<varlistentry>
> 		<term>unix_nss_info = yes/no</term>
> 		<listitem><para>
>-		  Defines whether to retrieve the login shell and
>-		  home directory from the SFU attributes.
>-		</para></listitem>
>+		  If set to <parameter>yes</parameter> winbind will retrieve the login
>+		  shell and home directory from the LDAP attributes. If set to
>+		  <parameter>no</parameter> the or the AD LDAP entry lacks the SFU
>+		  attributes the options <emphasis>template shell</emphasis> and
>+		  <emphasis>template homedir</emphasis> are used.
>+		</para>
>+		<para>Default: no</para>
>+		</listitem>
> 		</varlistentry>
> 	</variablelist>
> </refsect1>
>-- 
>2.9.3
>

Flags:

vl: review+

Actions: View

Attachments on bug 12542: 12878