Commit 628deef9 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5411

parent ac3eea1f
...@@ -22,6 +22,8 @@ OpenLDAP 2.4.9 Engineering ...@@ -22,6 +22,8 @@ OpenLDAP 2.4.9 Engineering
Fixed slapo-syncprov/glue search ops (ITS#5434) Fixed slapo-syncprov/glue search ops (ITS#5434)
Fixed slapo-syncprov null cookie (ITS#5437,#5444) Fixed slapo-syncprov null cookie (ITS#5437,#5444)
Fixed slapo-syncprov double-free (ITS#5445) Fixed slapo-syncprov double-free (ITS#5445)
Build Environment
Fixed leave function naming for OSF1 (ITS#5411)
Documentation Documentation
Fixed slapd.access(5) authz-regexp documented behavior (ITS#5400) Fixed slapd.access(5) authz-regexp documented behavior (ITS#5400)
Fixed slapd.meta(5) idassert-* documentation (ITS#5406) Fixed slapd.meta(5) idassert-* documentation (ITS#5406)
......
...@@ -302,7 +302,7 @@ bdb_dn2id( ...@@ -302,7 +302,7 @@ bdb_dn2id(
data.flags = DB_DBT_USERMEM; data.flags = DB_DBT_USERMEM;
rc = db->cursor( db, NULL, &cursor, bdb->bi_db_opflags ); rc = db->cursor( db, NULL, &cursor, bdb->bi_db_opflags );
if ( rc ) goto leave; if ( rc ) goto func_leave;
rc = bdb_dn2id_lock( bdb, dn, 0, locker, lock ); rc = bdb_dn2id_lock( bdb, dn, 0, locker, lock );
if ( rc ) goto nolock; if ( rc ) goto nolock;
...@@ -316,7 +316,7 @@ bdb_dn2id( ...@@ -316,7 +316,7 @@ bdb_dn2id(
nolock: nolock:
cursor->c_close( cursor ); cursor->c_close( cursor );
leave: func_leave:
if( rc != 0 ) { if( rc != 0 ) {
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n", Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n",
...@@ -624,7 +624,7 @@ hdb_dn2id_add( ...@@ -624,7 +624,7 @@ hdb_dn2id_add(
} }
} }
leave: func_leave:
op->o_tmpfree( d, op->o_tmpmemctx ); op->o_tmpfree( d, op->o_tmpmemctx );
Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 ); Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 );
...@@ -674,7 +674,7 @@ hdb_dn2id_delete( ...@@ -674,7 +674,7 @@ hdb_dn2id_delete(
data.data = d; data.data = d;
rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags ); rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
if ( rc ) goto leave; if ( rc ) goto func_leave;
/* We hold this lock until the TXN completes */ /* We hold this lock until the TXN completes */
rc = bdb_dn2id_lock( bdb, &e->e_nname, 1, TXN_ID( txn ), &lock ); rc = bdb_dn2id_lock( bdb, &e->e_nname, 1, TXN_ID( txn ), &lock );
...@@ -703,7 +703,7 @@ hdb_dn2id_delete( ...@@ -703,7 +703,7 @@ hdb_dn2id_delete(
nolock: nolock:
cursor->c_close( cursor ); cursor->c_close( cursor );
leave: func_leave:
op->o_tmpfree( d, op->o_tmpmemctx ); op->o_tmpfree( d, op->o_tmpmemctx );
/* Delete IDL cache entries */ /* Delete IDL cache entries */
...@@ -779,7 +779,7 @@ hdb_dn2id( ...@@ -779,7 +779,7 @@ hdb_dn2id(
data.data = d; data.data = d;
rc = bdb_dn2id_lock( bdb, in, 0, locker, lock ); rc = bdb_dn2id_lock( bdb, in, 0, locker, lock );
if ( rc ) goto leave; if ( rc ) goto func_leave;
rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH_RANGE ); rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH_RANGE );
if ( rc == 0 && (dlen[1] != d->nrdnlen[1] || dlen[0] != d->nrdnlen[0] || if ( rc == 0 && (dlen[1] != d->nrdnlen[1] || dlen[0] != d->nrdnlen[0] ||
...@@ -803,7 +803,7 @@ hdb_dn2id( ...@@ -803,7 +803,7 @@ hdb_dn2id(
} }
} }
leave: func_leave:
cursor->c_close( cursor ); cursor->c_close( cursor );
op->o_tmpfree( d, op->o_tmpmemctx ); op->o_tmpfree( d, op->o_tmpmemctx );
if( rc != 0 ) { if( rc != 0 ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment