upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-16 03:44:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6297 Allow hex in serverID directive

Browse source
This commit is contained in:
Rein Tollevik 2009-09-17 15:06:22 +00:00
parent 76cc2f14b6
commit 296826b1f0
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/man/man5/slapd-config.5
View file

@ -723,7 +723,10 @@ property specifies the maximum security layer receive buffer
size allowed. 0 disables security layers. The default is 65536.
.TP
.B olcServerID: <integer> [<URL>]
Specify an integer ID from 0 to 4095 for this server. These IDs are
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
required when using multimaster replication and each master must have a
unique ID. Note that this requirement also applies to separate masters
contributing to a glued set of databases.

3
doc/man/man5/slapd.conf.5
View file

@ -915,7 +915,8 @@ e.g. ldapi:// (and eventually IPSEC). It is not normally used.
.TP
.B serverID <integer> [<URL>]
Specify an integer ID from 0 to 4095 for this server (limited
to 3 hexadecimal digits).
to 3 hexadecimal digits). The ID may also be specified as a
hexadecimal ID by prefixing the value with "0x".
These IDs are
required when using multimaster replication and each master must have a
unique ID. Note that this requirement also applies to separate masters

7
servers/slapd/bconfig.c
View file

@ -1783,7 +1783,8 @@ sortval_reject:
ServerID *si, **sip;
LDAPURLDesc *lud;
int num;
if ( lutil_atoi( &num, c->argv[1] ) ||
if (( lutil_atoi( &num, c->argv[1] ) &&
lutil_atoix( &num, c->argv[1], 16 )) ||
num < 0 || num > SLAP_SYNC_SID_MAX )
{
snprintf( c->cr_msg, sizeof( c->cr_msg ),
@ -1828,7 +1829,7 @@ sortval_reject:
BER_BVZERO( &si->si_url );
slap_serverID = num;
Debug( LDAP_DEBUG_CONFIG,
"%s: SID=%d\n",
"%s: SID=0x%03x\n",
c->log, slap_serverID, 0 );
}
si->si_next = NULL;
@ -1841,7 +1842,7 @@ sortval_reject:
if ( l ) {
slap_serverID = si->si_num;
Debug( LDAP_DEBUG_CONFIG,
"%s: SID=%d (listener=%s)\n",
"%s: SID=0x%03x (listener=%s)\n",
c->log, slap_serverID,
l->sl_url.bv_val );
}