cleanup

[openldap] / libraries / libldap / delete.c

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index 47e240ea6a9bae564f909200967bd18d732217fc..714acc5a5a2e966fbe2ac6c914178c354d3bee1b 100644 (file)
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -1,79 +1,108 @@
+/* $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.
  *
  *  delete.c
  */
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
-#include <stdio.h>
-#include <string.h>
+/*
+ * A delete request looks like this:
+ *     DelRequet ::= DistinguishedName,
+ */
 
-#ifdef MACOS
-#include "macos.h"
-#endif /* MACOS */
+#include "portable.h"
 
-#if defined( DOS ) || defined( _WIN32 )
-#include "msdos.h"
-#endif /* DOS */
+#include <stdio.h>
 
-#if !defined( MACOS ) && !defined( DOS )
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
 #include "ldap-int.h"
 
 /*
- * ldap_delete - initiate an ldap (and X.500) delete operation. Parameters:
+ * 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 )
 {
        BerElement      *ber;
 
-       /*
-        * A delete request looks like this:
-        *      DelRequet ::= DistinguishedName,
-        */
-
        Debug( LDAP_DEBUG_TRACE, "ldap_delete\n", 0, 0, 0 );
 
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( dn != NULL );
+       assert( msgidp != NULL );
+
        /* create a message to send */
-       if ( (ber = 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 );
        }
 
-       if ( ber_printf( ber, "{its}", ++ld->ld_msgid, LDAP_REQ_DELETE, dn )
-           == -1 ) {
+       if ( ber_printf( ber, "{its", /* '}' */
+               ++ld->ld_msgid, LDAP_REQ_DELETE, dn ) == -1 )
+       {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
-               return( -1 );
+               return( ld->ld_errno );
+       }
+
+       /* 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( ld->ld_errno );
        }
 
        /* send the message */
-       return ( send_initial_request( ld, LDAP_REQ_DELETE, dn, ber ));
-}
+       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_DELETE, dn, ber );
+
+       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 )
@@ -81,3 +110,34 @@ ldap_delete_s( LDAP *ld, char *dn )
 
        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 );
+}