import fix to ITS#3257 from HEAD

diff --git a/CHANGES b/CHANGES
index ff8a6555c961248b12a1abe647534b7b84a6ffd4..a3f76377faf8db893595ccfb1c3fdce600efd15b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ OpenLDAP 2.2.15 Engineering
        Fixed libldap DN '=' handling
        Fixed libldap_r runqueue bug
        Fixed librewrite empty rewriteContext leak (ITS#3256)
+       Fixed ldapmodify controls input bug (ITS#3257)
        Updated libldap_r read/writer locks
        Build environments
                Added additional res_query detection for MacOS X

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index e5046357cb487b26129344c24925029e374399e5..e0c230edbbb96a9cfab700bea3e06a58f68c97fb 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -316,7 +316,7 @@ main( int argc, char **argv )
                )
        {
                int err;
-               int i;
+               int i = 0;
                LDAPControl c[1];
 
 #ifdef LDAP_GROUP_TRANSACTION