Converted all use of dn_parent to the in-place version. (Fixed a pdn leak

[openldap] / servers / slapd / back-bdb / dn2id.c

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index 22695f460595d8cdbfea1b97cf9f40089bcd5ef0..8606ea388965cf8fa30738140f8111e9faee7987 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -60,7 +60,7 @@ bdb_dn2id_add(
                goto done;
        }
 
-       pdn = dn_parent1( be, ptr );
+       pdn = dn_parent( be, ptr );
 
        if( pdn != NULL ) {
                key.size -= pdn - ptr;
@@ -86,7 +86,7 @@ bdb_dn2id_add(
                        goto done;
                }
                ptr = pdn;
-               pdn = dn_parent1( be, pdn );
+               pdn = dn_parent( be, pdn );
        }
 
        while( pdn != NULL ) {
@@ -106,7 +106,7 @@ bdb_dn2id_add(
                        break;
                }
                ptr = pdn;
-               pdn = dn_parent1( be, pdn );
+               pdn = dn_parent( be, pdn );
        }
 
 done:
@@ -157,7 +157,7 @@ bdb_dn2id_delete(
                goto done;
        }
 
-       pdn = dn_parent1( be, ptr );
+       pdn = dn_parent( be, ptr );
 
        if( pdn != NULL ) {
                key.size -= pdn - ptr;
@@ -184,7 +184,7 @@ bdb_dn2id_delete(
                        goto done;
                }
                ptr = pdn;
-               pdn = dn_parent1( be, pdn );
+               pdn = dn_parent( be, pdn );
        }
 
        while( pdn != NULL ) {
@@ -203,7 +203,7 @@ bdb_dn2id_delete(
                        goto done;
                }
                ptr = pdn;
-               pdn = dn_parent1( be, pdn );
+               pdn = dn_parent( be, pdn );
        }
 
 done:
@@ -291,7 +291,7 @@ bdb_dn2id_matched(
                rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
 
                if( rc == DB_NOTFOUND ) {
-                       char *pdn = dn_parent1( be, dn );
+                       char *pdn = dn_parent( be, dn );
 
                        if( pdn == NULL || *pdn == '\0' ) {
                                Debug( LDAP_DEBUG_TRACE,