mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-31 20:19:34 -05:00
Added the functions ldap_rename2() and ldap_rename2_s() to support LDAP
v3 MODDN (MODRDN) operation on the client side.
This commit is contained in:
parent
e46c2e494e
commit
00558f962b
1 changed files with 106 additions and 0 deletions
|
|
@ -9,6 +9,19 @@
|
|||
* modrdn.c
|
||||
*/
|
||||
|
||||
/*
|
||||
* Support for MODIFYDN REQUEST V3 (newSuperior) by:
|
||||
*
|
||||
* Copyright 1999, Juan C. Gomez, All rights reserved.
|
||||
* This software is not subject to any license of Silicon Graphics
|
||||
* Inc. or Purdue University.
|
||||
*
|
||||
* Redistribution and use in source and binary forms are permitted
|
||||
* without restriction or fee of any kind as long as this notice
|
||||
* is preserved.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "portable.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -19,6 +32,74 @@
|
|||
|
||||
#include "ldap-int.h"
|
||||
|
||||
/*
|
||||
* ldap_rename2 - initiate an ldap (and X.500) modifyDN operation. Parameters:
|
||||
* (LDAP V3 MODIFYDN REQUEST)
|
||||
* ld LDAP descriptor
|
||||
* dn DN of the object to modify
|
||||
* newrdn RDN to give the object
|
||||
* deleteoldrdn nonzero means to delete old rdn values from the entry
|
||||
* newSuperior DN of the new parent if applicable
|
||||
*/
|
||||
|
||||
int
|
||||
ldap_rename2( LDAP *ld,\
|
||||
char *dn,\
|
||||
char *newrdn,\
|
||||
int deleteoldrdn,\
|
||||
char *newSuperior )
|
||||
{
|
||||
BerElement *ber;
|
||||
|
||||
/*
|
||||
* A modify rdn request looks like this:
|
||||
* ModifyRDNRequest ::= SEQUENCE {
|
||||
* entry DistinguishedName,
|
||||
* newrdn RelativeDistinguishedName,
|
||||
* deleteoldrdn BOOLEAN
|
||||
* newSuperior [0] DistinguishedName [v3 only]
|
||||
* }
|
||||
*/
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 );
|
||||
|
||||
/* create a message to send */
|
||||
if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
if( newSuperior != NULL ) {
|
||||
|
||||
if ( ber_printf( ber, "{it{ssbts}}",\
|
||||
++ld->ld_msgid,\
|
||||
LDAP_REQ_MODRDN,\
|
||||
dn,\
|
||||
newrdn,\
|
||||
deleteoldrdn,\
|
||||
LDAP_TAG_NEWSUPERIOR,\
|
||||
newSuperior )\
|
||||
== -1 ) {
|
||||
|
||||
ld->ld_errno = LDAP_ENCODING_ERROR;
|
||||
ber_free( ber, 1 );
|
||||
return( -1 );
|
||||
|
||||
}
|
||||
|
||||
/* send the message */
|
||||
return ldap_send_initial_request( ld, LDAP_REQ_MODRDN, dn, ber );
|
||||
|
||||
} else {
|
||||
|
||||
/* If no newSuperior fall through to ldap_modrdn2() */
|
||||
|
||||
return ldap_modrdn2( ld, dn, newrdn, deleteoldrdn );
|
||||
|
||||
}
|
||||
|
||||
}/* int ldap_rename2() */
|
||||
|
||||
|
||||
/*
|
||||
* ldap_modrdn2 - initiate an ldap (and X.500) modifyRDN operation. Parameters:
|
||||
*
|
||||
|
|
@ -68,6 +149,30 @@ ldap_modrdn( LDAP *ld, char *dn, char *newrdn )
|
|||
return( ldap_modrdn2( ld, dn, newrdn, 1 ) );
|
||||
}
|
||||
|
||||
int
|
||||
ldap_rename2_s( LDAP *ld, char *dn, char *newrdn, int deleteoldrdn,\
|
||||
char *newSuperior )
|
||||
{
|
||||
int msgid;
|
||||
LDAPMessage *res;
|
||||
|
||||
|
||||
if ( (msgid = ldap_rename2( ld,\
|
||||
dn,\
|
||||
newrdn,\
|
||||
deleteoldrdn,\
|
||||
newSuperior ))\
|
||||
== -1 )
|
||||
return( ld->ld_errno );
|
||||
|
||||
if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res )\
|
||||
== -1 )
|
||||
return( ld->ld_errno );
|
||||
|
||||
return( ldap_result2error( ld, res, 1 ) );
|
||||
|
||||
}
|
||||
|
||||
int
|
||||
ldap_modrdn2_s( LDAP *ld, char *dn, char *newrdn, int deleteoldrdn )
|
||||
{
|
||||
|
|
@ -88,3 +193,4 @@ ldap_modrdn_s( LDAP *ld, char *dn, char *newrdn )
|
|||
{
|
||||
return( ldap_modrdn2_s( ld, dn, newrdn, 1 ) );
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue