From 628deef9106d6ec525ed30001578eb0c2fdf7e33 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 14 Apr 2008 21:37:25 +0000 Subject: [PATCH] ITS#5411 --- CHANGES | 2 ++ servers/slapd/back-bdb/dn2id.c | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index e4e45d48b8..a05f4ca92a 100644 --- a/CHANGES +++ b/CHANGES @@ -22,6 +22,8 @@ OpenLDAP 2.4.9 Engineering Fixed slapo-syncprov/glue search ops (ITS#5434) Fixed slapo-syncprov null cookie (ITS#5437,#5444) Fixed slapo-syncprov double-free (ITS#5445) + Build Environment + Fixed leave function naming for OSF1 (ITS#5411) Documentation Fixed slapd.access(5) authz-regexp documented behavior (ITS#5400) Fixed slapd.meta(5) idassert-* documentation (ITS#5406) diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c index f8dbc0d86d..e23784c1a3 100644 --- a/servers/slapd/back-bdb/dn2id.c +++ b/servers/slapd/back-bdb/dn2id.c @@ -302,7 +302,7 @@ bdb_dn2id( data.flags = DB_DBT_USERMEM; 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 ); if ( rc ) goto nolock; @@ -316,7 +316,7 @@ bdb_dn2id( nolock: cursor->c_close( cursor ); -leave: +func_leave: if( rc != 0 ) { Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n", @@ -624,7 +624,7 @@ hdb_dn2id_add( } } -leave: +func_leave: op->o_tmpfree( d, op->o_tmpmemctx ); Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 ); @@ -674,7 +674,7 @@ hdb_dn2id_delete( data.data = d; 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 */ rc = bdb_dn2id_lock( bdb, &e->e_nname, 1, TXN_ID( txn ), &lock ); @@ -703,7 +703,7 @@ hdb_dn2id_delete( nolock: cursor->c_close( cursor ); -leave: +func_leave: op->o_tmpfree( d, op->o_tmpmemctx ); /* Delete IDL cache entries */ @@ -779,7 +779,7 @@ hdb_dn2id( data.data = d; 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 ); if ( rc == 0 && (dlen[1] != d->nrdnlen[1] || dlen[0] != d->nrdnlen[0] || @@ -803,7 +803,7 @@ hdb_dn2id( } } -leave: +func_leave: cursor->c_close( cursor ); op->o_tmpfree( d, op->o_tmpmemctx ); if( rc != 0 ) { -- 2.39.5