X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fdelete.c;h=d8ce99e149cd80b84ac2dae2c5fe915e7852a4fd;hb=b898f1271db5021e1873e38e1498a99d9450b646;hp=e750ecb9d8f143a69d42cd1975ce8e1dd26dfd3f;hpb=29d9fa20a2823c827f098d78f1ea8539d86bf4cf;p=openldap

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index e750ecb9d8..d8ce99e149 100644
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -1,18 +1,19 @@
 /* $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.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2010 The OpenLDAP Foundation.
+ * All rights reserved.
  *
- *  delete.c
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-
-/*
- * A delete request looks like this:
- *	DelRequet ::= DistinguishedName,
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
  */
 
 #include "portable.h"
@@ -25,6 +26,12 @@
 
 #include "ldap-int.h"
 
+/*
+ * A delete request looks like this:
+ *	DelRequet ::= DistinguishedName,
+ */
+
+
 /*
  * ldap_delete_ext - initiate an ldap extended delete operation. Parameters:
  *
@@ -45,23 +52,31 @@ ldap_delete_ext(
 	LDAPControl **cctrls,
 	int *msgidp )
 {
+	int rc;
 	BerElement	*ber;
+	ber_int_t	id;
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_delete\n", 0, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE, "ldap_delete_ext\n", 0, 0, 0 );
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
 	assert( dn != NULL );
 	assert( msgidp != NULL );
 
+	/* 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 ) {
 		ld->ld_errno = LDAP_NO_MEMORY;
 		return( ld->ld_errno );
 	}
 
-	if ( ber_printf( ber, "{its", /* '}' */
-		++ld->ld_msgid, LDAP_REQ_DELETE, dn ) == -1 )
+	LDAP_NEXT_MSGID( ld, id );
+	rc = ber_printf( ber, "{its", /* '}' */
+		id, LDAP_REQ_DELETE, dn );
+	if ( rc == -1 )
 	{
 		ld->ld_errno = LDAP_ENCODING_ERROR;
 		ber_free( ber, 1 );
@@ -74,14 +89,14 @@ ldap_delete_ext(
 		return ld->ld_errno;
 	}
 
-	if ( ber_printf( ber, /*{*/ "}" ) == -1 ) {
+	if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
 		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_DELETE, dn, ber );
+	*msgidp = ldap_send_initial_request( ld, LDAP_REQ_DELETE, dn, ber, id );
 
 	if(*msgidp < 0)
 		return ld->ld_errno;
@@ -105,7 +120,7 @@ ldap_delete_ext_s(
 	if( rc != LDAP_SUCCESS )
 		return( ld->ld_errno );
 
-	if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 )
+	if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res )
 		return( ld->ld_errno );
 
 	return( ldap_result2error( ld, res, 1 ) );