don't leak callbacks if stuff cannot be registered; provide a means to dispose of...

[openldap] / servers / slapd / extended.c

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 27e7ffd1ab1fad12936d797a2ebb1866c0a5c742..4d197d07fbdcb2fc0783a1726f0bc925c595ae52 100644 (file)
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -39,8 +39,6 @@
 #include "slap.h"
 #include "lber_pvt.h"
 
-#define UNSUPPORTED_EXOP "unsupported extended operation"
-
 static struct extop_list {
        struct extop_list *next;
        struct berval oid;
@@ -177,6 +175,18 @@ do_extended(
        op->o_bd = frontendDB;
        rs->sr_err = frontendDB->be_extended( op, rs );
 
+       /* clean up in case some overlay set them? */
+       if ( !BER_BVISNULL( &op->o_req_ndn ) ) {
+               if ( !BER_BVISNULL( &op->o_req_dn )
+                       && op->o_req_ndn.bv_val != op->o_req_dn.bv_val )
+               {
+                       op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
+               }
+               op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+               BER_BVZERO( &op->o_req_dn );
+               BER_BVZERO( &op->o_req_ndn );
+       }
+
 done:
        return rs->sr_err;
 }
@@ -261,11 +271,15 @@ load_extop2(
                return -1; 
        }
 
-       if ( ext_oid == NULL || BER_BVISNULL( ext_oid ) || BER_BVISEMPTY( ext_oid ) ) {
+       if ( ext_oid == NULL || BER_BVISNULL( ext_oid ) ||
+               BER_BVISEMPTY( ext_oid ) )
+       {
                return -1; 
        }
 
-       if ( numericoidValidate( NULL, (struct berval *)ext_oid ) != LDAP_SUCCESS ) {
+       if ( numericoidValidate( NULL, (struct berval *)ext_oid ) !=
+               LDAP_SUCCESS )
+       {
                oidm.bv_val = oidm_find( ext_oid->bv_val );
                if ( ext_oid == NULL ) {
                        return -1;