Merge tag 'upstream/4.0.5+dfsg1' into samba_4.0_ivo

[abartlet/samba-debian.git] / docs-xml / smbdotconf / winbind / winbindnssinfo.xml

diff --git a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
index 318727c37bfad2e19d67c255e1f3f988aaa0c8ce..ceff0f669acbebd7035d7792274d519aa9382107 100644 (file)
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -18,14 +18,16 @@
                </listitem>
 
                <listitem>
-                       <para><parameter moreinfo="none">&lt;sfu | rfc2307 &gt;</parameter>
+                       <para><parameter moreinfo="none">&lt;sfu | sfu20 | rfc2307 &gt;</parameter>
                        - When Samba is running in security = ads and your Active Directory
                        Domain Controller does support the Microsoft "Services for Unix" (SFU)
                        LDAP schema, winbind can retrieve the login shell and the home
-                       directory attributes directly from your Directory Server. Note that
+                       directory attributes directly from your Directory Server. For SFU 3.0 or 3.5 simply choose
+                       "sfu", if you use SFU 2.0 please choose "sfu20". Note that
                        retrieving UID and GID from your ADS-Server requires to
                        use <parameter moreinfo="none">idmap config DOMAIN:backend</parameter> = ad
-                       as well.
+                       as well. The primary group membership is currently
+                       always calculated via the "primaryGroupID" LDAP attribute.
                        </para>
                </listitem>
        </itemizedlist>