reflect latest changes from HEAD

diff --git a/CHANGES b/CHANGES
index f6c74cff6b7cb2ce1b62bbd09dcff697d5c9c3e8..757c692657a205fbb4ff58e3500663b5883cc568 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ OpenLDAP 2.1 Change Log
 
 OpenLDAP 2.1.10 Engineering
        Fixed slapd empty values return filter control bug (ITS#2219)
+       Fixed slapd empty oid control bug
+       Fixed ldapsearch empty baseObject bug
+       Fixed slapd acl/group value_find_ex() bug (ITS#2227)
+       Fixed slapd NameAndOptionalUID bug
 
 OpenLDAP 2.1.9 Release
        Fixed back-bdb moddn newSuperior bug

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 7b0726e86aef61d37714ea134d21353beb1fef7d..e13cfd3773970c2920d1d319ed32ff60a83137e1 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -98,7 +98,8 @@ main( int argc, char **argv )
 {
        char            buf[ 4096 ];
        FILE            *fp;
-       int             i, rc, authmethod, referrals, want_bindpw, version, debug, manageDSAit, noop, crit;
+       int             i, rc, retval, authmethod, referrals, want_bindpw;
+       int             version, debug, manageDSAit, noop, crit;
        char    *pw_file;
        char    *control, *cvalue;
 
@@ -730,14 +731,17 @@ main( int argc, char **argv )
                }
        }
 
-       rc = 0;
+       retval = rc = 0;
 
     if ( fp == NULL ) {
                for ( ; optind < argc; ++optind ) {
                        rc = dodelete( ld, argv[ optind ] );
 
                        /* Stop on error and no -c option */
-                       if( rc != 0 && contoper == 0) break;
+                       if( rc != 0 ) {
+                               retval = rc;
+                               if( contoper == 0 ) break;
+                       }
                }
        } else {
                while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
@@ -745,13 +749,15 @@ main( int argc, char **argv )
 
                        if ( *buf != '\0' ) {
                                rc = dodelete( ld, buf );
+                               if ( rc != 0 )
+                                       retval = rc;
                        }
                }
        }
 
     ldap_unbind( ld );
 
-       return( rc );
+    return( retval );
 }
 
 

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 2ade1074e80994882d2c9b35b7f02dbe8716850b..47419fc320c1811156005aa699f15ae2f160c51b 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -111,7 +111,8 @@ main(int argc, char **argv)
 {
     char               *infile, *entrydn = NULL, *rdn = NULL, buf[ 4096 ];
     FILE               *fp;
-       int             rc, i, remove, havedn, authmethod, version, want_bindpw, debug, manageDSAit, noop, crit;
+       int             rc, retval, i, remove, havedn, authmethod, version;
+       int             want_bindpw, debug, manageDSAit, noop, crit;
        int             referrals;
     char       *newSuperior=NULL;
        char    *pw_file = NULL;
@@ -765,9 +766,9 @@ main(int argc, char **argv)
                }
        }
 
-    rc = 0;
+    retval = rc = 0;
     if (havedn)
-       rc = domodrdn( ld, entrydn, rdn, newSuperior, remove );
+       retval = domodrdn( ld, entrydn, rdn, newSuperior, remove );
     else while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
        if ( *buf != '\0' ) {   /* blank lines optional, skip */
            buf[ strlen( buf ) - 1 ] = '\0';    /* remove nl */
@@ -778,6 +779,8 @@ main(int argc, char **argv)
                     return( EXIT_FAILURE );
                }
                rc = domodrdn(ld, entrydn, rdn, newSuperior, remove );
+               if ( rc != 0 )
+                       retval = rc;
                havedn = 0;
            } else if ( !havedn ) {     /* don't have DN yet */
                if (( entrydn = strdup( buf )) == NULL ) {
@@ -791,8 +794,7 @@ main(int argc, char **argv)
 
     ldap_unbind( ld );
 
-       /* UNREACHABLE */
-       return( rc );
+    return( retval );
 }
 
 static int domodrdn(