Fixed ldapmodify missing error information bug (ITS#3057)

diff --git a/CHANGES b/CHANGES
index 7b0dc18aca5022a70096158687e4de7e5247a3d1..c50bdaecac6f094f1492cedd340b4a8ae20f320e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,13 @@
 OpenLDAP 2.2 Change Log
 
 OpenLDAP 2.2.9 Engineering
+       Fixed ldapmodify missing error information bug (ITS#3057)
        Fixed back-meta compare return code (ITS#3042)
        Build Environment
                Fixed slapd dynamic backend build (ITS#3044)
 
 OpenLDAP 2.2.8 Release
-       Fixed slapd/slapadd syncrepl bugs (ITS#2948,2995)
+       Fixed slapd/slapadd syncrepl bugs (ITS#2995)
        Fixed slapd sasl-regexp multiple entry bug (ITS#3033)
        Fixed slapd bind method portability bug (ITS#3038)
        Fixed libldap try_read1msg bug (ITS#2982)

diff --git a/README b/README
index c071c83f3603d22ebbb844ed345fb8a7fbe7ae4a..2bf158743c7d1179043a2c2265fc66b13027e89a 100644 (file)
--- a/README
+++ b/README
@@ -14,8 +14,8 @@ REQUIRED SOFTWARE
 
     Base system (libraries and tools):
         Standard C compiler (required)
-        Cyrus SASL 2.1.16+ (recommended)
-        OpenSSL 0.9 (recommended)
+        Cyrus SASL 2.1.18+ (recommended)
+        OpenSSL 0.9.7+ (recommended)
         POSIX REGEX software (required)
 
     SLAPD:

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index f71cc86fe951cca9861dc9dcf0a692eecb311bf6..e5046357cb487b26129344c24925029e374399e5 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -1128,7 +1128,9 @@ static int process_response(
        }
 
        if( ldap_msgtype( res ) != LDAP_RES_INTERMEDIATE ) {
-               return ldap_result2error( ld, res, 1 );
+               rc = ldap_result2error( ld, res, 1 );
+               if( rc != LDAP_SUCCESS ) ldap_perror( ld, opstr );
+               return rc;
        }
 
 #ifdef LDAP_GROUP_TRANSACTION