]>
Commit | Line | Data |
---|---|---|
1d13e637 AF |
1 | From 47871b11df083ec6936599e1196a553379c044b3 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> | |
3 | Date: Wed, 19 Oct 2011 00:19:58 +0200 | |
4 | Subject: [PATCH 1/2] s3-docs: Document Services for Unix 2.0 (sfu20) nss_info | |
5 | ldap schema support. | |
6 | ||
7 | Guenther | |
8 | --- | |
9 | docs-xml/manpages-3/idmap_ad.8.xml | 4 +++- | |
10 | docs-xml/smbdotconf/winbind/winbindnssinfo.xml | 5 +++-- | |
11 | 2 files changed, 6 insertions(+), 3 deletions(-) | |
12 | ||
13 | Index: samba-3.6.22/docs-xml/manpages-3/idmap_ad.8.xml | |
14 | =================================================================== | |
15 | --- samba-3.6.22.orig/docs-xml/manpages-3/idmap_ad.8.xml | |
16 | +++ samba-3.6.22/docs-xml/manpages-3/idmap_ad.8.xml | |
17 | @@ -63,12 +63,17 @@ | |
18 | </para></listitem> | |
19 | </varlistentry> | |
20 | <varlistentry> | |
21 | - <term>schema_mode = <rfc2307 | sfu ></term> | |
22 | + <term>schema_mode = <rfc2307 | sfu | sfu20></term> | |
23 | <listitem><para> | |
24 | Defines the schema that idmap_ad should use when querying | |
25 | Active Directory regarding user and group information. | |
26 | This can be either the RFC2307 schema support included | |
27 | in Windows 2003 R2 or the Service for Unix (SFU) schema. | |
28 | + For SFU 3.0 or 3.5 please choose "sfu", for SFU 2.0 | |
29 | + please choose "sfu20". | |
30 | + | |
31 | + Please note that primary group membership is currently always calculated | |
32 | + via the "primaryGroupID" LDAP attribute. | |
33 | </para></listitem> | |
34 | </varlistentry> | |
35 | </variablelist> | |
36 | Index: samba-3.6.22/docs-xml/smbdotconf/winbind/winbindnssinfo.xml | |
37 | =================================================================== | |
38 | --- samba-3.6.22.orig/docs-xml/smbdotconf/winbind/winbindnssinfo.xml | |
39 | +++ samba-3.6.22/docs-xml/smbdotconf/winbind/winbindnssinfo.xml | |
40 | @@ -18,14 +18,16 @@ | |
41 | </listitem> | |
42 | ||
43 | <listitem> | |
44 | - <para><parameter moreinfo="none"><sfu | rfc2307 ></parameter> | |
45 | + <para><parameter moreinfo="none"><sfu | sfu20 | rfc2307 ></parameter> | |
46 | - When Samba is running in security = ads and your Active Directory | |
47 | Domain Controller does support the Microsoft "Services for Unix" (SFU) | |
48 | LDAP schema, winbind can retrieve the login shell and the home | |
49 | - directory attributes directly from your Directory Server. Note that | |
50 | + directory attributes directly from your Directory Server. For SFU 3.0 or 3.5 simply choose | |
51 | + "sfu", if you use SFU 2.0 please choose "sfu20". Note that | |
52 | retrieving UID and GID from your ADS-Server requires to | |
53 | use <parameter moreinfo="none">idmap config DOMAIN:backend</parameter> = ad | |
54 | - as well. | |
55 | + as well. The primary group membership is currently | |
56 | + always calculated via the "primaryGroupID" LDAP attribute. | |
57 | </para> | |
58 | </listitem> | |
59 | </itemizedlist> | |
60 | Index: samba-3.6.22/docs/manpages/idmap_ad.8 | |
61 | =================================================================== | |
62 | --- samba-3.6.22.orig/docs/manpages/idmap_ad.8 | |
63 | +++ samba-3.6.22/docs/manpages/idmap_ad.8 | |
64 | @@ -48,9 +48,9 @@ range = low \- high | |
65 | Defines the available matching UID and GID range for which the backend is authoritative\&. Note that the range acts as a filter\&. If specified any UID or GID stored in AD that fall outside the range is ignored and the corresponding map is discarded\&. It is intended as a way to avoid accidental UID/GID overlaps between local and remotely defined IDs\&. | |
66 | .RE | |
67 | .PP | |
68 | -schema_mode = <rfc2307 | sfu > | |
69 | +schema_mode = <rfc2307 | sfu | sfu20> | |
70 | .RS 4 | |
71 | -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\&. | |
72 | +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\&. | |
73 | .RE | |
74 | .SH "EXAMPLES" | |
75 | .PP |