X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fextended.c;h=4d197d07fbdcb2fc0783a1726f0bc925c595ae52;hb=dbaf7c5c2503b2770c9075e30a9a63b6ff577d6f;hp=894de43f5254487a57612ce135bf752c9eef7942;hpb=78873370c8664d1181af613eec1253fe44537e4b;p=openldap diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c index 894de43f52..4d197d07fb 100644 --- a/servers/slapd/extended.c +++ b/servers/slapd/extended.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2005 The OpenLDAP Foundation. + * Copyright 1999-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -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_X_CANCEL); -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 { 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; } @@ -193,8 +201,8 @@ fe_extended( Operation *op, SlapReply *rs ) reqdata = *op->ore_reqdata; } - if( !(ext = find_extop(supp_ext_list, &op->ore_reqoid ))) - { + 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", @@ -210,6 +218,8 @@ fe_extended( Operation *op, SlapReply *rs ) op->ore_reqoid.bv_val, 0 ,0 ); { /* start of OpenLDAP extended operation */ + BackendDB *bd = op->o_bd; + rs->sr_err = (ext->ext_main)( op, rs ); if( rs->sr_err != SLAPD_ABANDON ) { @@ -224,7 +234,7 @@ fe_extended( Operation *op, SlapReply *rs ) } if ( op->o_bd == NULL ) - op->o_bd = frontendDB; + op->o_bd = bd; send_ldap_extended( op, rs ); if ( rs->sr_ref != default_referral ) { @@ -247,32 +257,67 @@ done:; } int -load_extop( +load_extop2( const struct berval *ext_oid, slap_mask_t ext_flags, - SLAP_EXTOP_MAIN_FN *ext_main ) + SLAP_EXTOP_MAIN_FN *ext_main, + unsigned flags ) { - struct extop_list *ext; + struct berval oidm = BER_BVNULL; + struct extop_list *ext; + int insertme = 0; - 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; + if ( !ext_main ) { + return -1; + } - ext = ch_calloc(1, sizeof(struct extop_list) + ext_oid->bv_len + 1); - if (ext == NULL) - return(-1); + if ( ext_oid == NULL || BER_BVISNULL( ext_oid ) || + BER_BVISEMPTY( ext_oid ) ) + { + return -1; + } - ext->flags = ext_flags; + if ( numericoidValidate( NULL, (struct berval *)ext_oid ) != + LDAP_SUCCESS ) + { + oidm.bv_val = oidm_find( ext_oid->bv_val ); + if ( ext_oid == NULL ) { + return -1; + } + oidm.bv_len = strlen( oidm.bv_val ); + ext_oid = &oidm; + } + + for ( ext = supp_ext_list; ext; ext = ext->next ) { + if ( bvmatch( ext_oid, &ext->oid ) ) { + if ( flags == 1 ) { + break; + } + return -1; + } + } + + if ( flags == 0 || ext == NULL ) { + ext = ch_calloc( 1, sizeof(struct extop_list) + ext_oid->bv_len + 1 ); + if ( ext == NULL ) { + 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->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'; + insertme = 1; + } + ext->flags = ext_flags; ext->ext_main = ext_main; - ext->next = supp_ext_list; - supp_ext_list = ext; + if ( insertme ) { + ext->next = supp_ext_list; + supp_ext_list = ext; + } return(0); } @@ -282,10 +327,10 @@ extops_init (void) { int i; - for (i = 0; builtin_extops[i].oid != NULL; i++) { - load_extop((struct berval *)builtin_extops[i].oid, + for ( i = 0; builtin_extops[i].oid != NULL; i++ ) { + load_extop( (struct berval *)builtin_extops[i].oid, builtin_extops[i].flags, - builtin_extops[i].ext_main); + builtin_extops[i].ext_main ); } return(0); } @@ -316,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, @@ -334,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; }