upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove incorrect use of <matched> entry

Browse source
This commit is contained in:
Hallvard Furuseth 1999-09-03 20:25:58 +00:00
parent e8ab6eabec
commit dc6754c781
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/back-ldbm/delete.c
View file

@ -24,7 +24,7 @@ ldbm_back_delete(
) )
{ {
struct ldbminfo *li = (struct ldbminfo *) be->be_private; struct ldbminfo *li = (struct ldbminfo *) be->be_private;
Entry *matched = NULL; Entry *matched;
char *pdn = NULL; char *pdn = NULL;
Entry *e, *p = NULL; Entry *e, *p = NULL;
int rootlock = 0; int rootlock = 0;
@ -104,7 +104,7 @@ ldbm_back_delete(
/* delete from parent's id2children entry */ /* delete from parent's id2children entry */
if( (pdn = dn_parent( be, e->e_ndn )) != NULL ) { if( (pdn = dn_parent( be, e->e_ndn )) != NULL ) {
if( (p = dn2entry_w( be, pdn, &matched )) == NULL) { if( (p = dn2entry_w( be, pdn, NULL )) == NULL) {
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: parent does not exist\n", "<=- ldbm_back_delete: parent does not exist\n",
0, 0, 0); 0, 0, 0);
@ -180,7 +180,5 @@ return_results:;
/* free entry and writer lock */ /* free entry and writer lock */
cache_return_entry_w( &li->li_cache, e ); cache_return_entry_w( &li->li_cache, e );
if ( matched != NULL ) free(matched);
return rc; return rc;
} }

8
servers/slapd/back-ldbm/modrdn.c
View file

@ -46,7 +46,7 @@ ldbm_back_modrdn(
char *p_dn = NULL, *p_ndn = NULL; char *p_dn = NULL, *p_ndn = NULL;
char *new_dn = NULL, *new_ndn = NULL; char *new_dn = NULL, *new_ndn = NULL;
Entry *e, *p = NULL; Entry *e, *p = NULL;
Entry *matched = NULL; Entry *matched;
int rootlock = 0; int rootlock = 0;
int rc = -1; int rc = -1;
/* Added to support LDAP v2 correctly (deleteoldrdn thing) */ /* Added to support LDAP v2 correctly (deleteoldrdn thing) */
@ -133,7 +133,7 @@ ldbm_back_modrdn(
* children. * children.
*/ */
if( (p = dn2entry_w( be, p_ndn, &matched )) == NULL) { if( (p = dn2entry_w( be, p_ndn, NULL )) == NULL) {
Debug( LDAP_DEBUG_TRACE, "parent does not exist\n", Debug( LDAP_DEBUG_TRACE, "parent does not exist\n",
0, 0, 0); 0, 0, 0);
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
@ -195,7 +195,7 @@ ldbm_back_modrdn(
/* newSuperior == entry being moved?, if so ==> ERROR */ /* newSuperior == entry being moved?, if so ==> ERROR */
/* Get Entry with dn=newSuperior. Does newSuperior exist? */ /* Get Entry with dn=newSuperior. Does newSuperior exist? */
if( (np = dn2entry_w( be, np_ndn, &matched )) == NULL) { if( (np = dn2entry_w( be, np_ndn, NULL )) == NULL) {
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"ldbm_back_modrdn: newSup(ndn=%s) not here!\n", "ldbm_back_modrdn: newSup(ndn=%s) not here!\n",
np_ndn, 0, 0); np_ndn, 0, 0);
@ -482,8 +482,6 @@ return_results:
if( p_dn != NULL ) free( p_dn ); if( p_dn != NULL ) free( p_dn );
if( p_ndn != NULL ) free( p_ndn ); if( p_ndn != NULL ) free( p_ndn );
if( matched != NULL ) free( matched );
/* LDAP v2 supporting correct attribute handling. */ /* LDAP v2 supporting correct attribute handling. */
if( new_rdn_type != NULL ) free(new_rdn_type); if( new_rdn_type != NULL ) free(new_rdn_type);
if( new_rdn_val != NULL ) free(new_rdn_val); if( new_rdn_val != NULL ) free(new_rdn_val);