X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fmodrdn.c;h=29108a3f38d12ae98343a644aec956d95fe09f53;hb=55dba4395f81f75ad8f247d3c0fad7119fe1ea9d;hp=9028e33fc0469ad77dda27957ccf473708b10981;hpb=3b5a5b792c24a5ba90505225fc3ef9158494cb3e;p=openldap

diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index 9028e33fc0..29108a3f38 100644
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -8,7 +9,6 @@
  *
  *  modrdn.c
  */
-
 /*
  * Support for MODIFYDN REQUEST V3 (newSuperior) by:
  *
@@ -19,7 +19,16 @@
  * Redistribution and use in source and binary forms are permitted
  * without restriction or fee of any kind as long as this notice
  * is preserved.
- *
+ */
+
+/*
+ * A modify rdn request looks like this:
+ *	ModifyRDNRequest ::= SEQUENCE {
+ *		entry		DistinguishedName,
+ *		newrdn		RelativeDistinguishedName,
+ *		deleteoldrdn	BOOLEAN
+ *		newSuperior	[0] DistinguishedName	[v3 only]
+ *	}
  */
 
 #include "portable.h"
@@ -33,164 +42,198 @@
 #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
+ * ldap_rename - initiate an ldap extended modifyDN 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
- *	newSuperior	DN of the new parent if applicable
+ *	newSuperior		DN of the new parent if applicable
+ *
+ * Returns the LDAP error code.
  */
 
 int
-ldap_rename2( LDAP *ld,
-	      char *dn,
-	      char *newrdn,
-	      int deleteoldrdn,
-	      char *newSuperior )
+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
-	 *		newSuperior	[0] DistinguishedName	[v3 only]
-	 *	}
-	 */
-
-	Debug( LDAP_DEBUG_TRACE, "ldap_rename2\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 );
 
-	    if ( ber_printf( ber, "{it{ssbts}}",
-			     ++ld->ld_msgid,
-			     LDAP_REQ_MODRDN,
-			     dn,
-			     newrdn,
-			     deleteoldrdn,
-			     LDAP_TAG_NEWSUPERIOR,
-			     newSuperior )
-		 == -1 ) {
+	} else {
+		rc = ber_printf( ber, "{it{ssb}", /* '}' */ 
+			++ld->ld_msgid, LDAP_REQ_MODDN,
+			dn, newrdn, (ber_int_t) deleteoldrdn );
+	}
 
+	if ( rc < 0 ) {
 		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 {
+		return( ld->ld_errno );
+	}
 
-	    /* If no newSuperior fall through to ldap_modrdn2() */
+	/* Put Server Controls */
+	if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
+		ber_free( ber, 1 );
+		return ld->ld_errno;
+	}
 
-	    return ldap_modrdn2( ld, dn, newrdn, deleteoldrdn );
+	rc = ber_printf( ber, /*{*/ "}" );
+	if ( rc < 0 ) {
+		ld->ld_errno = LDAP_ENCODING_ERROR;
+		ber_free( ber, 1 );
+		return( ld->ld_errno );
+	}
 
+	/* send the message */
+	*msgidp = ldap_send_initial_request( ld, LDAP_REQ_MODRDN, dn, ber );
+	
+	if( *msgidp < 0 ) {
+		return( ld->ld_errno );
 	}
 
-}/* int ldap_rename2() */
+	return LDAP_SUCCESS;
+}
 
 
 /*
- * ldap_modrdn2 - initiate an ldap (and X.500) modifyRDN operation. Parameters:
- *
+ * 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
  *
- * Example:
- *	msgid = ldap_modrdn( ld, dn, newrdn );
+ * ldap_rename2 uses a U-Mich Style API.  It returns the msgid.
  */
+
 int
-ldap_modrdn2( LDAP *ld, char *dn, char *newrdn, int deleteoldrdn )
+ldap_rename2(
+	LDAP *ld,
+	LDAP_CONST char *dn,
+	LDAP_CONST char *newrdn,
+	LDAP_CONST char *newSuperior,
+	int deleteoldrdn )
 {
-	BerElement	*ber;
+	int msgid;
+	int rc;
 
-	/*
-	 * A modify rdn request looks like this:
-	 *	ModifyRDNRequest ::= SEQUENCE {
-	 *		entry		DistinguishedName,
-	 *		newrdn		RelativeDistinguishedName,
-	 *		deleteoldrdn	BOOLEAN
-	 *	}
-	 */
+	Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 );
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_modrdn\n", 0, 0, 0 );
+	rc = ldap_rename( ld, dn, newrdn, newSuperior,
+		deleteoldrdn, NULL, NULL, &msgid );
 
-	/* create a message to send */
-	if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
-		return( -1 );
-	}
+	return rc == LDAP_SUCCESS ? msgid : -1;
+}
 
-	if ( ber_printf( ber, "{it{ssb}}", ++ld->ld_msgid, LDAP_REQ_MODRDN, dn,
-	    newrdn, deleteoldrdn ) == -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 ));
+/*
+ * 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( LDAP *ld,
+	LDAP_CONST char *dn,
+	LDAP_CONST char *newrdn,
+	int deleteoldrdn )
+{
+	return ldap_rename2( ld, dn, newrdn, NULL, deleteoldrdn );
 }
 
 int
-ldap_modrdn( LDAP *ld, char *dn, char *newrdn )
+ldap_modrdn( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )
 {
-	return( ldap_modrdn2( ld, dn, newrdn, 1 ) );
+	return( ldap_rename2( ld, dn, newrdn, NULL, 1 ) );
 }
 
+
 int
-ldap_rename2_s( LDAP *ld, char *dn, char *newrdn, int deleteoldrdn,
-		char *newSuperior )
+ldap_rename_s(
+	LDAP *ld,
+	LDAP_CONST char *dn,
+	LDAP_CONST char *newrdn,
+	LDAP_CONST char *newSuperior,
+	int deleteoldrdn,
+	LDAPControl **sctrls,
+	LDAPControl **cctrls )
 {
-	int		msgid;
-	LDAPMessage	*res;
+	int rc;
+	int msgid;
+	LDAPMessage *res;
 
+	rc = ldap_rename( ld, dn, newrdn, newSuperior,
+		deleteoldrdn, sctrls, cctrls, &msgid );
 
-	if ( (msgid = ldap_rename2( ld,
-				    dn,
-				    newrdn,
-				    deleteoldrdn,
-				    newSuperior ))
-	     == -1 )
-		return( ld->ld_errno );
+	if( rc != LDAP_SUCCESS ) {
+		return rc;
+	}
 
-	if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res )
-	     == -1 )
-		return( ld->ld_errno );
+	rc = ldap_result( ld, msgid, 1, NULL, &res );
 
-	return( ldap_result2error( ld, res, 1 ) );
+	if( rc == -1 ) {
+		return ld->ld_errno;
+	}
 
+	return ldap_result2error( ld, res, 1 );
 }
 
 int
-ldap_modrdn2_s( LDAP *ld, char *dn, char *newrdn, int deleteoldrdn )
+ldap_rename2_s(
+	LDAP *ld,
+	LDAP_CONST char *dn,
+	LDAP_CONST char *newrdn,
+	LDAP_CONST char *newSuperior,
+	int deleteoldrdn )
 {
-	int		msgid;
-	LDAPMessage	*res;
-
-	if ( (msgid = ldap_modrdn2( ld, dn, newrdn, deleteoldrdn )) == -1 )
-		return( ld->ld_errno );
-
-	if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 )
-		return( ld->ld_errno );
+	return ldap_rename_s( ld, dn, newrdn, newSuperior,
+		deleteoldrdn, NULL, NULL );
+}
 
-	return( ldap_result2error( ld, res, 1 ) );
+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, char *dn, char *newrdn )
+ldap_modrdn_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )
 {
-	return( ldap_modrdn2_s( ld, dn, newrdn, 1 ) );
+	return ldap_rename_s( ld, dn, newrdn, NULL, 1, NULL, NULL );
 }