Check for SLAP_SYNTAX_DN flag instead of distinguishedName syntax

[openldap] / servers / slapd / extended.c

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 60c50b07290d0d5d2816909ab5e35fca593ebc1d..8030803eb902522b2809cbd170e1ebfdf8c3af93 100644 (file)
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2010 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,19 +123,20 @@ do_extended(
        ber_tag_t tag;
        ber_len_t len;
 
-       Debug( LDAP_DEBUG_TRACE, "do_extended\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "%s do_extended\n",
+               op->o_log_prefix, 0, 0 );
 
        if( op->o_protocol < LDAP_VERSION3 ) {
-               Debug( LDAP_DEBUG_ANY,
-                       "do_extended: protocol version (%d) too low\n",
-                       op->o_protocol, 0 ,0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_extended: protocol version (%d) too low\n",
+                       op->o_log_prefix, op->o_protocol, 0 );
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "requires LDAPv3" );
                rs->sr_err = SLAPD_DISCONNECT;
                goto done;
        }
 
        if ( ber_scanf( op->o_ber, "{m" /*}*/, &op->ore_reqoid ) == LBER_ERROR ) {
-               Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_extended: ber_scanf failed\n",
+                       op->o_log_prefix, 0, 0 );
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
                rs->sr_err = SLAPD_DISCONNECT;
                goto done;
@@ -145,7 +146,8 @@ do_extended(
        
        if( ber_peek_tag( op->o_ber, &len ) == LDAP_TAG_EXOP_REQ_VALUE ) {
                if( ber_scanf( op->o_ber, "m", &reqdata ) == LBER_ERROR ) {
-                       Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 );
+                       Debug( LDAP_DEBUG_ANY, "%s do_extended: ber_scanf failed\n",
+                               op->o_log_prefix, 0, 0 );
                        send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
                        rs->sr_err = SLAPD_DISCONNECT;
                        goto done;
@@ -153,14 +155,16 @@ do_extended(
        }
 
        if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_ANY, "do_extended: get_ctrls failed\n", 0, 0 ,0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_extended: get_ctrls failed\n",
+                       op->o_log_prefix, 0, 0 );
                return rs->sr_err;
        } 
 
+       Statslog( LDAP_DEBUG_STATS, "%s EXT oid=%s\n",
+           op->o_log_prefix, op->ore_reqoid.bv_val, 0, 0, 0 );
+
        /* check for controls inappropriate for all extended operations */
        if( get_manageDSAit( op ) == SLAP_CONTROL_CRITICAL ) {
-               Statslog( LDAP_DEBUG_STATS, "%s EXT oid=%s\n",
-                   op->o_log_prefix, op->ore_reqoid.bv_val, 0, 0, 0 );
                send_ldap_error( op, rs,
                        LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
                        "manageDSAit control inappropriate" );
@@ -175,6 +179,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;
 }
@@ -191,10 +207,8 @@ fe_extended( Operation *op, SlapReply *rs )
 
        ext = find_extop(supp_ext_list, &op->ore_reqoid );
        if ( ext == NULL ) {
-               Statslog( LDAP_DEBUG_STATS, "%s EXT oid=%s\n",
-                   op->o_log_prefix, op->ore_reqoid.bv_val, 0, 0, 0 );
-               Debug( LDAP_DEBUG_ANY, "do_extended: unsupported operation \"%s\"\n",
-                       op->ore_reqoid.bv_val, 0 ,0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_extended: unsupported operation \"%s\"\n",
+                       op->o_log_prefix, op->ore_reqoid.bv_val, 0 );
                send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
                        "unsupported extended operation" );
                goto done;
@@ -269,7 +283,7 @@ load_extop2(
                LDAP_SUCCESS )
        {
                oidm.bv_val = oidm_find( ext_oid->bv_val );
-               if ( ext_oid == NULL ) {
+               if ( oidm.bv_val == NULL ) {
                        return -1;
                }
                oidm.bv_len = strlen( oidm.bv_val );
@@ -310,6 +324,57 @@ load_extop2(
        return(0);
 }
 
+int
+unload_extop(
+       const struct berval *ext_oid,
+       SLAP_EXTOP_MAIN_FN *ext_main,
+       unsigned flags )
+{
+       struct berval           oidm = BER_BVNULL;
+       struct extop_list       *ext, **extp;
+
+       /* oid must be given */
+       if ( ext_oid == NULL || BER_BVISNULL( ext_oid ) ||
+               BER_BVISEMPTY( ext_oid ) )
+       {
+               return -1; 
+       }
+
+       /* if it's not an oid, check if it's a macto */
+       if ( numericoidValidate( NULL, (struct berval *)ext_oid ) !=
+               LDAP_SUCCESS )
+       {
+               oidm.bv_val = oidm_find( ext_oid->bv_val );
+               if ( oidm.bv_val == NULL ) {
+                       return -1;
+               }
+               oidm.bv_len = strlen( oidm.bv_val );
+               ext_oid = &oidm;
+       }
+
+       /* lookup the oid */
+       for ( extp = &supp_ext_list; *extp; extp = &(*extp)->next ) {
+               if ( bvmatch( ext_oid, &(*extp)->oid ) ) {
+                       /* if ext_main is given, only remove if it matches */
+                       if ( ext_main != NULL && (*extp)->ext_main != ext_main ) {
+                               return -1;
+                       }
+                       break;
+               }
+       }
+
+       if ( *extp == NULL ) {
+               return -1;
+       }
+
+       ext = *extp;
+       *extp = (*extp)->next;
+
+       ch_free( ext );
+
+       return 0;
+}
+
 int
 extops_init (void)
 {
@@ -320,6 +385,7 @@ extops_init (void)
                        builtin_extops[i].flags,
                        builtin_extops[i].ext_main );
        }
+
        return(0);
 }