[Pkg-openldap-devel] r767 - in openldap/trunk-2.3/debian: . patches
Matthijs Mohlmann
matthijs at alioth.debian.org
Sat Dec 23 10:21:01 CET 2006
Author: matthijs
Date: 2006-12-23 10:21:00 +0100 (Sat, 23 Dec 2006)
New Revision: 767
Added:
openldap/trunk-2.3/debian/patches/adminguide-docfixes
Modified:
openldap/trunk-2.3/debian/changelog
openldap/trunk-2.3/debian/patches/series
Log:
* Documentation updates backported from upstream.
Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog 2006-12-22 20:44:57 UTC (rev 766)
+++ openldap/trunk-2.3/debian/changelog 2006-12-23 09:21:00 UTC (rev 767)
@@ -1,8 +1,9 @@
openldap2.3 (2.3.30-3) unstable; urgency=low
* Added spanish translation. (Closes: #404250)
+ * Documentation updates backported from upstream.
- -- Matthijs Mohlmann <matthijs at cacholong.nl> Fri, 22 Dec 2006 21:43:59 +0100
+ -- Matthijs Mohlmann <matthijs at cacholong.nl> Sat, 23 Dec 2006 10:20:27 +0100
openldap2.3 (2.3.30-2) unstable; urgency=low
Added: openldap/trunk-2.3/debian/patches/adminguide-docfixes
===================================================================
--- openldap/trunk-2.3/debian/patches/adminguide-docfixes 2006-12-22 20:44:57 UTC (rev 766)
+++ openldap/trunk-2.3/debian/patches/adminguide-docfixes 2006-12-23 09:21:00 UTC (rev 767)
@@ -0,0 +1,94 @@
+Index: doc/guide/admin/guide.html
+===================================================================
+--- doc/guide/admin/guide.html.orig
++++ doc/guide/admin/guide.html
+@@ -1256,10 +1256,11 @@
+ <PRE>
+ olcSyncrepl: rid=<replica ID>
+ provider=ldap[s]://<hostname>[:port]
++ [starttls=yes|critical]
+ [type=refreshOnly|refreshAndPersist]
+ [interval=dd:hh:mm:ss]
+ [retry=[<retry interval> <# of retries>]+]
+- [searchbase=<base DN>]
++ searchbase=<base DN>
+ [filter=<filter str>]
+ [scope=sub|one|base]
+ [attrs=<attr list>]
+@@ -1279,6 +1280,7 @@
+ <P>This directive specifies the current database as a replica of the master content by establishing the current <EM>slapd</EM>(8) as a replication consumer site running a syncrepl replication engine. The master database is located at the replication provider site specified by the <TT>provider</TT> parameter. The replica database is kept up-to-date with the master content using the LDAP Content Synchronization protocol. See <TT>draft-zeilenga-ldup-sync-xx.txt</TT> (<EM>a work in progress</EM>) for more information on the protocol.</P>
+ <P>The <TT>rid</TT> parameter is used for identification of the current <TT>syncrepl</TT> directive within the replication consumer server, where <TT><replica ID></TT> uniquely identifies the syncrepl specification described by the current <TT>syncrepl</TT> directive. <TT><replica ID></TT> is non-negative and is no more than three decimal digits in length.</P>
+ <P>The <TT>provider</TT> parameter specifies the replication provider site containing the master content as an LDAP URI. The <TT>provider</TT> parameter specifies a scheme, a host and optionally a port where the provider slapd instance can be found. Either a domain name or IP address may be used for <hostname>. Examples are <TT>ldap://provider.example.com:389</TT> or <TT>ldaps://192.168.1.1:636</TT>. If <port> is not given, the standard LDAP port number (389 or 636) is used. Note that the syncrepl uses a consumer-initiated protocol, and hence its specification is located at the consumer site, whereas the <TT>replica</TT> specification is located at the provider site. <TT>syncrepl</TT> and <TT>replica</TT> directives define two independent replication mechanisms. They do not represent the replication peers of each other.</P>
++<P>The <TT>starttls</TT> parameter specifies use of the StartTLS extended operation to establish a TLS session before Binding to the provider. If the StartTLS request fails and the <TT>critical</TT> argument was used, the session will be aborted. Otherwise the syncrepl session continues without TLS.</P>
+ <P>The content of the syncrepl replica is defined using a search specification as its result set. The consumer slapd will send search requests to the provider slapd according to the search specification. The search specification includes <TT>searchbase</TT>, <TT>scope</TT>, <TT>filter</TT>, <TT>attrs</TT>, <TT>attrsonly</TT>, <TT>sizelimit</TT>, and <TT>timelimit</TT> parameters as in the normal search specification. The <TT>searchbase</TT> parameter has no default value and must always be specified. The <TT>scope</TT> defaults to <TT>sub</TT>, the <TT>filter</TT> defaults to <TT>(objectclass=*)</TT>, <TT>attrs</TT> defaults to <TT>"*,+"</TT> to replicate all user and operational attributes, and <TT>attrsonly</TT> is unset by default. Both <TT>sizelimit</TT> and <TT>timelimit</TT> default to "unlimited", and only positive integers or "unlimited" may be specified.</P>
+ <P>The LDAP Content Synchronization protocol has two operation types: <TT>refreshOnly</TT> and <TT>refreshAndPersist</TT>. The operation type is specified by the <TT>type</TT> parameter. In the <TT>refreshOnly</TT> operation, the next synchronization search operation is periodically rescheduled at an interval time after each synchronization operation finishes. The interval is specified by the <TT>interval</TT> parameter. It is set to one day by default. In the <TT>refreshAndPersist</TT> operation, a synchronization search remains persistent in the provider slapd. Further updates to the master replica will generate <TT>searchResultEntry</TT> to the consumer slapd as the search responses to the persistent synchronization search.</P>
+ <P>If an error occurs during replication, the consumer will attempt to reconnect according to the retry parameter which is a list of the <retry interval> and <# of retries> pairs. For example, retry="60 10 300 3" lets the consumer retry every 60 seconds for the first 10 times and then retry every 300 seconds for the next three times before stop retrying. + in <# of retries> means indefinite number of retries until success.</P>
+Index: doc/guide/admin/slapdconf2.sdf
+===================================================================
+--- doc/guide/admin/slapdconf2.sdf.orig
++++ doc/guide/admin/slapdconf2.sdf
+@@ -609,10 +609,11 @@
+
+ > olcSyncrepl: rid=<replica ID>
+ > provider=ldap[s]://<hostname>[:port]
++> [starttls=yes|critical]
+ > [type=refreshOnly|refreshAndPersist]
+ > [interval=dd:hh:mm:ss]
+ > [retry=[<retry interval> <# of retries>]+]
+-> [searchbase=<base DN>]
++> searchbase=<base DN>
+ > [filter=<filter str>]
+ > [scope=sub|one|base]
+ > [attrs=<attr list>]
+@@ -658,6 +659,12 @@
+ {{EX:replica}} directives define two independent replication
+ mechanisms. They do not represent the replication peers of each other.
+
++The {{EX:starttls}} parameter specifies use of the StartTLS extended
++operation to establish a TLS session before Binding to the provider. If the
++StartTLS request fails and the {{EX:critical}} argument was used, the
++session will be aborted. Otherwise the syncrepl session continues without
++TLS.
++
+ The content of the syncrepl replica is defined using a search
+ specification as its result set. The consumer slapd will
+ send search requests to the provider slapd according to the search
+Index: doc/man/man3/ldap_parse_result.3
+===================================================================
+--- doc/man/man3/ldap_parse_result.3.orig
++++ doc/man/man3/ldap_parse_result.3
+@@ -58,7 +58,7 @@
+ .LP
+ The \fIreferralsp\fP parameter will be filled in with an allocated array of
+ referral strings from the parsed message. This array should be freed using
+-.BR ldap_value_free (3).
++.BR ldap_memvfree (3).
+ If no referrals were returned, \fI*referralsp\fP is set to NULL.
+ .LP
+ The \fIserverctrlsp\fP parameter will be filled in with an allocated array of
+Index: doc/man/man5/slapd.conf.5
+===================================================================
+--- doc/man/man5/slapd.conf.5.orig
++++ doc/man/man5/slapd.conf.5
+@@ -1504,7 +1504,7 @@
+ .B [type=refreshOnly|refreshAndPersist]
+ .B [interval=dd:hh:mm:ss]
+ .B [retry=[<retry interval> <# of retries>]+]
+-.B [searchbase=<base DN>]
++.B searchbase=<base DN>
+ .B [filter=<filter str>]
+ .B [scope=sub|one|base]
+ .B [attrs=<attr list>]
+@@ -1596,9 +1596,10 @@
+ .B starttls
+ parameter specifies use of the StartTLS extended operation
+ to establish a TLS session before Binding to the provider. If the
++StartTLS request fails and the
+ .B critical
+-argument is supplied, the session will be aborted if the StartTLS request
+-fails. Otherwise the syncrepl session continues without TLS.
++argument was used, the session will be aborted. Otherwise the syncrepl
++session continues without TLS.
+ A
+ .B bindmethod
+ of
Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series 2006-12-22 20:44:57 UTC (rev 766)
+++ openldap/trunk-2.3/debian/patches/series 2006-12-23 09:21:00 UTC (rev 767)
@@ -14,3 +14,4 @@
index-files-created-as-root -p0
sasl-default-path -p0
man-slurpd -p0
+adminguide-docfixes -p0
More information about the Pkg-openldap-devel
mailing list