X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fmodrdn.c;h=29108a3f38d12ae98343a644aec956d95fe09f53;hb=55dba4395f81f75ad8f247d3c0fad7119fe1ea9d;hp=434ecb5d0b916bc17fc60a7eba2160682b96bca7;hpb=2a869f5a99f537b246ba8640502e2a86117cb6e8;p=openldap diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c index 434ecb5d0b..29108a3f38 100644 --- a/libraries/libldap/modrdn.c +++ b/libraries/libldap/modrdn.c @@ -1,15 +1,37 @@ +/* $OpenLDAP$ */ /* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* Portions * Copyright (c) 1990 Regents of the University of Michigan. * All rights reserved. * * 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" +/* + * A modify rdn request looks like this: + * ModifyRDNRequest ::= SEQUENCE { + * entry DistinguishedName, + * newrdn RelativeDistinguishedName, + * deleteoldrdn BOOLEAN + * newSuperior [0] DistinguishedName [v3 only] + * } + */ -#ifndef lint -static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n"; -#endif +#include "portable.h" #include @@ -17,76 +39,201 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of #include #include -#include "lber.h" -#include "ldap.h" #include "ldap-int.h" /* - * ldap_modrdn2 - initiate an ldap (and X.500) modifyRDN operation. Parameters: + * ldap_rename - initiate an ldap extended modifyDN operation. * - * ld LDAP descriptor - * dn DN of the object to modify - * newrdn RDN to give the object + * Parameters: + * 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 * - * Example: - * msgid = ldap_modrdn( ld, dn, newrdn ); + * Returns the LDAP error code. */ + int -ldap_modrdn2( LDAP *ld, char *dn, char *newrdn, int deleteoldrdn ) +ldap_rename( + LDAP *ld, + LDAP_CONST char *dn, + LDAP_CONST char *newrdn, + LDAP_CONST char *newSuperior, + int deleteoldrdn, + LDAPControl **sctrls, + LDAPControl **cctrls, + int *msgidp ) { BerElement *ber; + int rc; - /* - * A modify rdn request looks like this: - * ModifyRDNRequest ::= SEQUENCE { - * entry DistinguishedName, - * newrdn RelativeDistinguishedName, - * deleteoldrdn BOOLEAN - * } - */ - - Debug( LDAP_DEBUG_TRACE, "ldap_modrdn\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "ldap_rename\n", 0, 0, 0 ); /* create a message to send */ - if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) { - return( -1 ); + if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { + return( LDAP_NO_MEMORY ); + } + + if( newSuperior != NULL ) { + /* must be version 3 (or greater) */ + if ( ld->ld_version < LDAP_VERSION3 ) { + ld->ld_errno = LDAP_NOT_SUPPORTED; + ber_free( ber, 1 ); + return( ld->ld_errno ); + } + + rc = ber_printf( ber, "{it{ssbts}", /* '}' */ + ++ld->ld_msgid, LDAP_REQ_MODDN, + dn, newrdn, (ber_int_t) deleteoldrdn, + LDAP_TAG_NEWSUPERIOR, newSuperior ); + + } else { + rc = ber_printf( ber, "{it{ssb}", /* '}' */ + ++ld->ld_msgid, LDAP_REQ_MODDN, + dn, newrdn, (ber_int_t) deleteoldrdn ); } - if ( ber_printf( ber, "{it{ssb}}", ++ld->ld_msgid, LDAP_REQ_MODRDN, dn, - newrdn, deleteoldrdn ) == -1 ) { + if ( rc < 0 ) { ld->ld_errno = LDAP_ENCODING_ERROR; ber_free( ber, 1 ); - return( -1 ); + return( ld->ld_errno ); + } + + /* Put Server Controls */ + if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { + ber_free( ber, 1 ); + return ld->ld_errno; + } + + rc = ber_printf( ber, /*{*/ "}" ); + if ( rc < 0 ) { + ld->ld_errno = LDAP_ENCODING_ERROR; + ber_free( ber, 1 ); + return( ld->ld_errno ); } /* send the message */ - return ( ldap_send_initial_request( ld, LDAP_REQ_MODRDN, dn, ber )); + *msgidp = ldap_send_initial_request( ld, LDAP_REQ_MODRDN, dn, ber ); + + if( *msgidp < 0 ) { + return( ld->ld_errno ); + } + + return LDAP_SUCCESS; } + +/* + * 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 + * + * ldap_rename2 uses a U-Mich Style API. It returns the msgid. + */ + int -ldap_modrdn( LDAP *ld, char *dn, char *newrdn ) +ldap_rename2( + LDAP *ld, + LDAP_CONST char *dn, + LDAP_CONST char *newrdn, + LDAP_CONST char *newSuperior, + int deleteoldrdn ) { - return( ldap_modrdn2( ld, dn, newrdn, 1 ) ); + int msgid; + int rc; + + Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 ); + + rc = ldap_rename( ld, dn, newrdn, newSuperior, + deleteoldrdn, NULL, NULL, &msgid ); + + return rc == LDAP_SUCCESS ? msgid : -1; } + +/* + * ldap_modrdn2 - initiate an ldap modifyRDN operation. Parameters: + * + * 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 + * + * Example: + * msgid = ldap_modrdn( ld, dn, newrdn ); + */ int -ldap_modrdn2_s( LDAP *ld, char *dn, char *newrdn, int deleteoldrdn ) +ldap_modrdn2( LDAP *ld, + LDAP_CONST char *dn, + LDAP_CONST char *newrdn, + int deleteoldrdn ) { - int msgid; - LDAPMessage *res; + return ldap_rename2( ld, dn, newrdn, NULL, deleteoldrdn ); +} - if ( (msgid = ldap_modrdn2( ld, dn, newrdn, deleteoldrdn )) == -1 ) - return( ld->ld_errno ); +int +ldap_modrdn( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn ) +{ + return( ldap_rename2( ld, dn, newrdn, NULL, 1 ) ); +} - if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 ) - return( ld->ld_errno ); - return( ldap_result2error( ld, res, 1 ) ); +int +ldap_rename_s( + LDAP *ld, + LDAP_CONST char *dn, + LDAP_CONST char *newrdn, + LDAP_CONST char *newSuperior, + int deleteoldrdn, + LDAPControl **sctrls, + LDAPControl **cctrls ) +{ + int rc; + int msgid; + LDAPMessage *res; + + rc = ldap_rename( ld, dn, newrdn, newSuperior, + deleteoldrdn, sctrls, cctrls, &msgid ); + + if( rc != LDAP_SUCCESS ) { + return rc; + } + + rc = ldap_result( ld, msgid, 1, NULL, &res ); + + if( rc == -1 ) { + return ld->ld_errno; + } + + return ldap_result2error( ld, res, 1 ); } int -ldap_modrdn_s( LDAP *ld, char *dn, char *newrdn ) +ldap_rename2_s( + LDAP *ld, + LDAP_CONST char *dn, + LDAP_CONST char *newrdn, + LDAP_CONST char *newSuperior, + int deleteoldrdn ) { - return( ldap_modrdn2_s( ld, dn, newrdn, 1 ) ); + 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, 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, NULL, 1, NULL, NULL ); +} +