summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-10-19 00:19:58 +0200
committerGünther Deschner <gd@samba.org>2011-10-19 01:40:40 +0200
commit5543e6c8e5e642b97339ab03a39431c63c949502 (patch)
treeb70d78781c22789c0f6ac941d5e757fa6bd9d1cb
parentfbf17489844a5cfc6d1da8c431ce0194ed4c3f72 (diff)
downloadsamba-5543e6c8e5e642b97339ab03a39431c63c949502.tar.gz
samba-5543e6c8e5e642b97339ab03a39431c63c949502.tar.bz2
samba-5543e6c8e5e642b97339ab03a39431c63c949502.zip
s3-docs: Document Services for Unix 2.0 (sfu20) nss_info ldap schema support.
Guenther
-rw-r--r--docs-xml/manpages-3/idmap_ad.8.xml4
-rw-r--r--docs-xml/smbdotconf/winbind/winbindnssinfo.xml5
2 files changed, 6 insertions, 3 deletions
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index fbadaf2d55..57cd860247 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -60,12 +60,14 @@
</para></listitem>
</varlistentry>
<varlistentry>
- <term>schema_mode = &lt;rfc2307 | sfu &gt;</term>
+ <term>schema_mode = &lt;rfc2307 | sfu | sfu20&gt;</term>
<listitem><para>
Defines the schema that idmap_ad should use when querying
Active Directory regarding user and group information.
This can be either the RFC2307 schema support included
in Windows 2003 R2 or the Service for Unix (SFU) schema.
+ For SFU 3.0 or 3.5 please choose "sfu", for SFU 2.0
+ please choose "sfu20".
</para></listitem>
</varlistentry>
</variablelist>
diff --git a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
index 318727c37b..06b019ea5c 100644
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -18,11 +18,12 @@
</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.