X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fdelete.c;h=16e768cb534e7f4ac9cec5f0e1fd27e5242dd88a;hb=2dfd312fa12a765a5ad311f6c9bf8dce76a63155;hp=b132dde3b228c1db84097a096957fc5ed168812a;hpb=a53823a613a42bfa741385e862aca1bb3de0f628;p=openldap
diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index b132dde3b2..16e768cb53 100644
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -1,12 +1,23 @@
-/*
- * Copyright 1998-1999 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.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 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
+ * .
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
+ */
+/*
+ * Portions Copyright (C) The Internet Society (1997)
+ * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
*/
/*
@@ -44,18 +55,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 )) == 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 - '}' */
- ++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 );
@@ -68,15 +92,14 @@ 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 );
}
/* 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;