--- /home/chris/openldap2-2.1.30/clients/tools/ldapsearch.c	2003-03-29 10:45:43.000000000 -0500
+++ ldapsearch.c	2008-04-03 15:56:58.000000000 -0400
@@ -1032,8 +1032,8 @@
 #ifdef LDAP_SYNC
 				if ( cancel_msgid != -1 &&
 						cancel_msgid == ldap_msgid( msg ) ) {
-					printf("Cancelled \n");
-					printf("cancel_msgid = %d\n", cancel_msgid);
+					fprintf(stderr, "Cancelled \n");
+					fprintf(stderr, "cancel_msgid = %d\n", cancel_msgid);
 					goto done;
 				}
 #endif
@@ -1076,7 +1076,7 @@
 				nresponses_psearch = 0;
 
 				if ( strcmp( retoid, LDAP_SYNC_INFO ) ) {
-					printf("Unexpected Intermediate Response\n");
+					fprintf(stderr, "Unexpected Intermediate Response\n");
 					ldap_memfree( retoid );
 					ber_bvfree( retdata );
 					goto done;
@@ -1514,11 +1514,13 @@
 	}
 
 
-	if( !ldif ) {
-		printf( "result: %d %s\n", err, ldap_err2string(err) );
 
-	} else if ( err != LDAP_SUCCESS ) {
-		fprintf( stderr, "%s (%d)\n", ldap_err2string(err), err );
+	if ( err != LDAP_SUCCESS ) {
+		fprintf( stderr, "Search failed: %s (%d)\n", ldap_err2string(err), err );
+	}
+
+	if ( !ldif ) {
+		printf( "result: %d %s\n", err, ldap_err2string(err) );
 	}
 
 	if( matcheddn && *matcheddn ) {