Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap / delete.c

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index 5e8ea7605649f9716a073858410e4e2a906acf0a..7c8763a0b44a1932deba4c01dded182c68edbd40 100644 (file)
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -1,16 +1,23 @@
-/*
- *  Copyright (c) 1990 Regents of the University of Michigan.
- *  All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 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>.
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
  */
 
 #include "portable.h"
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 #include <stdio.h>
 
 #include <ac/socket.h>
@@ -20,54 +27,132 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
 #include "ldap-int.h"
 
 /*
- * ldap_delete - initiate an ldap (and X.500) delete operation. Parameters:
+ * A delete request looks like this:
+ *     DelRequet ::= DistinguishedName,
+ */
+
+
+/*
+ * ldap_delete_ext - initiate an ldap extended delete operation. Parameters:
  *
  *     ld              LDAP descriptor
  *     dn              DN of the object to delete
+ *     sctrls  Server Controls
+ *     cctrls  Client Controls
+ *     msgidp  Message Id Pointer
  *
  * Example:
- *     msgid = ldap_delete( ld, dn );
+ *     rc = ldap_delete( ld, dn, sctrls, cctrls, msgidp );
  */
 int
-ldap_delete( LDAP *ld, char *dn )
+ldap_delete_ext(
+       LDAP *ld,
+       LDAP_CONST char* dn,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls,
+       int *msgidp )
 {
+       int rc;
        BerElement      *ber;
+       ber_int_t       id;
 
-       /*
-        * A delete request looks like this:
-        *      DelRequet ::= DistinguishedName,
-        */
+       Debug( LDAP_DEBUG_TRACE, "ldap_delete_ext\n", 0, 0, 0 );
 
-       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 ) {
-               return( -1 );
+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
+               ld->ld_errno = LDAP_NO_MEMORY;
+               return( ld->ld_errno );
+       }
+
+       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 );
+               return( ld->ld_errno );
        }
 
-       if ( ber_printf( ber, "{its}", ++ld->ld_msgid, LDAP_REQ_DELETE, dn )
-           == -1 ) {
+       /* Put Server Controls */
+       if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
+               ber_free( ber, 1 );
+               return ld->ld_errno;
+       }
+
+       if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
-               return( -1 );
+               return( ld->ld_errno );
        }
 
        /* send the message */
-       return ( 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;
+
+       return LDAP_SUCCESS;
+}
 
 int
-ldap_delete_s( LDAP *ld, char *dn )
+ldap_delete_ext_s(
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls )
 {
-       int             msgid;
+       int     msgid;
+       int rc;
        LDAPMessage     *res;
 
-       if ( (msgid = ldap_delete( ld, dn )) == -1 )
+       rc = ldap_delete_ext( ld, dn, sctrls, cctrls, &msgid );
+       
+       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 ) );
 }
+/*
+ * ldap_delete - initiate an ldap (and X.500) delete operation. Parameters:
+ *
+ *     ld              LDAP descriptor
+ *     dn              DN of the object to delete
+ *
+ * Example:
+ *     msgid = ldap_delete( ld, dn );
+ */
+int
+ldap_delete( LDAP *ld, LDAP_CONST char *dn )
+{
+       int msgid;
+
+       /*
+        * A delete request looks like this:
+        *      DelRequet ::= DistinguishedName,
+        */
+
+       Debug( LDAP_DEBUG_TRACE, "ldap_delete\n", 0, 0, 0 );
+
+       return ldap_delete_ext( ld, dn, NULL, NULL, &msgid ) == LDAP_SUCCESS
+               ? msgid : -1 ;
+}
+
+
+int
+ldap_delete_s( LDAP *ld, LDAP_CONST char *dn )
+{
+       return ldap_delete_ext_s( ld, dn, NULL, NULL );
+}