/* $OpenLDAP$ */
/*
- * Copyright 1999-2002 The OpenLDAP Foundation.
+ * Copyright 1999-2003 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted only
#include "portable.h"
#include <stdio.h>
+
#include <ac/socket.h>
#include <ac/string.h>
#include "slap.h"
#include "lber_pvt.h"
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
+#define UNSUPPORTED_EXTENDEDOP "unsupported extended operation"
+
static struct extop_list {
struct extop_list *next;
struct berval oid;
static SLAP_EXTOP_MAIN_FN whoami_extop;
-/* BerVal Constant initializer */
-
-#define BVC(x) {sizeof(x)-1, x}
-
/* this list of built-in extops is for extops that are not part
* of backends or in external modules. essentially, this is
* just a way to get built-in extops onto the extop list without
* having a separate init routine for each built-in extop.
*/
+#ifdef LDAP_EXOP_X_CANCEL
+const struct berval slap_EXOP_CANCEL = BER_BVC(LDAP_EXOP_X_CANCEL);
+#endif
+const struct berval slap_EXOP_WHOAMI = BER_BVC(LDAP_EXOP_X_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 {
- struct berval oid;
+ const struct berval *oid;
SLAP_EXTOP_MAIN_FN *ext_main;
} builtin_extops[] = {
+#ifdef LDAP_EXOP_X_CANCEL
+ { &slap_EXOP_CANCEL, cancel_extop },
+#endif
+ { &slap_EXOP_WHOAMI, whoami_extop },
+ { &slap_EXOP_MODIFY_PASSWD, passwd_extop },
#ifdef HAVE_TLS
- { BVC(LDAP_EXOP_START_TLS), starttls_extop },
+ { &slap_EXOP_START_TLS, starttls_extop },
#endif
- { BVC(LDAP_EXOP_MODIFY_PASSWD), passwd_extop },
- { BVC(LDAP_EXOP_X_WHO_AM_I), whoami_extop },
- { {0,NULL}, NULL }
+ { NULL, NULL }
};
struct berval reqdata = {0, NULL};
ber_tag_t tag;
ber_len_t len;
- struct extop_list *ext;
+ struct extop_list *ext = NULL;
const char *text;
BerVarray refs;
char *rspoid;
struct berval *rspdata;
LDAPControl **rspctrls;
+#if defined(LDAP_SLAPI)
+ Slapi_PBlock *pb = op->o_pb;
+ SLAPI_FUNC funcAddr = NULL;
+ int extop_rc;
+ int msg_sent = FALSE;
+ char *result_msg = "";
+#endif /* defined(LDAP_SLAPI) */
+
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
- "do_extended: conn %d\n", conn->c_connid ));
+ LDAP_LOG( OPERATION, ENTRY, "do_extended: conn %d\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "do_extended\n", 0, 0, 0 );
#endif
if( op->o_protocol < LDAP_VERSION3 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_extended: protocol version (%d) too low.\n",
- op->o_protocol ));
+ LDAP_LOG( OPERATION, ERR,
+ "do_extended: protocol version (%d) too low.\n", op->o_protocol, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"do_extended: protocol version (%d) too low\n",
if ( ber_scanf( op->o_ber, "{m" /*}*/, &reqoid ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_extended: conn %d ber_scanf failed\n", conn->c_connid ));
+ LDAP_LOG( OPERATION, ERR, "do_extended: conn %d ber_scanf failed\n",
+ conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 );
#endif
goto done;
}
- if( !(ext = find_extop(supp_ext_list, &reqoid)) ) {
+#ifdef LDAP_SLAPI
+ getPluginFunc( &reqoid, &funcAddr ); /* NS-SLAPI extended operation */
+ if( !funcAddr && !(ext = find_extop(supp_ext_list, &reqoid )))
+#else
+ if( !(ext = find_extop(supp_ext_list, &reqoid )))
+#endif
+ {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ LDAP_LOG( OPERATION, ERR,
"do_extended: conn %d unsupported operation \"%s\"\n",
- conn->c_connid, reqoid.bv_val ));
+ conn->c_connid, reqoid.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_extended: unsupported operation \"%s\"\n",
reqoid.bv_val, 0 ,0 );
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 ) {
if( ber_scanf( op->o_ber, "m", &reqdata ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_extended: conn %d ber_scanf failed\n", conn->c_connid ));
+ LDAP_LOG( OPERATION, ERR,
+ "do_extended: conn %d ber_scanf failed\n",
+ conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 );
#endif
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_extended: conn %d get_ctrls failed\n", conn->c_connid ));
+ LDAP_LOG( OPERATION, ERR,
+ "do_extended: conn %d get_ctrls failed\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_extended: get_ctrls failed\n", 0, 0 ,0 );
#endif
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
- "do_extended: conn %d oid=%d\n.", conn->c_connid, reqoid.bv_val ));
+ LDAP_LOG( OPERATION, DETAIL1,
+ "do_extended: conn %d oid=%d\n.", conn->c_connid, reqoid.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n", reqoid.bv_val, 0 ,0 );
#endif
text = NULL;
refs = NULL;
- rc = (ext->ext_main)( conn, op,
- reqoid.bv_val, reqdata.bv_val ? &reqdata : NULL,
- &rspoid, &rspdata, &rspctrls, &text, &refs );
+#if defined(LDAP_SLAPI)
+ if (ext != NULL) { /* OpenLDAP extended operation */
+#endif /* defined(LDAP_SLAPI) */
+
+ rc = (ext->ext_main)( conn, op,
+ &reqoid, 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 ( rspoid != NULL ) {
- free( rspoid );
- }
+#if defined( LDAP_SLAPI )
+ goto done; /* end of OpenLDAP extended operation */
- if ( rspdata != NULL ) {
- ber_bvfree( rspdata );
- }
+ } else { /* start of Netscape extended operation */
+ rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_OID,
+ (void *)reqoid.bv_val);
+ if ( rc != LDAP_SUCCESS ) {
+ rc = LDAP_OTHER;
+ goto done;
+ }
+
+ rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_VALUE,
+ (void *)&reqdata);
+ if ( rc != LDAP_SUCCESS ) {
+ rc = LDAP_OTHER;
+ goto done;
+ }
+
+ rc = slapi_x_connection_set_pb( pb, conn );
+ if ( rc != LDAP_SUCCESS ) {
+ rc = LDAP_OTHER;
+ goto done;
+ }
+
+ rc = slapi_x_operation_set_pb( pb, op );
+ if ( rc != LDAP_SUCCESS ) {
+ rc = LDAP_OTHER;
+ goto done;
+ }
+
+ 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 {
+ rc = slapi_pblock_get( pb, SLAPI_EXT_OP_RET_OID,
+ &rspoid);
+ if ( rc != LDAP_SUCCESS ) {
+ goto done2;
+ }
+
+ rc = slapi_pblock_get( pb, SLAPI_EXT_OP_RET_VALUE,
+ &rspdata);
+ if ( rc != LDAP_SUCCESS ) {
+ goto done2;
+ }
+
+ send_ldap_extended( conn, op, extop_rc, NULL, text,
+ refs, rspoid, rspdata, rspctrls );
+ msg_sent = TRUE;
+ }
+
+done2:;
+ 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 );
+ }
+
+ } /* end of Netscape extended operation */
+#endif /* defined( LDAP_SLAPI ) */
done:
return rc;
int
load_extop(
- const char *ext_oid,
+ struct berval *ext_oid,
SLAP_EXTOP_MAIN_FN *ext_main )
{
struct extop_list *ext;
- if( ext_oid == NULL || *ext_oid == '\0' ) return -1;
+ if( ext_oid == NULL || ext_oid->bv_val == NULL ||
+ ext_oid->bv_val[0] == '\0' || ext_oid->bv_len == 0 ) return -1;
if(!ext_main) return -1;
- ext = ch_calloc(1, sizeof(struct extop_list));
+ ext = ch_calloc(1, sizeof(struct extop_list) + ext_oid->bv_len + 1);
if (ext == NULL)
return(-1);
- ber_str2bv( ext_oid, 0, 1, &ext->oid );
- if (ext->oid.bv_val == NULL) {
- free(ext);
- return(-1);
- }
+ ext->oid.bv_val = (char *)(ext + 1);
+ AC_MEMCPY( ext->oid.bv_val, ext_oid->bv_val, ext_oid->bv_len );
+ ext->oid.bv_len = ext_oid->bv_len;
+ ext->oid.bv_val[ext->oid.bv_len] = '\0';
ext->ext_main = ext_main;
ext->next = supp_ext_list;
{
int i;
- for (i = 0; builtin_extops[i].oid.bv_val != NULL; i++) {
- load_extop(builtin_extops[i].oid.bv_val, builtin_extops[i].ext_main);
+ for (i = 0; builtin_extops[i].oid != NULL; i++) {
+ load_extop((struct berval *)builtin_extops[i].oid, builtin_extops[i].ext_main);
}
return(0);
}
/* we allocated the memory, so we have to free it, too. */
while ((ext = supp_ext_list) != NULL) {
supp_ext_list = ext->next;
- if (ext->oid.bv_val != NULL)
- ch_free(ext->oid.bv_val);
ch_free(ext);
}
return(0);
struct extop_list *ext;
for (ext = list; ext; ext = ext->next) {
- if (ber_bvcmp(&ext->oid, oid) == 0)
+ if (bvmatch(&ext->oid, oid))
return(ext);
}
return(NULL);
whoami_extop (
Connection *conn,
Operation *op,
- const char * reqoid,
+ struct berval * reqoid,
struct berval * reqdata,
char ** rspoid,
struct berval ** rspdata,
}
{
- int rc;
- struct berval whoami = BER_BVC( LDAP_EXOP_X_WHO_AM_I );
-
- rc = backend_check_restrictions( conn->c_authz_backend,
- conn, op, &whoami, text );
+ int rc = backend_check_restrictions( conn->c_authz_backend,
+ conn, op, (struct berval *)&slap_EXOP_WHOAMI, text );
if( rc != LDAP_SUCCESS ) return rc;
}
projects / openldap / blobdiff