bug fixes for ldap_msgtype and ldap_msgid

[openldap] / libraries / libldap / modrdn.c

diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index f9b435aa05b2fdd805c47a969801423bc88394e8..209ec4315ad3814b6f1d3a125aad70c58edb488f 100644 (file)
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -70,31 +71,27 @@ ldap_rename(
        Debug( LDAP_DEBUG_TRACE, "ldap_rename\n", 0, 0, 0 );
 
        /* create a message to send */
-       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                return( LDAP_NO_MEMORY );
        }
 
        if( newSuperior != NULL ) {
                /* must be version 3 (or greater) */
-               if ( ld->ld_version == 0 ) {
-                       ld->ld_version = LDAP_VERSION3;
-               }
-
                if ( ld->ld_version < LDAP_VERSION3 ) {
                        ld->ld_errno = LDAP_NOT_SUPPORTED;
                        ber_free( ber, 1 );
                        return( ld->ld_errno );
                }
 
-               rc = ber_printf( ber, "{it{ssbts}", /* leave '}' for later */ 
+               rc = ber_printf( ber, "{it{ssbts}", /* '}' */ 
                        ++ld->ld_msgid, LDAP_REQ_MODDN,
-                       dn, newrdn, deleteoldrdn,
+                       dn, newrdn, (ber_int_t) deleteoldrdn,
                        LDAP_TAG_NEWSUPERIOR, newSuperior );
 
        } else {
-               rc = ber_printf( ber, "{it{ssb}", /* leave '}' for later */ 
+               rc = ber_printf( ber, "{it{ssb}", /* '}' */ 
                        ++ld->ld_msgid, LDAP_REQ_MODDN,
-                       dn, newrdn, deleteoldrdn );
+                       dn, newrdn, (ber_int_t) deleteoldrdn );
        }
 
        if ( rc < 0 ) {
@@ -109,8 +106,7 @@ ldap_rename(
                return ld->ld_errno;
        }
 
-       /* close the '{' */
-       rc = ber_printf( ber, "}" );
+       rc = ber_printf( ber, /*{*/ "}" );
        if ( rc < 0 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );