X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fdelete.c;h=c91e02e565c61c186ec99670ac8abea154c39a80;hb=a299e74d2155a1a660db00ca7eb184b4e98edd1a;hp=71070d239435688c90eb5cae0e2dbc789aca3772;hpb=3d9c49f9829b693d525420edf20673abd059d0c0;p=openldap

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index 71070d2394..c91e02e565 100644
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -1,5 +1,6 @@
+/* $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
@@ -9,6 +10,11 @@
  *  delete.c
  */
 
+/*
+ * A delete request looks like this:
+ *	DelRequet ::= DistinguishedName,
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
@@ -39,22 +45,31 @@ ldap_delete_ext(
 	LDAPControl **cctrls,
 	int *msgidp )
 {
+	int rc;
 	BerElement	*ber;
 
-	/*
-	 * A delete request looks like this:
-	 *	DelRequet ::= DistinguishedName,
-	 */
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "delete", LDAP_LEVEL_ENTRY, "ldap_delete_ext\n" ));
+#else
+	Debug( LDAP_DEBUG_TRACE, "ldap_delete_ext\n", 0, 0, 0 );
+#endif
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_delete\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 )) == NULLBER ) {
+	if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
 		ld->ld_errno = LDAP_NO_MEMORY;
 		return( ld->ld_errno );
 	}
 
-	if ( ber_printf( ber, "{its", /* leave open - '}' */
+	if ( ber_printf( ber, "{its", /* '}' */
 		++ld->ld_msgid, LDAP_REQ_DELETE, dn ) == -1 )
 	{
 		ld->ld_errno = LDAP_ENCODING_ERROR;
@@ -68,8 +83,7 @@ ldap_delete_ext(
 		return ld->ld_errno;
 	}
 
-	/* close '{' */
-	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 );
@@ -124,7 +138,11 @@ ldap_delete( LDAP *ld, LDAP_CONST char *dn )
 	 *	DelRequet ::= DistinguishedName,
 	 */
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "delete", LDAP_LEVEL_ENTRY, "ldap_delete\n" ));
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldap_delete\n", 0, 0, 0 );
+#endif
 
 	return ldap_delete_ext( ld, dn, NULL, NULL, &msgid ) == LDAP_SUCCESS
 		? msgid : -1 ;