Fix encoding

[openldap] / libraries / libldap / modrdn.c

diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index 964942fd47a513d3ac8e5ea9cbe73bb37d21a0b0..c160ea87b408f42652452e7bc44f000c91045d70 100644 (file)
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -79,11 +79,7 @@ ldap_rename(
        int rc;
        ber_int_t id;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY, "ldap_rename\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_rename\n", 0, 0, 0 );
-#endif
 
        /* check client controls */
        rc = ldap_int_client_controls( ld, cctrls );
@@ -166,11 +162,7 @@ ldap_rename2(
        int msgid;
        int rc;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY, "ldap_rename2\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_rename2\n", 0, 0, 0 );
-#endif
 
        rc = ldap_rename( ld, dn, newrdn, newSuperior,
                deleteoldrdn, NULL, NULL, &msgid );
@@ -227,7 +219,7 @@ ldap_rename_s(
                return rc;
        }
 
-       rc = ldap_result( ld, msgid, 1, NULL, &res );
+       rc = ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &res );
 
        if( rc == -1 ) {
                return ld->ld_errno;