The branch, master has been updated
via e1d2b47 s3-docs: Add a clarification note for nss_info primary
group membership calculation.
via 5543e6c s3-docs: Document Services for Unix 2.0 (sfu20) nss_info
ldap schema support.
from fbf1748 s3: Avoid a winbind 100% cpu loop
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e1d2b47693375760473829056650bfe44f277a18
Author: Günther Deschner <[email protected]>
Date: Wed Oct 19 00:31:07 2011 +0200
s3-docs: Add a clarification note for nss_info primary group membership
calculation.
Guenther
Autobuild-User: Günther Deschner <[email protected]>
Autobuild-Date: Wed Oct 19 03:10:40 CEST 2011 on sn-devel-104
commit 5543e6c8e5e642b97339ab03a39431c63c949502
Author: Günther Deschner <[email protected]>
Date: Wed Oct 19 00:19:58 2011 +0200
s3-docs: Document Services for Unix 2.0 (sfu20) nss_info ldap schema
support.
Guenther
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/idmap_ad.8.xml | 7 ++++++-
docs-xml/smbdotconf/winbind/winbindnssinfo.xml | 8 +++++---
2 files changed, 11 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml
b/docs-xml/manpages-3/idmap_ad.8.xml
index fbadaf2..96a093d 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -60,12 +60,17 @@
</para></listitem>
</varlistentry>
<varlistentry>
- <term>schema_mode = <rfc2307 | sfu ></term>
+ <term>schema_mode = <rfc2307 | sfu | sfu20></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".
+
+ Please note that primary group membership is currently
always calculated
+ via the "primaryGroupID" LDAP attribute.
</para></listitem>
</varlistentry>
</variablelist>
diff --git a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
index 318727c..ceff0f6 100644
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -18,14 +18,16 @@
</listitem>
<listitem>
- <para><parameter moreinfo="none"><sfu | rfc2307
></parameter>
+ <para><parameter moreinfo="none"><sfu | sfu20 |
rfc2307 ></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>
--
Samba Shared Repository
