[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  f605332 docs: Improve description of "unix_primary_group" parameter in idmap_ad manpage
      from  348bcca selftest/Samba3: use "server min protocol = SMB3_00" for "ktest"

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f605332e1b87d87e0c454bcae2a374013d3ebf82
Author: John Mulligan <jmulligan at nasuni.com>
Date:   Fri Jan 13 07:33:01 2017 +0100

    docs: Improve description of "unix_primary_group" parameter in idmap_ad manpage
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=12542
    
    Signed-off-by: John Mulligan <jmulligan at nasuni.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Fri Jan 27 20:58:18 CET 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages/idmap_ad.8.xml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
index 355c08e..fa5ae72 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>


-- 
Samba Shared Repository