Revised ITS#799 fix from Steve Sonntag <vtag@novell.com>

[openldap] / libraries / libldap / delete.c

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index b5602db2eb943abefd7dea3336e3a659b2cd572a..714acc5a5a2e966fbe2ac6c914178c354d3bee1b 100644 (file)
--- 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-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -54,12 +55,12 @@ ldap_delete_ext(
        assert( msgidp != NULL );
 
        /* 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;
@@ -73,8 +74,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 );