From 9a2577629020d78063823fec61a6f0f7ef2b13d0 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 5 Mar 2009 20:12:18 +0000
Subject: [PATCH] ITS#5942,ITS#5987
---
CHANGES | 2 ++
doc/guide/admin/replication.sdf | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/CHANGES b/CHANGES
index 5dea086db6..c4d436a342 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,8 @@ OpenLDAP 2.4.16 Engineering
Fixed slapd-ldap/meta with broken AD results (ITS#5977)
Fixed slapd-ldap/meta with invalid attrs again (ITS#5959)
Fixed slapo-accesslog interaction with ppolicy (ITS#5979)
+ Documentation
+ admin24 clarified MMR URI requirements (ITS#5942,ITS#5987)
OpenLDAP 2.4.15 Release (2009/02/24)
Fixed libldap alias dereferencing in C API again (ITS#5916)
diff --git a/doc/guide/admin/replication.sdf b/doc/guide/admin/replication.sdf
index df38c61aa7..acc8b7ddfb 100644
--- a/doc/guide/admin/replication.sdf
+++ b/doc/guide/admin/replication.sdf
@@ -839,7 +839,14 @@ We still have to replicate the actual data, not just the config, so add to the m
> objectClass: olcSyncProvConfig
> olcOverlay: syncprov
-Note: You must have all your servers set to the same time via {{http://www.ntp.org/}}
+Note: All of your servers' clocks must be tightly synchronized using
+e.g. NTP {{http://www.ntp.org/}}, atomic clock, or some other reliable
+time reference.
+
+Note: As stated in {{slapd-config}}(5), URLs specified in {{olcSyncRepl}}
+directives are the URLs of the servers from which to replicate. These
+must exactly match the URLs {{slapd}} listens on ({{-h}} in {{SECT:Command-Line Options}}).
+Otherwise slapd may attempt to replicate from itself, causing a loop.
H3: MirrorMode
--
GitLab