mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-06-09 08:42:22 -04:00
Fix BDB2 (apparently broken before I started adding referrals)
This commit is contained in:
parent
78ebd3d965
commit
d19d895e17
4 changed files with 31 additions and 2 deletions
|
|
@ -188,11 +188,9 @@ bdb2i_back_modify_internal(
|
|||
|
||||
send_ldap_result( conn, op, LDAP_SUCCESS,
|
||||
NULL, NULL, NULL, NULL );
|
||||
bdb2i_cache_return_entry_w( &li->li_cache, e );
|
||||
return( 0 );
|
||||
|
||||
error_return:;
|
||||
bdb2i_cache_return_entry_w( &li->li_cache, e );
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
|
|
@ -278,6 +276,7 @@ bdb2_back_modify(
|
|||
}
|
||||
|
||||
ret = bdb2i_back_modify_internal( be, conn, op, dn, modlist, e );
|
||||
bdb2i_cache_return_entry_w( &li->li_cache, e );
|
||||
|
||||
done:
|
||||
(void) bdb2i_leave_backend_w( lock );
|
||||
|
|
|
|||
|
|
@ -425,6 +425,7 @@ bdb2i_back_modrdn_internal(
|
|||
return_results:
|
||||
if( new_dn != NULL ) free( new_dn );
|
||||
if( new_ndn != NULL ) free( new_ndn );
|
||||
|
||||
return_results_after:
|
||||
/* NOTE:
|
||||
* new_dn and new_ndn are not deallocated because they are used by
|
||||
|
|
|
|||
28
tests/data/slapd-bdb2-ref-slave.conf
Normal file
28
tests/data/slapd-bdb2-ref-slave.conf
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
#
|
||||
# slave slapd config -- for default referral testing
|
||||
#
|
||||
include ./data/slapd.at.conf
|
||||
include ./data/slapd.oc.conf
|
||||
schemacheck off
|
||||
pidfile ./test-repl/slapd.pid
|
||||
argsfile ./test-repl/slapd.args
|
||||
|
||||
#######################################################################
|
||||
# ldbm database definitions
|
||||
#######################################################################
|
||||
|
||||
referral "ldap://localhost:9009/"
|
||||
|
||||
backend bdb2
|
||||
home ./test-db
|
||||
|
||||
database bdb2
|
||||
cachesize 0
|
||||
suffix "o=University of Mich, c=US"
|
||||
directory ./test-repl
|
||||
rootdn "cn=Manager, o=University of Mich, c=US"
|
||||
rootpw secret
|
||||
index cn,sn,uid pres,eq,approx
|
||||
index default none
|
||||
# index default pres,eq,approx
|
||||
lastmod on
|
||||
|
|
@ -8,6 +8,7 @@ if test "$BACKEND" = "bdb2" ; then
|
|||
ACLCONF=$DATADIR/slapd-bdb2-acl.conf
|
||||
MASTERCONF=$DATADIR/slapd-bdb2-repl-master.conf
|
||||
SLAVECONF=$DATADIR/slapd-bdb2-repl-slave.conf
|
||||
REFSLAVECONF=$DATADIR/slapd-bdb2-ref-slave.conf
|
||||
TIMING="-t"
|
||||
else
|
||||
LDIF2LDBM=../servers/slapd/tools/ldif2ldbm
|
||||
|
|
|
|||
Loading…
Reference in a new issue