More ldapbis cleanup

[openldap] / servers / slapd / extended.c

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 82a1cecf9bf1eecf277c94f96b13436e32083fdc..4d197d07fbdcb2fc0783a1726f0bc925c595ae52 100644 (file)
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -39,9 +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;
@@ -56,17 +53,16 @@ static SLAP_EXTOP_MAIN_FN whoami_extop;
  * just a way to get built-in extops onto the extop list without
  * having a separate init routine for each built-in extop.
  */
-const struct berval slap_EXOP_CANCEL = BER_BVC(LDAP_EXOP_CANCEL);
-const struct berval slap_EXOP_WHOAMI = BER_BVC(LDAP_EXOP_WHO_AM_I);
-const struct berval slap_EXOP_MODIFY_PASSWD = BER_BVC(LDAP_EXOP_MODIFY_PASSWD);
-const struct berval slap_EXOP_START_TLS = BER_BVC(LDAP_EXOP_START_TLS);
-
 static struct {
        const struct berval *oid;
        slap_mask_t flags;
        SLAP_EXTOP_MAIN_FN *ext_main;
 } builtin_extops[] = {
-       { &slap_EXOP_CANCEL, SLAP_EXOP_HIDE, cancel_extop },
+#ifdef LDAP_X_TXN
+       { &slap_EXOP_TXN_START, 0, txn_start_extop },
+       { &slap_EXOP_TXN_END, 0, txn_end_extop },
+#endif
+       { &slap_EXOP_CANCEL, 0, cancel_extop },
        { &slap_EXOP_WHOAMI, 0, whoami_extop },
        { &slap_EXOP_MODIFY_PASSWD, SLAP_EXOP_WRITES, passwd_extop },
        { NULL, 0, NULL }
@@ -179,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;
 }
@@ -263,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;
@@ -349,6 +361,8 @@ find_extop( struct extop_list *list, struct berval *oid )
 }
 
 
+const struct berval slap_EXOP_WHOAMI = BER_BVC(LDAP_EXOP_WHO_AM_I);
+
 static int
 whoami_extop (
        Operation *op,
@@ -367,7 +381,8 @@ whoami_extop (
 
        op->o_bd = op->o_conn->c_authz_backend;
        if( backend_check_restrictions( op, rs,
-               (struct berval *)&slap_EXOP_WHOAMI ) != LDAP_SUCCESS ) {
+               (struct berval *)&slap_EXOP_WHOAMI ) != LDAP_SUCCESS )
+       {
                return rs->sr_err;
        }