mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove new_rdn/old_rdn - handled by frontend

Browse Source
This commit is contained in:
Luke Howard 2006-01-02 15:40:45 +00:00
parent df2503d2b4
commit b55557e30b
1 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
servers/slapd/back-sql/modrdn.c
View File

@ -44,8 +44,6 @@ backsql_modrdn( Operation *op, SlapReply *rs )
*new_pdn = NULL, *new_npdn = NULL, *new_pdn = NULL, *new_npdn = NULL,
new_dn = BER_BVNULL, new_ndn = BER_BVNULL, new_dn = BER_BVNULL, new_ndn = BER_BVNULL,
realnew_dn = BER_BVNULL; realnew_dn = BER_BVNULL;
LDAPRDN new_rdn = NULL;
LDAPRDN old_rdn = NULL;
Entry r = { 0 }, Entry r = { 0 },
p = { 0 }, p = { 0 },
n = { 0 }, n = { 0 },
@ -394,41 +392,6 @@ backsql_modrdn( Operation *op, SlapReply *rs )
} }
SQLFreeStmt( sth, SQL_DROP ); SQLFreeStmt( sth, SQL_DROP );
/*
* Get attribute type and attribute value of our new rdn,
* we will need to add that to our new entry
*/
if ( ldap_bv2rdn( &op->oq_modrdn.rs_newrdn, &new_rdn, &next,
LDAP_DN_FORMAT_LDAP ) )
{
Debug( LDAP_DEBUG_TRACE,
" backsql_modrdn: can't figure out "
"type(s)/values(s) of new_rdn\n",
0, 0, 0 );
rs->sr_err = LDAP_INVALID_DN_SYNTAX;
e = &r;
goto done;
}
Debug( LDAP_DEBUG_TRACE, "backsql_modrdn: "
"new_rdn_type=\"%s\", new_rdn_val=\"%s\"\n",
new_rdn[ 0 ]->la_attr.bv_val,
new_rdn[ 0 ]->la_value.bv_val, 0 );
if ( op->oq_modrdn.rs_deleteoldrdn ) {
if ( ldap_bv2rdn( &op->o_req_dn, &old_rdn, &next,
LDAP_DN_FORMAT_LDAP ) )
{
Debug( LDAP_DEBUG_TRACE,
" backsql_modrdn: can't figure out "
"the old_rdn type(s)/value(s)\n",
0, 0, 0 );
rs->sr_err = LDAP_OTHER;
e = NULL;
goto done;
}
}
assert( op->orr_modlist != NULL ); assert( op->orr_modlist != NULL );
oc = backsql_id2oc( bi, e_id.eid_oc_id ); oc = backsql_id2oc( bi, e_id.eid_oc_id );
@ -542,15 +505,6 @@ done:;
slap_sl_free( new_ndn.bv_val, op->o_tmpmemctx ); slap_sl_free( new_ndn.bv_val, op->o_tmpmemctx );
} }
/* LDAP v2 supporting correct attribute handling. */
if ( new_rdn != NULL ) {
ldap_rdnfree( new_rdn );
}
if ( old_rdn != NULL ) {
ldap_rdnfree( old_rdn );
}
if ( !BER_BVISNULL( &e_id.eid_ndn ) ) { if ( !BER_BVISNULL( &e_id.eid_ndn ) ) {
(void)backsql_free_entryID( op, &e_id, 0 ); (void)backsql_free_entryID( op, &e_id, 0 );
} }