X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapmodrdn.c;h=4c77b6fbeded977bcf677ea7422867e531268501;hb=9bc2cd3987b0bf5b86c2b9be417d7119f2e9d623;hp=33c4b2934e3cfcbaf2d257c73f429799b165ca50;hpb=e7462c7bda81ac5937e48904b5274669a1c336f2;p=openldap

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 33c4b2934e..4c77b6fbed 100644
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 1998-2001 Net Boolean Incorporated.
  * Portions Copyright 2001-2003 IBM Corporation.
@@ -154,7 +154,7 @@ main(int argc, char **argv)
     LDAP		*ld;
 	int		rc, retval, havedn;
 
-    tool_init();
+    tool_init( TOOL_MODRDN );
     prog = lutil_progname( "ldapmodrdn", argc, argv );
 
 	tool_args( argc, argv );
@@ -198,15 +198,13 @@ main(int argc, char **argv)
 
 	tool_bind( ld );
 
-	if ( assertion || authzid || manageDSAit || noop ) {
-		tool_server_controls( ld, NULL, 0 );
-	}
+	tool_server_controls( ld, NULL, 0 );
 
     retval = rc = 0;
     if (havedn)
 	retval = domodrdn( ld, entrydn, rdn, newSuperior, remove_old_RDN );
     else while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
-	if ( *buf != '\0' ) {	/* blank lines optional, skip */
+	if ( *buf != '\n' ) {	/* blank lines optional, skip */
 	    buf[ strlen( buf ) - 1 ] = '\0';	/* remove nl */
 
 	    if ( havedn ) {	/* have DN, get RDN */
@@ -253,7 +251,7 @@ static int domodrdn(
 		}
 	}
 
-	if( not ) return LDAP_SUCCESS;
+	if( dont ) return LDAP_SUCCESS;
 
 	rc = ldap_rename( ld, dn, rdn, newSuperior, remove,
 		NULL, NULL, &id );
@@ -265,7 +263,7 @@ static int domodrdn(
 	}
 
 	for ( ; ; ) {
-		struct timeval	tv = { 0 };
+		struct timeval	tv = { 0, 0 };
 
 		if ( tool_check_abandon( ld, id ) ) {
 			return LDAP_CANCELLED;
@@ -276,7 +274,7 @@ static int domodrdn(
 
 		rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
 		if ( rc < 0 ) {
-			ldap_perror( ld, "ldapmodrdn: ldap_result" );
+			tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
 			return rc;
 		}