From 33f5e7122c6fdd6c4d5e38ba56a7a115b51e3496 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 24 Apr 2017 13:15:56 -0700 Subject: [PATCH] ITS#8635 - Note that non-zero serverID's are required for MMR, and that serverID 0 is specific to single master replication only --- doc/man/man5/slapd-config.5 | 7 ++++--- doc/man/man5/slapd.conf.5 | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5 index 068111ff71..7f078ac3fe 100644 --- a/doc/man/man5/slapd-config.5 +++ b/doc/man/man5/slapd-config.5 @@ -757,15 +757,16 @@ size allowed. 0 disables security layers. The default is 65536. Specify an integer ID from 0 to 4095 for this server (limited to 3 hexadecimal digits). The ID may also be specified as a hexadecimal ID by prefixing the value with "0x". -These IDs are +Non-zero IDs are required when using multimaster replication and each master must have a -unique ID. Note that this requirement also applies to separate masters +unique non-zero ID. Note that this requirement also applies to separate masters contributing to a glued set of databases. If the URL is provided, this directive may be specified multiple times, providing a complete list of participating servers and their IDs. The fully qualified hostname of each server should be used in the supplied URLs. The IDs are used in the "replica id" field -of all CSNs generated by the specified server. The default value is zero. +of all CSNs generated by the specified server. The default value is zero, which +is only valid for single master replication. Example: .LP .nf diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index 6207a1b269..74929ffcbd 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -947,15 +947,16 @@ e.g. ldapi:// (and eventually IPSEC). It is not normally used. Specify an integer ID from 0 to 4095 for this server (limited to 3 hexadecimal digits). The ID may also be specified as a hexadecimal ID by prefixing the value with "0x". -These IDs are +Non-zero IDs are required when using multimaster replication and each master must have a -unique ID. Note that this requirement also applies to separate masters +unique non-zero ID. Note that this requirement also applies to separate masters contributing to a glued set of databases. If the URL is provided, this directive may be specified multiple times, providing a complete list of participating servers and their IDs. The fully qualified hostname of each server should be used in the supplied URLs. The IDs are used in the "replica id" field -of all CSNs generated by the specified server. The default value is zero. +of all CSNs generated by the specified server. The default value is zero, which +is only valid for single master replication. Example: .LP .nf -- 2.39.5