mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

More unifdef SLAPD_MULTIMASTER cleanup

Browse Source
This commit is contained in:
Howard Chu 2006-02-07 01:05:57 +00:00
parent 1b95d308b9
commit a4d161cff6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/overlays/dds.c
View File

@ -1036,9 +1036,8 @@ dds_op_extended( Operation *op, SlapReply *rs )
ttl = di->di_min_ttl;
}
#ifndef SLAPD_MULTIMASTER
/* This does not apply to multi-master case */
if ( !( !SLAP_SHADOW( op->o_bd ) || be_isupdate( op ) ) ) {
if ( !( !SLAP_SINGLE_SHADOW( op->o_bd ) || be_isupdate( op ) ) ) {
/* we SHOULD return a referral in this case */
BerVarray defref = op->o_bd->be_update_refs
? op->o_bd->be_update_refs : default_referral;
@ -1060,7 +1059,6 @@ dds_op_extended( Operation *op, SlapReply *rs )
return rs->sr_err;
}
#endif /* !SLAPD_MULTIMASTER */
assert( !BER_BVISNULL( &op->o_req_ndn ) );
@ -1706,14 +1704,12 @@ dds_db_open(
goto done;
}
#ifndef SLAPD_MULTIMASTER
if ( SLAP_SHADOW( be ) ) {
if ( SLAP_SINGLE_SHADOW( be ) ) {
Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"DDS incompatible with shadow database \"%s\".\n",
be->be_suffix[ 0 ].bv_val );
return 1;
}
#endif /* ! SLAPD_MULTIMASTER */
if ( di->di_max_ttl == 0 ) {
di->di_max_ttl = DDS_RF2589_DEFAULT_TTL;