upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-02 20:10:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ITS#10398 slapo-memberof/refint: fix clash on subtree renames"

Browse source 
This reverts commit 1b1b687bd4.
Pushed by mistake
This commit is contained in:
Howard Chu 2025-10-16 20:18:36 +01:00
parent 44815be4da
commit 78ecd45ff7
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/overlays/memberof.c
View file

@ -903,9 +903,6 @@ memberof_op_modify( Operation *op, SlapReply *rs )
memberof_cbinfo_t *mci, mcis;
OpExtra *oex;
if ( get_manageDSAit( op ))
return SLAP_CB_CONTINUE;
LDAP_SLIST_FOREACH( oex, &op->o_extra, oe_next ) {
if ( oex->oe_key == (void *)&memberof )
return SLAP_CB_CONTINUE;
@ -2157,7 +2154,8 @@ mo_cf_gen( ConfigArgs *c )
if ( SLAP_ISGLOBALOVERLAY( c->be ) ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"addcheck functionality not supported "
"when memberof is a global overlay" );
"when memberof is a global overlay",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg );
return 1;

1
servers/slapd/overlays/refint.c
View file

@ -660,7 +660,6 @@ refint_repair(
op2.orm_no_opattrs = 1;
op2.o_dont_replicate = 1;
op2.o_opid = 0;
op2.o_managedsait = SLAP_CONTROL_CRITICAL;
/* Set our ModifiersName */
if ( SLAP_LASTMOD( op->o_bd ) ) {