From: Howard Chu <hyc@openldap.org>
Date: Sat, 18 Oct 2003 12:59:55 +0000 (+0000)
Subject: Revert/Fix prev commit
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~551
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5788e12926117f7c8d8e44b8d098fcee2a36b99c;p=openldap

Revert/Fix prev commit
---

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 1da32c7d85..6a33da58ae 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -1131,6 +1131,18 @@ print_entry(
 	}
 	write_ldif( LDIF_PUT_VALUE, "dn", bv.bv_val, bv.bv_len );
 
+	rc = ldap_get_entry_controls( ld, entry, &ctrls );
+	if( rc != LDAP_SUCCESS ) {
+		fprintf(stderr, _("print_entry: %d\n"), rc );
+		ldap_perror( ld, "ldap_get_entry_controls" );
+		exit( EXIT_FAILURE );
+	}
+
+	if( ctrls ) {
+		print_ctrls( ctrls );
+		ldap_controls_free( ctrls );
+	}
+
 	if ( includeufn ) {
 		if( ufn == NULL ) {
 			ufn = ldap_dn2ufn( bv.bv_val );
@@ -1199,17 +1211,6 @@ print_entry(
 			ber_memfree( bvals );
 		}
 	}
-	rc = ldap_pvt_get_controls( ber, &ctrls );
-	if( rc != LDAP_SUCCESS ) {
-		fprintf(stderr, _("print_entry: %d\n"), rc );
-		ldap_perror( ld, "ldap_pvt_get_controls" );
-		exit( EXIT_FAILURE );
-	}
-
-	if( ctrls ) {
-		print_ctrls( ctrls );
-		ldap_controls_free( ctrls );
-	}
 
 	if( ber != NULL ) {
 		ber_free( ber, 0 );