/* $OpenLDAP$ */
/*
- * Copyright 1999 The OpenLDAP Foundation.
+ * Copyright 1999-2000 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted only
/*
* LDAPv3 Extended Operation Request
* ExtendedRequest ::= [APPLICATION 23] SEQUENCE {
- * requestName [0] LDAPOID,
- * requestValue [1] OCTET STRING OPTIONAL
+ * requestName [0] LDAPOID,
+ * requestValue [1] OCTET STRING OPTIONAL
* }
*
* LDAPv3 Extended Operation Response
* ExtendedResponse ::= [APPLICATION 24] SEQUENCE {
* COMPONENTS OF LDAPResult,
- * responseName [10] LDAPOID OPTIONAL,
- * response [11] OCTET STRING OPTIONAL
+ * responseName [10] LDAPOID OPTIONAL,
+ * response [11] OCTET STRING OPTIONAL
* }
*
*/
extop_list_t *supp_ext_list = NULL;
/* this list of built-in extops is for extops that are not part
- * of backends or in external modules. essentially, this is
+ * 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.
*/
static extop_list_t *find_extop( extop_list_t *list, char *oid );
-static int extop_callback(
- Connection *conn, Operation *op,
- int msg, int arg, void *argp);
-
char *
get_supported_extop (int index)
{
)
{
int rc = LDAP_SUCCESS;
- char* oid;
+ char* reqoid;
struct berval *reqdata;
ber_tag_t tag;
ber_len_t len;
extop_list_t *ext;
- char *text;
+ const char *text;
struct berval **refs;
+ char *rspoid;
struct berval *rspdata;
LDAPControl **rspctrls;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+ "do_extended: conn %d\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_TRACE, "do_extended\n", 0, 0, 0 );
-
- oid = NULL;
+#endif
+ reqoid = NULL;
reqdata = NULL;
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 ));
+#else
Debug( LDAP_DEBUG_ANY, "do_extended: protocol version (%d) too low\n",
op->o_protocol, 0 ,0 );
+#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "requires LDAPv3" );
rc = -1;
goto done;
}
- if ( ber_scanf( op->o_ber, "{a" /*}*/, &oid ) == LBER_ERROR ) {
+ if ( ber_scanf( op->o_ber, "{a" /*}*/, &reqoid ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_extended: conn %d ber_scanf failed\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 );
+#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
rc = -1;
goto done;
}
- if( !(ext = find_extop(supp_ext_list, oid)) ) {
+ if( !(ext = find_extop(supp_ext_list, reqoid)) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_extended: conn %d unsupported operation \"%s\"\n",
+ conn->c_connid, reqoid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_extended: unsupported operation \"%s\"\n",
- oid, 0 ,0 );
+ reqoid, 0 ,0 );
+#endif
send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
NULL, "unsupported extended operation", NULL, NULL );
goto done;
if( ber_peek_tag( op->o_ber, &len ) == LDAP_TAG_EXOP_REQ_VALUE ) {
if( ber_scanf( op->o_ber, "O", &reqdata ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_extended: conn %d ber_scanf failed\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 );
+#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
rc = -1;
}
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 ));
+#else
Debug( LDAP_DEBUG_ANY, "do_extended: get_ctrls failed\n", 0, 0 ,0 );
+#endif
return rc;
}
- Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n", oid, 0 ,0 );
-
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+ "do_extended: conn %d oid=%d\n.", conn->c_connid, reqoid ));
+#else
+ Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n", reqoid, 0 ,0 );
+#endif
+ rspoid = NULL;
rspdata = NULL;
rspctrls = NULL;
text = NULL;
+ refs = NULL;
- rc = (ext->ext_main)( extop_callback, conn, op,
- oid, reqdata, &rspdata, &rspctrls, &text );
+ rc = (ext->ext_main)( conn, op,
+ reqoid, reqdata,
+ &rspoid, &rspdata, &rspctrls, &text, &refs );
if( rc != SLAPD_ABANDON ) {
- refs = NULL;
- if (rc == LDAP_REFERRAL)
+ if (rc == LDAP_REFERRAL) {
refs = default_referral;
+ }
- send_ldap_extended( conn, op, rc, NULL, text,
- refs, oid, rspdata, rspctrls );
+ send_ldap_extended( conn, op, rc, NULL, text, refs,
+ rspoid, rspdata, rspctrls );
+ }
+
+ if ( rspoid != NULL ) {
+ free( rspoid );
}
if ( rspdata != NULL )
ber_bvfree( rspdata );
- if ( text != NULL )
- free(text);
-
done:
if ( reqdata != NULL ) {
ber_bvfree( reqdata );
}
- if ( oid != NULL ) {
- free( oid );
+ if ( reqoid != NULL ) {
+ free( reqoid );
}
return rc;
}
return(NULL);
}
-
-int
-extop_callback(
- Connection *conn, Operation *op,
- int msg, int arg, void *argp)
-{
- if (argp == NULL)
- return(-1);
-
- switch (msg) {
- case SLAPD_EXTOP_GETVERSION:
- *(int *)argp = 1;
- return(0);
-
- case SLAPD_EXTOP_GETPROTO:
- *(int *)argp = op->o_protocol;
- return(0);
-
- case SLAPD_EXTOP_GETAUTH:
- *(int *)argp = op->o_authtype;
- return(0);
-
- case SLAPD_EXTOP_GETDN:
- *(char **)argp = op->o_dn;
- return(0);
-
- case SLAPD_EXTOP_GETCLIENT:
- if (conn->c_peer_domain != NULL && *conn->c_peer_domain != 0) {
- *(char **)argp = conn->c_peer_domain;
- return(0);
- }
- if (conn->c_peer_name != NULL && *conn->c_peer_name != 0) {
- *(char **)argp = conn->c_peer_name;
- return(0);
- }
- break;
-
- default:
- break;
- }
- return(-1);
-}
projects / openldap / blobdiff