X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapexop.c;h=6fc4d1e3c6b3a1f93746ff3f6bbf92fb85a52e9e;hb=ca15238dfbd58d46126eb2bd91bc987f03207cd4;hp=b259bef03cbab993b5c4eef9ff83e14955987682;hpb=77a7ef0adf8889c90f7a3f8e7a4594445d87da3f;p=openldap diff --git a/clients/tools/ldapexop.c b/clients/tools/ldapexop.c index b259bef03c..6fc4d1e3c6 100644 --- a/clients/tools/ldapexop.c +++ b/clients/tools/ldapexop.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2005-2010 The OpenLDAP Foundation. + * Copyright 2005-2011 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -247,7 +247,7 @@ main( int argc, char *argv[] ) char *retoid = NULL; struct berval *retdata = NULL; - rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 ); + rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 0 ); if ( rc != LDAP_SUCCESS ) { tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL ); @@ -294,7 +294,7 @@ main( int argc, char *argv[] ) printf(_("# extended operation response\n")); } - rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 ); + rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 0 ); if ( rc != LDAP_SUCCESS ) { tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL ); rc = EXIT_FAILURE; @@ -318,7 +318,8 @@ main( int argc, char *argv[] ) } } - if( verbose || ( code != LDAP_SUCCESS ) || matcheddn || text || refs ) { + if( verbose || code != LDAP_SUCCESS || + ( matcheddn && *matcheddn ) || ( text && *text ) || refs ) { printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code ); if( text && *text ) {