ITS#7935 partially revert prev patch

[openldap] / tests / progs / slapd-modrdn.c

diff --git a/tests/progs/slapd-modrdn.c b/tests/progs/slapd-modrdn.c
index c2bd0fa948b7ac866c77d652f83748e44043c4cf..4882b0395fc473a462041bf2fef49add22a9fab8 100644 (file)
--- a/tests/progs/slapd-modrdn.c
+++ b/tests/progs/slapd-modrdn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2008 The OpenLDAP Foundation.
+ * Copyright 1999-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -183,7 +183,7 @@ do_modrdn( char *uri, char *manager,
        int delay, int friendly, int chaserefs )
 {
        LDAP    *ld = NULL;
-       int     i = 0, do_retry = maxretries;
+       int     i, do_retry = maxretries;
        char    *DNs[2];
        char    *rdns[2];
        int     rc = LDAP_SUCCESS;
@@ -208,6 +208,8 @@ do_modrdn( char *uri, char *manager,
        rdns[0] = strdup( DNs[1] );
        DNs[1][i] = ',';
 
+       i = 0;
+
 retry:;
        ldap_initialize( &ld, uri );
        if ( ld == NULL ) {
@@ -298,9 +300,11 @@ retry:;
        }
 
 done:;
-       fprintf( stderr, " PID=%ld - Modrdn done (%d).\n", (long) pid, rc );
+       fprintf( stderr, "  PID=%ld - Modrdn done (%d).\n", (long) pid, rc );
 
        ldap_unbind_ext( ld, NULL, NULL );
-}
-
 
+       free( DNs[1] );
+       free( rdns[0] );
+       free( rdns[1] );
+}