mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#6545 Update accesslog format and syncrepl consumer

Browse Source 
Make two successive modifications of the same attribute separate. This
lets the consumer interpret the log entry the same way as the server
that produced it.

Still depends on the log entry attributes being read in the same order
as they were written.
This commit is contained in:
Ondřej Kuzník 2017-04-04 18:24:57 +01:00 committed by Quanah Gibson-Mount
parent eb8f1a7247
commit ec5af7b5e7
4 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
servers/slapd/overlays/accesslog.c
View File

@ -1586,7 +1586,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
case LOG_EN_MODRDN:
case LOG_EN_MODIFY:
/* count all the mods */
/* count all the mods + attributes (ITS#6545) */
i = 0;
for ( m = op->orm_modlist; m; m = m->sml_next ) {
if ( m->sml_values ) {
@ -1596,6 +1596,9 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
{
i++;
}
if ( m->sml_next && m->sml_desc == m->sml_next->sml_desc ) {
i++;
}
}
vals = ch_malloc( (i+1) * sizeof( struct berval ));
i = 0;
@ -1666,6 +1669,12 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
*ptr = '\0';
i++;
}
/* ITS#6545: when the same attribute is edited multiple times,
* record the transition */
if ( m->sml_next && m->sml_desc == m->sml_next->sml_desc ) {
ber_str2bv( ":", STRLENOF(":"), 1, &vals[i] );
i++;
}
}
if ( i > 0 ) {

5
servers/slapd/syncrepl.c
View File

@ -1795,6 +1795,11 @@ syncrepl_accesslog_mods(
if ( !colon ) {
/* Invalid */
continue;
} else if ( colon == bv.bv_val ) {
/* ITS#6545: An empty attribute signals that a new mod
* is about to start */
mod = NULL;
continue;
}
bv.bv_len = colon - bv.bv_val;

3
tests/scripts/test043-delta-syncrepl
View File

@ -308,6 +308,9 @@ cn: Rosco P. Coltrane
dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com
changetype: modify
replace: drink
drink: Red Wine
-
replace: drink
dn: cn=All Staff,ou=Groups,dc=example,dc=com
changetype: modrdn

17
tests/scripts/test063-delta-multimaster
View File

@ -473,6 +473,23 @@ if test $RC != 0 ; then
exit $RC
fi
$LDAPMODIFY -D "$MANAGERDN" -H $URI1 -w $PASSWD \
>> $TESTOUT 2>&1 << EOF
dn: $THEDN
changetype: modify
replace: sn
sn: Replaced later
-
replace: sn
sn: Surname
EOF
RC=$?
if test $RC != 0 ; then
echo "ldapmodify failed for server 1 database ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
echo "Restoring replication between server 1 and 2..."
n=1
while [ $n -le $MMR ]; do