mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-12 07:31:37 +02:00
76 lines
3.9 KiB
Diff
76 lines
3.9 KiB
Diff
From 47871b11df083ec6936599e1196a553379c044b3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
|
|
Date: Wed, 19 Oct 2011 00:19:58 +0200
|
|
Subject: [PATCH 1/2] s3-docs: Document Services for Unix 2.0 (sfu20) nss_info
|
|
ldap schema support.
|
|
|
|
Guenther
|
|
---
|
|
docs-xml/manpages-3/idmap_ad.8.xml | 4 +++-
|
|
docs-xml/smbdotconf/winbind/winbindnssinfo.xml | 5 +++--
|
|
2 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
Index: samba-3.6.22/docs-xml/manpages-3/idmap_ad.8.xml
|
|
===================================================================
|
|
--- samba-3.6.22.orig/docs-xml/manpages-3/idmap_ad.8.xml
|
|
+++ samba-3.6.22/docs-xml/manpages-3/idmap_ad.8.xml
|
|
@@ -63,12 +63,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>
|
|
Index: samba-3.6.22/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
|
|
===================================================================
|
|
--- samba-3.6.22.orig/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
|
|
+++ samba-3.6.22/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>
|
|
Index: samba-3.6.22/docs/manpages/idmap_ad.8
|
|
===================================================================
|
|
--- samba-3.6.22.orig/docs/manpages/idmap_ad.8
|
|
+++ samba-3.6.22/docs/manpages/idmap_ad.8
|
|
@@ -48,9 +48,9 @@ range = low \- high
|
|
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\&.
|
|
.RE
|
|
.PP
|
|
-schema_mode = <rfc2307 | sfu >
|
|
+schema_mode = <rfc2307 | sfu | sfu20>
|
|
.RS 4
|
|
-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\&.
|
|
+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\&.
|
|
.RE
|
|
.SH "EXAMPLES"
|
|
.PP
|