+/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* Portions
LDAP *ld,
LDAP_CONST char *dn,
LDAP_CONST char *newrdn,
- int deleteoldrdn,
LDAP_CONST char *newSuperior,
+ int deleteoldrdn,
LDAPControl **sctrls,
LDAPControl **cctrls,
int *msgidp )
Debug( LDAP_DEBUG_TRACE, "ldap_rename\n", 0, 0, 0 );
+ /* check client controls */
+ rc = ldap_int_client_controls( ld, cctrls );
+ if( rc != LDAP_SUCCESS ) return rc;
+
/* create a message to send */
if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
return( LDAP_NO_MEMORY );
return( ld->ld_errno );
}
- rc = ber_printf( ber, "{it{ssbts}", /* '}' */
+ rc = ber_printf( ber, "{it{ssbtsN}", /* '}' */
++ld->ld_msgid, LDAP_REQ_MODDN,
dn, newrdn, (ber_int_t) deleteoldrdn,
LDAP_TAG_NEWSUPERIOR, newSuperior );
} else {
- rc = ber_printf( ber, "{it{ssb}", /* '}' */
+ rc = ber_printf( ber, "{it{ssbN}", /* '}' */
++ld->ld_msgid, LDAP_REQ_MODDN,
dn, newrdn, (ber_int_t) deleteoldrdn );
}
return ld->ld_errno;
}
- rc = ber_printf( ber, /*{*/ "}" );
+ rc = ber_printf( ber, /*{*/ "N}" );
if ( rc < 0 ) {
ld->ld_errno = LDAP_ENCODING_ERROR;
ber_free( ber, 1 );
LDAP *ld,
LDAP_CONST char *dn,
LDAP_CONST char *newrdn,
- int deleteoldrdn,
- LDAP_CONST char *newSuperior )
+ LDAP_CONST char *newSuperior,
+ int deleteoldrdn )
{
int msgid;
int rc;
Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 );
- rc = ldap_rename( ld, dn, newrdn, deleteoldrdn, newSuperior,
- NULL, NULL, &msgid );
+ rc = ldap_rename( ld, dn, newrdn, newSuperior,
+ deleteoldrdn, NULL, NULL, &msgid );
return rc == LDAP_SUCCESS ? msgid : -1;
}
LDAP_CONST char *newrdn,
int deleteoldrdn )
{
- return ldap_rename2( ld, dn, newrdn, deleteoldrdn, NULL );
+ return ldap_rename2( ld, dn, newrdn, NULL, deleteoldrdn );
}
int
ldap_modrdn( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )
{
- return( ldap_rename2( ld, dn, newrdn, 1, NULL ) );
+ return( ldap_rename2( ld, dn, newrdn, NULL, 1 ) );
}
LDAP *ld,
LDAP_CONST char *dn,
LDAP_CONST char *newrdn,
- int deleteoldrdn,
LDAP_CONST char *newSuperior,
+ int deleteoldrdn,
LDAPControl **sctrls,
LDAPControl **cctrls )
{
int msgid;
LDAPMessage *res;
- rc = ldap_rename( ld, dn, newrdn, deleteoldrdn,
- newSuperior, sctrls, cctrls, &msgid );
+ rc = ldap_rename( ld, dn, newrdn, newSuperior,
+ deleteoldrdn, sctrls, cctrls, &msgid );
if( rc != LDAP_SUCCESS ) {
return rc;
LDAP *ld,
LDAP_CONST char *dn,
LDAP_CONST char *newrdn,
- int deleteoldrdn,
- LDAP_CONST char *newSuperior )
+ LDAP_CONST char *newSuperior,
+ int deleteoldrdn )
{
- return ldap_rename_s( ld, dn, newrdn, deleteoldrdn, newSuperior, NULL, NULL );
+ return ldap_rename_s( ld, dn, newrdn, newSuperior,
+ deleteoldrdn, NULL, NULL );
}
int
ldap_modrdn2_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, int deleteoldrdn )
{
- return ldap_rename_s( ld, dn, newrdn, deleteoldrdn, NULL, NULL, NULL );
+ return ldap_rename_s( ld, dn, newrdn, NULL, deleteoldrdn, NULL, NULL );
}
int
ldap_modrdn_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )
{
- return ldap_rename_s( ld, dn, newrdn, 1, NULL, NULL, NULL );
+ return ldap_rename_s( ld, dn, newrdn, NULL, 1, NULL, NULL );
}