SLAPI - Netscape plugin API for slapd - based on patch contributed by Steve Omrani...

[openldap] / servers / slapd / extended.c

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 0da22bdfbbfdc46db73a3fb9282832524ba66a81..84d8698d5a1d1e0c015e964280c9007967b4a028 100644 (file)
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -26,14 +26,18 @@
  */
 
 #include "portable.h"
+#include "slapi_common.h"
 
 #include <stdio.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 
 #include "slap.h"
+#include "slapi.h"
 #include "lber_pvt.h"
 
+#define UNSUPPORTED_EXTENDEDOP "unsupported extended operation"
+
 static struct extop_list {
        struct extop_list *next;
        struct berval oid;
@@ -102,6 +106,12 @@ do_extended(
        struct berval *rspdata;
        LDAPControl **rspctrls;
 
+       Slapi_PBlock    *pb = op->o_pb;
+       SLAPI_FUNC      funcAddr = NULL;
+       int             extop_rc;
+       int             msg_sent=FALSE;
+       char            *result_msg="";
+
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ENTRY, "do_extended: conn %d\n", conn->c_connid, 0, 0 );
 #else
@@ -136,7 +146,10 @@ do_extended(
                goto done;
        }
 
-       if( !(ext = find_extop(supp_ext_list, &reqoid)) ) {
+       /* Netscape extended operation */
+       getPluginFunc( &reqoid, &funcAddr );
+
+       if( !(ext = find_extop(supp_ext_list, &reqoid)) && !(funcAddr) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR, 
                        "do_extended: conn %d  unsupported operation \"%s\"\n",
@@ -150,6 +163,8 @@ do_extended(
                goto done;
        }
 
+       op->o_extendedop = reqoid.bv_val;
+
        tag = ber_peek_tag( op->o_ber, &len );
        
        if( ber_peek_tag( op->o_ber, &len ) == LDAP_TAG_EXOP_REQ_VALUE ) {
@@ -200,29 +215,72 @@ do_extended(
        text = NULL;
        refs = NULL;
 
-       rc = (ext->ext_main)( conn, op,
-               reqoid.bv_val, reqdata.bv_val ? &reqdata : NULL,
-               &rspoid, &rspdata, &rspctrls, &text, &refs );
+       if (ext != NULL) { /* OpenLDAP extended operation */
+               rc = (ext->ext_main)( conn, op,
+                         reqoid.bv_val, reqdata.bv_val ? &reqdata : NULL,
+                         &rspoid, &rspdata, &rspctrls, &text, &refs );
 
-       if( rc != SLAPD_ABANDON ) {
-               if ( rc == LDAP_REFERRAL && refs == NULL ) {
-                       refs = referral_rewrite( default_referral,
-                               NULL, NULL, LDAP_SCOPE_DEFAULT );
+               if( rc != SLAPD_ABANDON ) {
+                       if ( rc == LDAP_REFERRAL && refs == NULL ) {
+                               refs = referral_rewrite( default_referral,
+                                       NULL, NULL, LDAP_SCOPE_DEFAULT );
+                       }
+
+                       send_ldap_extended( conn, op, rc, NULL, text, refs,
+                               rspoid, rspdata, rspctrls );
+
+                       ber_bvarray_free( refs );
                }
 
-               send_ldap_extended( conn, op, rc, NULL, text, refs,
-                       rspoid, rspdata, rspctrls );
+               if ( rspoid != NULL ) {
+                       free( rspoid );
+               }
 
-               ber_bvarray_free( refs );
+               if ( rspdata != NULL ) {
+                       ber_bvfree( rspdata );
+               }
+#if !defined( LDAP_SLAPI )
        }
+#else /* defined( LDAP_SLAPI ) */
+               goto done;  /* end of OpenLDAP extended operation */
+
+       } else { /* start of Netscape extended operation */
+               if ( ( rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_OID,(void *)reqoid.bv_val) ) == 0 &&
+                               ( rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_VALUE,(void *)&reqdata) ) == 0 &&
+                               ( rc = slapi_pblock_set( pb, SLAPI_CONNECTION,(void *)conn) ) == 0  &&
+                               ( rc = slapi_pblock_set( pb, SLAPI_OPERATION, (void *)op) ) == 0) {
+                       extop_rc = (*funcAddr)( pb );
+                       if ( extop_rc == SLAPI_PLUGIN_EXTENDED_SENT_RESULT ) {
+                               msg_sent = TRUE;
+                       } else if ( extop_rc == SLAPI_PLUGIN_EXTENDED_NOT_HANDLED ) {
+                               rc = LDAP_PROTOCOL_ERROR;
+                               result_msg = UNSUPPORTED_EXTENDEDOP;
+                       } else {
+                               if ( ( rc = slapi_pblock_get(pb, SLAPI_EXT_OP_RET_OID,&rspoid) ) == 0 &&
+                                                 ( rc = slapi_pblock_get(pb, SLAPI_EXT_OP_RET_VALUE,&rspdata) ) == 0 ) {
+                                       send_ldap_extended( conn, op, extop_rc, NULL, text, refs,
+                                                        rspoid, rspdata, rspctrls );
+                                       msg_sent = TRUE;
+                               } else {
+                                       rc = LDAP_OPERATIONS_ERROR;
+                               }
+                       }
+               } else {
+                       rc = LDAP_OPERATIONS_ERROR;
+               }
 
-       if ( rspoid != NULL ) {
-               free( rspoid );
-       }
+               if ( rc != LDAP_SUCCESS && msg_sent == FALSE ) {
+                       send_ldap_result( conn, op, rc, NULL, result_msg, NULL, NULL );
+               }
+               if ( rspoid != NULL ) {
+                       free( rspoid );
+               }
+               if ( rspdata != NULL ) {
+                       ber_bvfree( rspdata );
+               }
 
-       if ( rspdata != NULL ) {
-               ber_bvfree( rspdata );
-       }
+       } /* end of Netscape extended operation */
+#endif /* defined( LDAP_SLAPI ) */
 
 done:
        return rc;