ITS#5942,ITS#5987

diff --git a/CHANGES b/CHANGES
index 5dea086db60151f0f98b1e4806c3c23bbd8d14ea..c4d436a342cd73790d398478196e966a7110fc8f 100644 (file)
--- 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 df38c61aa78868e938409feeefdcc3c367448e53..acc8b7ddfbb2b6c59be97be1386fb941c2d9c273 100644 (file)
--- 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