Suck in latest changes from -devel. Besides the usually lint removal,

[openldap] / servers / slapd / back-ldbm / add.c

diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index 75dd12b1b2506bae216d78f2358a0635931b7f70..77c92d220a3a516889e9d36462596d6fbf340f95 100644 (file)
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -82,7 +82,6 @@ ldbm_back_add(
        if ( (pdn = dn_parent( be, dn )) != NULL ) {
                char *matched;
                /* no parent */
-               matched = NULL;
 
                /* get entry with reader lock */
                if ( (p = dn2entry_r( be, pdn, &matched )) == NULL ) {
@@ -90,6 +89,7 @@ ldbm_back_add(
                            0, 0 );
                        send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT,
                            matched, "" );
+
                        if ( matched != NULL ) {
                                free( matched );
                        }
@@ -97,9 +97,6 @@ ldbm_back_add(
                        rc = -1;
                        goto return_results;
                }
-               if ( matched != NULL ) {
-                       free( matched );
-               }
 
                if ( ! access_allowed( be, conn, op, p, "children", NULL,
                    op->o_dn, ACL_WRITE ) ) {