X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapmodify.c;h=70d231926590d350e43cc5aa09fa4250c44a2214;hb=0ba4206ed93215f2c5c2d12d16342d6a846c278a;hp=f71cc86fe951cca9861dc9dcf0a692eecb311bf6;hpb=db18784462ef444357b6b8e732d48fa2a4836fe6;p=openldap

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index f71cc86fe9..70d2319265 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -2,7 +2,8 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Portions Copyright 2006 Howard Chu.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 1998-2001 Net Boolean Incorporated.
  * Portions Copyright 2001-2003 IBM Corporation.
@@ -32,6 +33,7 @@
  * include:
  *   Kurt D. Zeilenga
  *   Norbert Klasen
+ *   Howard Chu
  */
 
 #include "portable.h"
@@ -42,6 +44,8 @@
 #include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
+#include <ac/socket.h>
+#include <ac/time.h>
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -60,70 +64,40 @@
 #include "lutil_ldap.h"
 #include "ldif.h"
 #include "ldap_defaults.h"
-#include "ldap_log.h"
 #include "ldap_pvt.h"
+#include "lber_pvt.h"
 
 #include "common.h"
 
-
-static int	ldapadd, force = 0;
+static int	ldapadd;
 static char *rejfile = NULL;
 static LDAP	*ld = NULL;
 
-#define LDAPMOD_MAXLINE		4096
-
-/* strings found in replog/LDIF entries (mostly lifted from slurpd/slurp.h) */
-#define T_VERSION_STR		"version"
-#define T_REPLICA_STR		"replica"
-#define T_DN_STR			"dn"
-#define T_CONTROL_STR		"control"
-#define T_CHANGETYPESTR		"changetype"
-#define T_ADDCTSTR			"add"
-#define T_MODIFYCTSTR		"modify"
-#define T_DELETECTSTR		"delete"
-#define T_MODRDNCTSTR		"modrdn"
-#define T_MODDNCTSTR		"moddn"
-#define T_RENAMECTSTR		"rename"
-#define T_MODOPADDSTR		"add"
-#define T_MODOPREPLACESTR	"replace"
-#define T_MODOPDELETESTR	"delete"
-#define T_MODOPINCREMENTSTR	"increment"
-#define T_MODSEPSTR			"-"
-#define T_NEWRDNSTR			"newrdn"
-#define T_DELETEOLDRDNSTR	"deleteoldrdn"
-#define T_NEWSUPSTR			"newsuperior"
-
-
-static int process_ldif_rec LDAP_P(( char *rbuf, int count ));
-static int parse_ldif_control LDAP_P(( char *line, LDAPControl ***pctrls ));
-static void addmodifyop LDAP_P((
-	LDAPMod ***pmodsp, int modop,
-	const char *attr,
-	struct berval *value ));
+static int process_ldif_rec LDAP_P(( char *rbuf, int lineno ));
 static int domodify LDAP_P((
-	const char *dn,
+	const struct berval *dn,
 	LDAPMod **pmods,
 	LDAPControl **pctrls,
 	int newentry ));
 static int dodelete LDAP_P((
-	const char *dn,
+	const struct berval *dn,
 	LDAPControl **pctrls ));
 static int dorename LDAP_P((
-	const char *dn,
-	const char *newrdn,
-	const char *newsup,
+	const struct berval *dn,
+	const struct berval *newrdn,
+	const struct berval *newsup,
 	int deleteoldrdn,
 	LDAPControl **pctrls ));
 static int process_response(
 	LDAP *ld,
 	int msgid,
-	const char *opstr,
-	const char *dn );
-static char *read_one_record LDAP_P(( FILE *fp ));
+	int res,
+	const struct berval *dn );
 
-#ifdef LDAP_GROUP_TRANSACTION
+#ifdef LDAP_X_TXN
 static int txn = 0;
 static int txnabort = 0;
+struct berval *txn_id = NULL;
 #endif
 
 void
@@ -137,13 +111,16 @@ usage( void )
 	fprintf( stderr, _("Add or modify options:\n"));
 	fprintf( stderr, _("  -a         add values (%s)\n"),
 		(ldapadd ? _("default") : _("default is to replace")));
+	fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
 	fprintf( stderr, _("  -E [!]ext=extparam	modify extensions"
 		" (! indicate s criticality)\n"));
-#ifdef LDAP_GROUP_TRANSACTION
+	fprintf( stderr, _("  -f file    read operations from `file'\n"));
+	fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+	fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
+#ifdef LDAP_X_TXN
  	fprintf( stderr,
-		_("             [!]txn                      (transaction)\n"));
+		_("             [!]txn=<commit|abort>         (transaction)\n"));
 #endif
-	fprintf( stderr, _("  -F         force all changes records to be used\n"));
 	fprintf( stderr, _("  -S file    write skipped modifications to `file'\n"));
 
 	tool_common_usage();
@@ -151,8 +128,8 @@ usage( void )
 }
 
 
-const char options[] = "aE:FrS:"
-	"cd:D:e:f:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z";
+const char options[] = "aE:rS:"
+	"cd:D:e:f:h:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
 
 int
 handle_private_option( int i )
@@ -184,7 +161,7 @@ handle_private_option( int i )
 			*cvalue++ = '\0';
 		}
 
-#ifdef LDAP_GROUP_TRANSACTION
+#ifdef LDAP_X_TXN
 		if( strcasecmp( control, "txn" ) == 0 ) {
 			/* Transaction */
 			if( txn ) {
@@ -210,15 +187,12 @@ handle_private_option( int i )
 				control );
 			usage();
 		}
+		break;
 
 	case 'a':	/* add */
 		ldapadd = 1;
 		break;
 
-	case 'F':	/* force all changes records to be used */
-		force = 1;
-		break;
-
 	case 'r':	/* replace (obsolete) */
 		break;
 
@@ -240,22 +214,23 @@ handle_private_option( int i )
 int
 main( int argc, char **argv )
 {
-#ifdef LDAP_GROUP_TRANSACTION
-	BerElement *txnber;
-	struct berval txnCookie = { 0, NULL };
-#endif
-	char		*rbuf, *start, *rejbuf = NULL;
-	FILE		*fp, *rejfp;
+	char		*rbuf = NULL, *rejbuf = NULL;
+	FILE		*rejfp;
+	struct LDIFFP *ldiffp, ldifdummy = {0};
 	char		*matched_msg, *error_msg;
-	int		rc, retval;
-	int count, len;
+	int		rc, retval, ldifrc;
+	int		len;
+	int		i = 0;
+	int		lineno, nextline = 0, lmax = 0;
+	LDAPControl	c[1];
 
-	tool_init();
 	prog = lutil_progname( "ldapmodify", argc, argv );
 
 	/* strncmp instead of strcmp since NT binaries carry .exe extension */
 	ldapadd = ( strncasecmp( prog, "ldapadd", sizeof("ldapadd")-1 ) == 0 );
 
+	tool_init( ldapadd ? TOOL_ADD : TOOL_MODIFY );
+
 	tool_args( argc, argv );
 
 	if ( argc != optind ) usage();
@@ -263,106 +238,83 @@ main( int argc, char **argv )
 	if ( rejfile != NULL ) {
 		if (( rejfp = fopen( rejfile, "w" )) == NULL ) {
 			perror( rejfile );
-			return( EXIT_FAILURE );
+			retval = EXIT_FAILURE;
+			goto fail;
 		}
 	} else {
 		rejfp = NULL;
 	}
 
 	if ( infile != NULL ) {
-		if (( fp = fopen( infile, "r" )) == NULL ) {
+		if (( ldiffp = ldif_open( infile, "r" )) == NULL ) {
 			perror( infile );
-			return( EXIT_FAILURE );
+			retval = EXIT_FAILURE;
+			goto fail;
 		}
 	} else {
-		fp = stdin;
+		ldifdummy.fp = stdin;
+		ldiffp = &ldifdummy;
 	}
 
 	if ( debug ) ldif_debug = debug;
 
-	ld = tool_conn_setup( not, 0 );
+	ld = tool_conn_setup( dont, 0 );
 
-	if ( !not ) {
-		if ( pw_file || want_bindpw ) {
-			if ( pw_file ) {
-				rc = lutil_get_filed_password( pw_file, &passwd );
-				if( rc ) return EXIT_FAILURE;
-			} else {
-				passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
-				passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
-			}
-		}
+	if ( !dont ) {
 		tool_bind( ld );
 	}
 
-#ifdef LDAP_GROUP_TRANSACTION
+#ifdef LDAP_X_TXN
 	if( txn ) {
-		struct berval *txnCookiep = &txnCookie;
-
-		/* create transaction */
-		rc = ldap_txn_create_s( ld, &txnCookiep, NULL, NULL );
+		/* start transaction */
+		rc = ldap_txn_start_s( ld, NULL, NULL, &txn_id );
 		if( rc != LDAP_SUCCESS ) {
-			ldap_perror( ld, "ldap_txn_create_s" );
-			if( txn > 2 ) return EXIT_FAILURE;
+			tool_perror( "ldap_txn_start_s", rc, NULL, NULL, NULL, NULL );
+			if( txn > 1 ) {
+				retval = EXIT_FAILURE;
+				goto fail;
+			}
 			txn = 0;
 		}
 	}
 #endif
 
-	if ( assertion || authzid || manageDSAit || noop || preread || postread
-#ifdef LDAP_GROUP_TRANSACTION
+	if ( 0
+#ifdef LDAP_X_TXN
 		|| txn
 #endif
 		)
 	{
-		int err;
-		int i;
-		LDAPControl c[1];
-
-#ifdef LDAP_GROUP_TRANSACTION
+#ifdef LDAP_X_TXN
 		if( txn ) {
-			txnber = ber_alloc_t( LBER_USE_DER );
-			if( txnber == NULL ) return EXIT_FAILURE;
-
-			err = ber_printf( txnber, "{o}", &txnCookie );
-			if( err == -1 ) {
-				ber_free( txnber, 1 );
-				fprintf( stderr, _("txn grouping control encoding error!\n") );
-				return EXIT_FAILURE;
-			}
-
-			err = ber_flatten2( txnber, &c[i].ldctl_value, 0 );
-			if( err == -1 ) return EXIT_FAILURE;
-
-			c[i].ldctl_oid = LDAP_CONTROL_GROUPING;
+			c[i].ldctl_oid = LDAP_CONTROL_X_TXN_SPEC;
+			c[i].ldctl_value = *txn_id;
 			c[i].ldctl_iscritical = 1;
 			i++;
 		}
 #endif
-
-		tool_server_controls( ld, c, i );
 	}
 
+	tool_server_controls( ld, c, i );
+
 	rc = 0;
-	count = 0;
 	retval = 0;
-	while (( rc == 0 || contoper ) &&
-		( rbuf = read_one_record( fp )) != NULL )
+	lineno = 1;
+	while (( rc == 0 || contoper ) && ( ldifrc = ldif_read_record( ldiffp, &nextline,
+		&rbuf, &lmax )) > 0 )
 	{
-		count++;
-
-		start = rbuf;
-
 		if ( rejfp ) {
 			len = strlen( rbuf );
 			if (( rejbuf = (char *)ber_memalloc( len+1 )) == NULL ) {
 				perror( "malloc" );
-				exit( EXIT_FAILURE );
+				retval = EXIT_FAILURE;
+				goto fail;
 			}
 			memcpy( rejbuf, rbuf, len+1 );
 		}
 
-		rc = process_ldif_rec( start, count );
+		rc = process_ldif_rec( rbuf, lineno );
+		lineno = nextline+1;
 
 		if ( rc ) retval = rc;
 		if ( rc && rejfp ) {
@@ -378,7 +330,7 @@ main( int argc, char **argv )
 			}
 
 			error_msg = NULL;
-			ldap_get_option(ld, LDAP_OPT_ERROR_STRING, &error_msg);
+			ldap_get_option(ld, LDAP_OPT_DIAGNOSTIC_MESSAGE, &error_msg);
 			if ( error_msg != NULL ) {
 				if ( *error_msg != '\0' ) {
 					fprintf( rejfp, _(", additional info: %s"), error_msg );
@@ -388,323 +340,114 @@ main( int argc, char **argv )
 			fprintf( rejfp, "\n%s\n", rejbuf );
 		}
 
-		if (rejfp) free( rejbuf );
-		free( rbuf );
+		if (rejfp) ber_memfree( rejbuf );
 	}
+	ber_memfree( rbuf );
+
+	if ( ldifrc < 0 )
+		retval = LDAP_OTHER;
+
+#ifdef LDAP_X_TXN
+	if( retval == 0 && txn ) {
+		rc = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, NULL );
+		if ( rc != LDAP_OPT_SUCCESS ) {
+			fprintf( stderr, "Could not unset controls for ldap_txn_end\n");
+		}
 
-#ifdef LDAP_GROUP_TRANSACTION
-	if( txn ) {
 		/* create transaction */
-		rc = ldap_txn_end_s( ld, &txnCookie, !txnabort, NULL, NULL );
+		rc = ldap_txn_end_s( ld, !txnabort, txn_id, NULL, NULL, NULL );
 		if( rc != LDAP_SUCCESS ) {
-			ldap_perror( ld, "ldap_txn_create_s" );
-			if( txn > 2 ) return EXIT_FAILURE;
-			txn = 0;
+			tool_perror( "ldap_txn_end_s", rc, NULL, NULL, NULL, NULL );
+			retval = rc;
 		}
 	}
 #endif
 
-	if ( !not ) {
-		ldap_unbind_ext( ld, NULL, NULL );
+	if ( !dont && ld != NULL ) {
+		tool_unbind( ld );
 	}
 
+	tool_destroy();
+
+fail:;
 	if ( rejfp != NULL ) {
 		fclose( rejfp );
 	}
 
+	if ( ldiffp != NULL && ldiffp != &ldifdummy ) {
+		ldif_close( ldiffp );
+	}
+
 	return( retval );
 }
 
 
 static int
-process_ldif_rec( char *rbuf, int count )
+process_ldif_rec( char *rbuf, int linenum )
 {
-	char	*line, *dn, *type, *newrdn, *newsup, *p;
-	int		rc, linenum, modop, replicaport;
-	int		expect_modop, expect_sep, expect_ct, expect_newrdn, expect_newsup;
-	int		expect_deleteoldrdn, deleteoldrdn;
-	int		saw_replica, use_record, new_entry, delete_entry, got_all;
-	LDAPMod	**pmods;
-	int version;
-	struct berval val;
-	LDAPControl **pctrls;
-
-	new_entry = ldapadd;
-
-	rc = got_all = saw_replica = delete_entry = modop = expect_modop = 0;
-	expect_deleteoldrdn = expect_newrdn = expect_newsup = 0;
-	expect_sep = expect_ct = 0;
-	linenum = 0;
-	version = 0;
-	deleteoldrdn = 1;
-	use_record = force;
-	pmods = NULL;
-	pctrls = NULL;
-	dn = newrdn = newsup = NULL;
-
-	while ( rc == 0 && ( line = ldif_getline( &rbuf )) != NULL ) {
-		++linenum;
-
-		if ( expect_sep && strcasecmp( line, T_MODSEPSTR ) == 0 ) {
-			expect_sep = 0;
-			expect_ct = 1;
-			continue;
-		}
-	
-		if ( ldif_parse_line( line, &type, &val.bv_val, &val.bv_len ) < 0 ) {
-			fprintf( stderr, _("%s: invalid format (line %d) entry: \"%s\"\n"),
-				prog, linenum, dn == NULL ? "" : dn );
-			rc = LDAP_PARAM_ERROR;
-			break;
-		}
-
-		if ( dn == NULL ) {
-			if ( !use_record && strcasecmp( type, T_REPLICA_STR ) == 0 ) {
-				++saw_replica;
-				if (( p = strchr( val.bv_val, ':' )) == NULL ) {
-					replicaport = 0;
-				} else {
-					*p++ = '\0';
-					replicaport = atoi( p );
-				}
-				if ( ldaphost != NULL &&
-					strcasecmp( val.bv_val, ldaphost ) == 0 &&
-					replicaport == ldapport )
-				{
-					use_record = 1;
-				}
-	    	} else if ( count == 1 && linenum == 1 && 
-				strcasecmp( type, T_VERSION_STR ) == 0 )
-			{
-				if( val.bv_len == 0 || atoi(val.bv_val) != 1 ) {
-					fprintf( stderr,
-						_("%s: invalid version %s, line %d (ignored)\n"),
-						prog, val.bv_val, linenum );
-				}
-				version++;
-
-			} else if ( strcasecmp( type, T_DN_STR ) == 0 ) {
-				if (( dn = ber_strdup( val.bv_val )) == NULL ) {
-					perror( "strdup" );
-					exit( EXIT_FAILURE );
-				}
-				expect_ct = 1;
-			}
-			goto end_line;	/* skip all lines until we see "dn:" */
-		}
-
-		if ( expect_ct ) {
-			/* Check for "control" tag after dn and before changetype. */
-			if (strcasecmp(type, T_CONTROL_STR) == 0) {
-				/* Parse and add it to the list of controls */
-				rc = parse_ldif_control( line, &pctrls );
-				if (rc != 0) {
-					fprintf( stderr,
-						_("%s: Error processing %s line, line %d: %s\n"),
-						prog, T_CONTROL_STR, linenum, ldap_err2string(rc) );
-				}
-				goto end_line;
-			}
-
-			expect_ct = 0;
-			if ( !use_record && saw_replica ) {
-				printf(_("%s: skipping change record for entry: %s\n"),
-					prog, dn);
-				printf(_("\t(LDAP host/port does not match replica: lines)\n"));
-				free( dn );
-				ber_memfree( type );
-				ber_memfree( val.bv_val );
-				return( 0 );
-			}
-
-			if ( strcasecmp( type, T_CHANGETYPESTR ) == 0 ) {
-#ifdef LIBERAL_CHANGETYPE_MODOP
-				/* trim trailing spaces (and log warning ...) */
-				int icnt;
-				for ( icnt = val.bv_len; --icnt > 0; ) {
-					if ( !isspace( (unsigned char) val.bv_val[icnt] ) ) {
-						break;
-					}
-				}
-
-				if ( ++icnt != val.bv_len ) {
-					fprintf( stderr, _("%s: illegal trailing space after"
-						" \"%s: %s\" trimmed (line %d of entry \"%s\")\n"),
-						prog, T_CHANGETYPESTR, val.bv_val, linenum, dn );
-					val.bv_val[icnt] = '\0';
-				}
-#endif /* LIBERAL_CHANGETYPE_MODOP */
-
-				if ( strcasecmp( val.bv_val, T_MODIFYCTSTR ) == 0 ) {
-					new_entry = 0;
-					expect_modop = 1;
-				} else if ( strcasecmp( val.bv_val, T_ADDCTSTR ) == 0 ) {
-					new_entry = 1;
-				} else if ( strcasecmp( val.bv_val, T_MODRDNCTSTR ) == 0
-					|| strcasecmp( val.bv_val, T_MODDNCTSTR ) == 0
-					|| strcasecmp( val.bv_val, T_RENAMECTSTR ) == 0)
-				{
-					expect_newrdn = 1;
-				} else if ( strcasecmp( val.bv_val, T_DELETECTSTR ) == 0 ) {
-					got_all = delete_entry = 1;
-				} else {
-					fprintf( stderr,
-						_("%s:  unknown %s \"%s\" (line %d of entry \"%s\")\n"),
-						prog, T_CHANGETYPESTR, val.bv_val, linenum, dn );
-					rc = LDAP_PARAM_ERROR;
-				}
-				goto end_line;
-			} else if ( ldapadd ) {		/*  missing changetype => add */
-				new_entry = 1;
-				modop = LDAP_MOD_ADD;
-			} else {
-				expect_modop = 1;	/* missing changetype => modify */
-			}
-		}
-
-		if ( expect_modop ) {
-#ifdef LIBERAL_CHANGETYPE_MODOP
-			/* trim trailing spaces (and log warning ...) */
-		    int icnt;
-		    for ( icnt = val.bv_len; --icnt > 0; ) {
-				if ( !isspace( (unsigned char) val.bv_val[icnt] ) ) break;
-			}
-    
-			if ( ++icnt != val.bv_len ) {
-				fprintf( stderr, _("%s: illegal trailing space after"
-					" \"%s: %s\" trimmed (line %d of entry \"%s\")\n"),
-					prog, type, val.bv_val, linenum, dn );
-				val.bv_val[icnt] = '\0';
-			}
-#endif /* LIBERAL_CHANGETYPE_MODOP */
-
-			expect_modop = 0;
-			expect_sep = 1;
-			if ( strcasecmp( type, T_MODOPADDSTR ) == 0 ) {
-				modop = LDAP_MOD_ADD;
-				goto end_line;
-			} else if ( strcasecmp( type, T_MODOPREPLACESTR ) == 0 ) {
-				modop = LDAP_MOD_REPLACE;
-				addmodifyop( &pmods, modop, val.bv_val, NULL );
-				goto end_line;
-			} else if ( strcasecmp( type, T_MODOPDELETESTR ) == 0 ) {
-				modop = LDAP_MOD_DELETE;
-				addmodifyop( &pmods, modop, val.bv_val, NULL );
-				goto end_line;
-			} else if ( strcasecmp( type, T_MODOPINCREMENTSTR ) == 0 ) {
-				modop = LDAP_MOD_INCREMENT;
-				addmodifyop( &pmods, modop, val.bv_val, NULL );
-				goto end_line;
-			} else {	/* no modify op:  use default */
-				modop = ldapadd ? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
-			}
-		}
-
-		if ( expect_newrdn ) {
-			if ( strcasecmp( type, T_NEWRDNSTR ) == 0 ) {
-				if (( newrdn = ber_strdup( val.bv_val )) == NULL ) {
-					perror( "strdup" );
-					exit( EXIT_FAILURE );
-				}
-				expect_deleteoldrdn = 1;
-				expect_newrdn = 0;
-			} else {
-				fprintf( stderr, _("%s: expecting \"%s:\" but saw"
-					" \"%s:\" (line %d of entry \"%s\")\n"),
-					prog, T_NEWRDNSTR, type, linenum, dn );
-				rc = LDAP_PARAM_ERROR;
-			}
-		} else if ( expect_deleteoldrdn ) {
-			if ( strcasecmp( type, T_DELETEOLDRDNSTR ) == 0 ) {
-				deleteoldrdn = ( *val.bv_val == '0' ) ? 0 : 1;
-				expect_deleteoldrdn = 0;
-				expect_newsup = 1;
-				got_all = 1;
-			} else {
-				fprintf( stderr, _("%s: expecting \"%s:\" but saw"
-					" \"%s:\" (line %d of entry \"%s\")\n"),
-					prog, T_DELETEOLDRDNSTR, type, linenum, dn );
-				rc = LDAP_PARAM_ERROR;
-			}
-		} else if ( expect_newsup ) {
-			if ( strcasecmp( type, T_NEWSUPSTR ) == 0 ) {
-				if (( newsup = ber_strdup( val.bv_val )) == NULL ) {
-					perror( "strdup" );
-					exit( EXIT_FAILURE );
-				}
-				expect_newsup = 0;
-			} else {
-				fprintf( stderr, _("%s: expecting \"%s:\" but saw"
-					" \"%s:\" (line %d of entry \"%s\")\n"),
-					prog, T_NEWSUPSTR, type, linenum, dn );
-				rc = LDAP_PARAM_ERROR;
-			}
-		} else if ( got_all ) {
-			fprintf( stderr,
-				_("%s: extra lines at end (line %d of entry \"%s\")\n"),
-				prog, linenum, dn );
-			rc = LDAP_PARAM_ERROR;
-		} else {
-			addmodifyop( &pmods, modop, type, &val );
-		}
+	LDIFRecord lr;
+	int lrflags = ldapadd ? LDIF_DEFAULT_ADD : 0;
+	int rc;
+	struct berval rbuf_bv;
 
-end_line:
-		ber_memfree( type );
-		ber_memfree( val.bv_val );
+#ifdef TEST_LDIF_API
+	if ( getenv( "LDIF_ENTRIES_ONLY" ) ) {
+		lrflags |= LDIF_ENTRIES_ONLY;
 	}
-
-	if( linenum == 0 ) {
-		return 0;
+	if ( getenv( "LDIF_NO_CONTROLS" ) ) {
+		lrflags |= LDIF_NO_CONTROLS;
 	}
+#endif /* TEST_LDIF_API */
 
-	if( version && linenum == 1 ) {
-		return 0;
-	}
+	rbuf_bv.bv_val = rbuf;
+	rbuf_bv.bv_len = 0; /* not used */
+	rc = ldap_parse_ldif_record( &rbuf_bv, linenum, &lr, prog, lrflags );
 
 	/* If default controls are set (as with -M option) and controls are
 	   specified in the LDIF file, we must add the default controls to
 	   the list of controls sent with the ldap operation.
 	*/
 	if ( rc == 0 ) {
-		if (pctrls) {
+		if (lr.lr_ctrls) {
 			LDAPControl **defctrls = NULL;   /* Default server controls */
 			LDAPControl **newctrls = NULL;
 			ldap_get_option(ld, LDAP_OPT_SERVER_CONTROLS, &defctrls);
 			if (defctrls) {
 				int npc=0;                       /* Num of LDIF controls */
 				int ndefc=0;                     /* Num of default controls */
-				while (pctrls[npc]) npc++;       /* Count LDIF controls */
+				while (lr.lr_ctrls[npc]) npc++;       /* Count LDIF controls */
 				while (defctrls[ndefc]) ndefc++; /* Count default controls */
-				newctrls = ber_memrealloc(pctrls,
+				newctrls = ber_memrealloc(lr.lr_ctrls,
 					(npc+ndefc+1)*sizeof(LDAPControl*));
 
 				if (newctrls == NULL) {
 					rc = LDAP_NO_MEMORY;
 				} else {
 					int i;
-					pctrls = newctrls;
+					lr.lr_ctrls = newctrls;
 					for (i=npc; i<npc+ndefc; i++) {
-						pctrls[i] = ldap_control_dup(defctrls[i-npc]);
-						if (pctrls[i] == NULL) {
+						lr.lr_ctrls[i] = ldap_control_dup(defctrls[i-npc]);
+						if (lr.lr_ctrls[i] == NULL) {
 							rc = LDAP_NO_MEMORY;
 							break;
 						}
 					}
-					pctrls[npc+ndefc] = NULL;
+					lr.lr_ctrls[npc+ndefc] = NULL;
 				}
 				ldap_controls_free(defctrls);  /* Must be freed by library */
 			}
 		}
 	}
 
-
 	if ( rc == 0 ) {
-		if ( delete_entry ) {
-			rc = dodelete( dn, pctrls );
-		} else if ( newrdn != NULL ) {
-			rc = dorename( dn, newrdn, newsup, deleteoldrdn, pctrls );
+		if ( LDAP_REQ_DELETE == lr.lr_op ) {
+			rc = dodelete( &lr.lr_dn, lr.lr_ctrls );
+		} else if ( LDAP_REQ_RENAME == lr.lr_op ) {
+			rc = dorename( &lr.lr_dn, &lr.lrop_newrdn, &lr.lrop_newsup, lr.lrop_delold, lr.lr_ctrls );
+		} else if ( ( LDAP_REQ_ADD == lr.lr_op ) || ( LDAP_REQ_MODIFY == lr.lr_op ) ) {
+			rc = domodify( &lr.lr_dn, lr.lrop_mods, lr.lr_ctrls, LDAP_REQ_ADD == lr.lr_op );
 		} else {
-			rc = domodify( dn, pmods, pctrls, new_entry );
+			/* record skipped e.g. version: or comment or something we don't handle yet */
 		}
 
 		if ( rc == LDAP_SUCCESS ) {
@@ -712,236 +455,15 @@ end_line:
 		}
 	}
 
-	if ( dn != NULL ) {
-		free( dn );
-	}
-	if ( newrdn != NULL ) {
-		free( newrdn );
-	}
-	if ( pmods != NULL ) {
-		ldap_mods_free( pmods, 1 );
-	}
-    if (pctrls != NULL) {
-    	ldap_controls_free( pctrls );
-	}
+	ldap_ldif_record_done( &lr );
 
 	return( rc );
 }
 
-/* Parse an LDIF control line of the form
-      control:  oid  [true/false]  [: value]              or
-      control:  oid  [true/false]  [:: base64-value]      or
-      control:  oid  [true/false]  [:< url]
-   The control is added to the list of controls in *ppctrls.
-*/      
-static int
-parse_ldif_control(
-	char *line, 
-	LDAPControl ***ppctrls )
-{
-	char *oid = NULL;
-	int criticality = 0;   /* Default is false if not present */
-	char *type=NULL;
-	char *val = NULL;
-	ber_len_t value_len = 0;
-	int i, rc=0;
-	char *s, *oidStart, *pcolon;
-	LDAPControl *newctrl = NULL;
-	LDAPControl **pctrls = NULL;
-
-	if (ppctrls) pctrls = *ppctrls;
-	s = line + strlen(T_CONTROL_STR);  /* Skip over "control" */
-	pcolon = s;                        /* Save this position for later */
-	if (*s++ != ':') {                 /* Make sure colon follows */
-		return ( LDAP_PARAM_ERROR );
-	}
-	while (*s && isspace((unsigned char)*s)) {
-		s++;                           /* Skip white space before OID */
-	}
-
-	/* OID should come next. Validate and extract it. */
-	if (*s == 0) return ( LDAP_PARAM_ERROR );
-	oidStart = s;
-	while (isdigit((unsigned char)*s) || *s == '.') {
-		s++;                           /* OID should be digits or . */
-	}
-	if (s == oidStart) { 
-		return ( LDAP_PARAM_ERROR );   /* OID was not present */
-	}
-	if (*s) {                          /* End of OID should be space or NULL */
-		if (!isspace((unsigned char)*s)) {
-			return ( LDAP_PARAM_ERROR ); /* else OID contained invalid chars */
-		}
-		*s++ = 0;                    /* Replace space with null to terminate */
-	}
-
-	oid = ber_strdup(oidStart);
-	if (oid == NULL) return ( LDAP_NO_MEMORY );
-
-	/* Optional Criticality field is next. */
-	while (*s && isspace((unsigned char)*s)) {
-		s++;                         /* Skip white space before criticality */
-	}
-	if (strncasecmp(s, "true", 4) == 0) {
-		criticality = 1;
-		s += 4;
-	} 
-	else if (strncasecmp(s, "false", 5) == 0) {
-		criticality = 0;
-		s += 5;
-	}
-
-	/* Optional value field is next */
-	while (*s && isspace((unsigned char)*s)) {
-		s++;                         /* Skip white space before value */
-	}
-	if (*s) {
-		if (*s != ':') {           /* If value is present, must start with : */
-			rc = LDAP_PARAM_ERROR;
-			goto cleanup;
-		}
-
-		/* Shift value down over OID and criticality so it's in the form
-		     control: value
-		     control:: base64-value
-		     control:< url
-		   Then we can use ldif_parse_line to extract and decode the value
-		*/
-		while ( (*pcolon++ = *s++) != 0) {   /* Shift value */
-			/* EMPTY */;
-		}
-		rc = ldif_parse_line(line, &type, &val, &value_len);
-		if (type)  ber_memfree(type);   /* Don't need this field*/
-		if (rc < 0) {
-			rc = LDAP_PARAM_ERROR;
-			goto cleanup;
-		}
-    }
-
-	/* Create a new LDAPControl structure. */
-	newctrl = (LDAPControl *)ber_memalloc(sizeof(LDAPControl));
-	if ( newctrl == NULL ) {
-		rc = LDAP_NO_MEMORY;
-		goto cleanup;
-	}
-	newctrl->ldctl_oid = oid;
-	oid = NULL;
-	newctrl->ldctl_iscritical = criticality;
-	newctrl->ldctl_value.bv_len = value_len;
-	newctrl->ldctl_value.bv_val = val;
-	val = NULL;
-
-	/* Add the new control to the passed-in list of controls. */
-	i = 0;
-	if (pctrls) {
-		while ( pctrls[i] ) {    /* Count the # of controls passed in */
-			i++;
-		}
-	}
-	/* Allocate 1 more slot for the new control and 1 for the NULL. */
-	pctrls = (LDAPControl **) ber_memrealloc(pctrls,
-		(i+2)*(sizeof(LDAPControl *)));
-	if (pctrls == NULL) {
-		rc = LDAP_NO_MEMORY;
-		goto cleanup;
-	}
-	pctrls[i] = newctrl;
-	newctrl = NULL;
-	pctrls[i+1] = NULL;
-	*ppctrls = pctrls;
-
-cleanup:
-	if (newctrl) {
-		if (newctrl->ldctl_oid) ber_memfree(newctrl->ldctl_oid);
-		if (newctrl->ldctl_value.bv_val) {
-			ber_memfree(newctrl->ldctl_value.bv_val);
-		}
-		ber_memfree(newctrl);
-	}
-	if (val) ber_memfree(val);
-	if (oid) ber_memfree(oid);
-
-	return( rc );
-}
-
-
-static void
-addmodifyop(
-	LDAPMod ***pmodsp,
-	int modop,
-	const char *attr,
-	struct berval *val )
-{
-	LDAPMod		**pmods;
-	int			i, j;
-
-	pmods = *pmodsp;
-	modop |= LDAP_MOD_BVALUES;
-
-	i = 0;
-	if ( pmods != NULL ) {
-		for ( ; pmods[ i ] != NULL; ++i ) {
-			if ( strcasecmp( pmods[ i ]->mod_type, attr ) == 0 &&
-				pmods[ i ]->mod_op == modop )
-			{
-				break;
-			}
-		}
-	}
-
-	if ( pmods == NULL || pmods[ i ] == NULL ) {
-		if (( pmods = (LDAPMod **)ber_memrealloc( pmods, (i + 2) *
-			sizeof( LDAPMod * ))) == NULL )
-		{
-			perror( "realloc" );
-			exit( EXIT_FAILURE );
-		}
-
-		*pmodsp = pmods;
-		pmods[ i + 1 ] = NULL;
-
-		pmods[ i ] = (LDAPMod *)ber_memcalloc( 1, sizeof( LDAPMod ));
-		if ( pmods[ i ] == NULL ) {
-			perror( "calloc" );
-			exit( EXIT_FAILURE );
-		}
-
-		pmods[ i ]->mod_op = modop;
-		pmods[ i ]->mod_type = ber_strdup( attr );
-		if ( pmods[ i ]->mod_type == NULL ) {
-			perror( "strdup" );
-			exit( EXIT_FAILURE );
-		}
-	}
-
-	if ( val != NULL ) {
-		j = 0;
-		if ( pmods[ i ]->mod_bvalues != NULL ) {
-			for ( ; pmods[ i ]->mod_bvalues[ j ] != NULL; ++j ) {
-				/* Empty */;
-			}
-		}
-
-		pmods[ i ]->mod_bvalues = (struct berval **) ber_memrealloc(
-			pmods[ i ]->mod_bvalues, (j + 2) * sizeof( struct berval * ));
-		if ( pmods[ i ]->mod_bvalues == NULL ) {
-			perror( "ber_realloc" );
-			exit( EXIT_FAILURE );
-		}
-
-		pmods[ i ]->mod_bvalues[ j + 1 ] = NULL;
-		pmods[ i ]->mod_bvalues[ j ] = ber_bvdup( val );
-		if ( pmods[ i ]->mod_bvalues[ j ] == NULL ) {
-			perror( "ber_bvdup" );
-			exit( EXIT_FAILURE );
-		}
-	}
-}
-
 
 static int
 domodify(
-	const char *dn,
+	const struct berval *dn,
 	LDAPMod **pmods,
 	LDAPControl **pctrls,
 	int newentry )
@@ -949,53 +471,57 @@ domodify(
 	int			rc, i, j, k, notascii, op;
 	struct berval	*bvp;
 
-	if ( dn == NULL ) {
+	if ( ( dn == NULL ) || ( dn->bv_val == NULL ) ) {
 		fprintf( stderr, _("%s: no DN specified\n"), prog );
 		return( LDAP_PARAM_ERROR );
 	}
 
 	if ( pmods == NULL ) {
-		fprintf( stderr,
-			_("%s: no attributes to change or add (entry=\"%s\")\n"),
-			prog, dn );
-		return( LDAP_PARAM_ERROR );
-	} 
-
-	for ( i = 0; pmods[ i ] != NULL; ++i ) {
-		op = pmods[ i ]->mod_op & ~LDAP_MOD_BVALUES;
-		if( op == LDAP_MOD_ADD && ( pmods[i]->mod_bvalues == NULL )) {
-			fprintf( stderr,
-				_("%s: attribute \"%s\" has no values (entry=\"%s\")\n"),
-				prog, pmods[i]->mod_type, dn );
-			return LDAP_PARAM_ERROR;
-		}
-	}
+		/* implement "touch" (empty sequence)
+		 * modify operation (note that there
+		 * is no symmetry with the UNIX command,
+		 * since \"touch\" on a non-existent entry
+		 * will fail)*/
+		printf( "warning: no attributes to %sadd (entry=\"%s\")\n",
+			newentry ? "" : "change or ", dn->bv_val );
 
-	if ( verbose ) {
+	} else {
 		for ( i = 0; pmods[ i ] != NULL; ++i ) {
 			op = pmods[ i ]->mod_op & ~LDAP_MOD_BVALUES;
-			printf( "%s %s:\n",
-				op == LDAP_MOD_REPLACE ? _("replace") :
-					op == LDAP_MOD_ADD ?  _("add") :
-						op == LDAP_MOD_INCREMENT ?  _("increment") :
-							op == LDAP_MOD_DELETE ?  _("delete") :
-								_("unknown"),
-				pmods[ i ]->mod_type );
-
-			if ( pmods[ i ]->mod_bvalues != NULL ) {
-				for ( j = 0; pmods[ i ]->mod_bvalues[ j ] != NULL; ++j ) {
-					bvp = pmods[ i ]->mod_bvalues[ j ];
-					notascii = 0;
-					for ( k = 0; (unsigned long) k < bvp->bv_len; ++k ) {
-						if ( !isascii( bvp->bv_val[ k ] )) {
-							notascii = 1;
-							break;
+			if( op == LDAP_MOD_ADD && ( pmods[i]->mod_bvalues == NULL )) {
+				fprintf( stderr,
+					_("%s: attribute \"%s\" has no values (entry=\"%s\")\n"),
+					prog, pmods[i]->mod_type, dn->bv_val );
+				return LDAP_PARAM_ERROR;
+			}
+		}
+
+		if ( verbose ) {
+			for ( i = 0; pmods[ i ] != NULL; ++i ) {
+				op = pmods[ i ]->mod_op & ~LDAP_MOD_BVALUES;
+				printf( "%s %s:\n",
+					op == LDAP_MOD_REPLACE ? _("replace") :
+						op == LDAP_MOD_ADD ?  _("add") :
+							op == LDAP_MOD_INCREMENT ?  _("increment") :
+								op == LDAP_MOD_DELETE ?  _("delete") :
+									_("unknown"),
+					pmods[ i ]->mod_type );
+	
+				if ( pmods[ i ]->mod_bvalues != NULL ) {
+					for ( j = 0; pmods[ i ]->mod_bvalues[ j ] != NULL; ++j ) {
+						bvp = pmods[ i ]->mod_bvalues[ j ];
+						notascii = 0;
+						for ( k = 0; (unsigned long) k < bvp->bv_len; ++k ) {
+							if ( !isascii( bvp->bv_val[ k ] )) {
+								notascii = 1;
+								break;
+							}
+						}
+						if ( notascii ) {
+							printf( _("\tNOT ASCII (%ld bytes)\n"), bvp->bv_len );
+						} else {
+							printf( "\t%s\n", bvp->bv_val );
 						}
-					}
-					if ( notascii ) {
-						printf( _("\tNOT ASCII (%ld bytes)\n"), bvp->bv_len );
-					} else {
-						printf( "\t%s\n", bvp->bv_val );
 					}
 				}
 			}
@@ -1003,30 +529,32 @@ domodify(
 	}
 
 	if ( newentry ) {
-		printf( "%sadding new entry \"%s\"\n", not ? "!" : "", dn );
+		printf( "%sadding new entry \"%s\"\n", dont ? "!" : "", dn->bv_val );
 	} else {
-		printf( "%smodifying entry \"%s\"\n", not ? "!" : "", dn );
+		printf( "%smodifying entry \"%s\"\n", dont ? "!" : "", dn->bv_val );
 	}
 
-	if ( !not ) {
-		int msgid;
+	if ( !dont ) {
+		int	msgid;
 		if ( newentry ) {
-			rc = ldap_add_ext( ld, dn, pmods, pctrls, NULL, &msgid );
+			rc = ldap_add_ext( ld, dn->bv_val, pmods, pctrls, NULL, &msgid );
 		} else {
-			rc = ldap_modify_ext( ld, dn, pmods, pctrls, NULL, &msgid );
+			rc = ldap_modify_ext( ld, dn->bv_val, pmods, pctrls, NULL, &msgid );
 		}
 
 		if ( rc != LDAP_SUCCESS ) {
 			/* print error message about failed update including DN */
-			fprintf( stderr, _("%s: update failed: %s\n"), prog, dn );
-			ldap_perror( ld, newentry ? "ldap_add" : "ldap_modify" );
+			fprintf( stderr, _("%s: update failed: %s\n"), prog, dn->bv_val );
+			tool_perror( newentry ? "ldap_add" : "ldap_modify",
+				rc, NULL, NULL, NULL, NULL );
 			goto done;
-		} else if ( verbose ) {
-			printf( _("modify complete\n") );
 		}
-
 		rc = process_response( ld, msgid,
-			newentry ? "ldap_add" : "ldap_modify", dn );
+			newentry ? LDAP_RES_ADD : LDAP_RES_MODIFY, dn );
+
+		if ( verbose && rc == LDAP_SUCCESS ) {
+			printf( _("modify complete\n") );
+		}
 
 	} else {
 		rc = LDAP_SUCCESS;
@@ -1040,25 +568,27 @@ done:
 
 static int
 dodelete(
-	const char *dn,
+	const struct berval *dn,
 	LDAPControl **pctrls )
 {
 	int	rc;
 	int msgid;
 
-	printf( _("%sdeleting entry \"%s\"\n"), not ? "!" : "", dn );
-	if ( !not ) {
-		rc = ldap_delete_ext( ld, dn, pctrls, NULL, &msgid );
+	assert( dn != NULL );
+	assert( dn->bv_val != NULL );
+	printf( _("%sdeleting entry \"%s\"\n"), dont ? "!" : "", dn->bv_val );
+	if ( !dont ) {
+		rc = ldap_delete_ext( ld, dn->bv_val, pctrls, NULL, &msgid );
 		if ( rc != LDAP_SUCCESS ) {
-			fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn );
-			ldap_perror( ld, "ldap_delete" );
+			fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn->bv_val );
+			tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
 			goto done;
-		} else if ( verbose ) {
-			printf( _("delete complete") );
 		}
+		rc = process_response( ld, msgid, LDAP_RES_DELETE, dn );
 
-		rc = process_response( ld, msgid, "ldap_delete", dn );
-
+		if ( verbose && rc == LDAP_SUCCESS ) {
+			printf( _("delete complete\n") );
+		}
 	} else {
 		rc = LDAP_SUCCESS;
 	}
@@ -1071,33 +601,38 @@ done:
 
 static int
 dorename(
-	const char *dn,
-	const char *newrdn,
-	const char* newsup,
+	const struct berval *dn,
+	const struct berval *newrdn,
+	const struct berval *newsup,
 	int deleteoldrdn,
 	LDAPControl **pctrls )
 {
 	int	rc;
 	int msgid;
 
-	printf( _("%smodifying rdn of entry \"%s\"\n"), not ? "!" : "", dn );
+	assert( dn != NULL );
+	assert( dn->bv_val != NULL );
+	assert( newrdn != NULL );
+	assert( newrdn->bv_val != NULL );
+	printf( _("%smodifying rdn of entry \"%s\"\n"), dont ? "!" : "", dn->bv_val );
 	if ( verbose ) {
 		printf( _("\tnew RDN: \"%s\" (%skeep existing values)\n"),
-			newrdn, deleteoldrdn ? _("do not ") : "" );
+			newrdn->bv_val, deleteoldrdn ? _("do not ") : "" );
 	}
-	if ( !not ) {
-		rc = ldap_rename( ld, dn, newrdn, newsup, deleteoldrdn,
-			pctrls, NULL, &msgid );
+	if ( !dont ) {
+		rc = ldap_rename( ld, dn->bv_val, newrdn->bv_val,
+						  ( newsup && newsup->bv_val ) ? newsup->bv_val : NULL,
+						  deleteoldrdn, pctrls, NULL, &msgid );
 		if ( rc != LDAP_SUCCESS ) {
-			fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn );
-			ldap_perror( ld, "ldap_modrdn" );
+			fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn->bv_val );
+			tool_perror( "ldap_rename", rc, NULL, NULL, NULL, NULL );
 			goto done;
-		} else {
-			printf( _("modrdn completed\n") );
 		}
+		rc = process_response( ld, msgid, LDAP_RES_RENAME, dn );
 
-		rc = process_response( ld, msgid, "ldap_rename", dn );
-
+		if ( verbose && rc == LDAP_SUCCESS ) {
+			printf( _("rename complete\n") );
+		}
 	} else {
 		rc = LDAP_SUCCESS;
 	}
@@ -1107,75 +642,84 @@ done:
 	return( rc );
 }
 
-static int process_response(
-	LDAP *ld,
-	int msgid,
-	const char *opstr,
-	const char *dn )
-{
-	LDAPMessage *res;
-	int rc = LDAP_OTHER;
-
-	if( ldap_result( ld, msgid,
-#ifdef LDAP_GROUP_TRANSACTION
-		txn ? 0 : 1,
-#else
-		1,
-#endif
-		NULL, &res ) == -1 ) {
-		ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
-		return rc;
-	}
-
-	if( ldap_msgtype( res ) != LDAP_RES_INTERMEDIATE ) {
-		return ldap_result2error( ld, res, 1 );
+static const char *
+res2str( int res ) {
+	switch ( res ) {
+	case LDAP_RES_ADD:
+		return "ldap_add";
+	case LDAP_RES_DELETE:
+		return "ldap_delete";
+	case LDAP_RES_MODIFY:
+		return "ldap_modify";
+	case LDAP_RES_MODRDN:
+		return "ldap_rename";
+	default:
+		assert( 0 );
 	}
 
-#ifdef LDAP_GROUP_TRANSACTION
-	/* assume (successful) transaction intermediate response */
-	return LDAP_SUCCESS;
-
-#else
-	/* intermediate response? */
-	return LDAP_DECODING_ERROR;
-#endif
+	return "ldap_unknown";
 }
 
-static char *
-read_one_record( FILE *fp )
+static int process_response(
+	LDAP *ld,
+	int msgid,
+	int op,
+	const struct berval *dn )
 {
-	char        *buf, line[ LDAPMOD_MAXLINE ];
-	int		lcur, lmax;
-
-	lcur = lmax = 0;
-	buf = NULL;
+	LDAPMessage	*res;
+	int		rc = LDAP_OTHER, msgtype;
+	struct timeval	tv = { 0, 0 };
+	int		err;
+	char		*text = NULL, *matched = NULL, **refs = NULL;
+	LDAPControl	**ctrls = NULL;
 
-	while ( fgets( line, sizeof(line), fp ) != NULL ) {
-		int len = strlen( line );
+	assert( dn != NULL );
+	for ( ; ; ) {
+		tv.tv_sec = 0;
+		tv.tv_usec = 100000;
 
-		if( len < 2 || ( len == 2 && *line == '\r' )) {
-			if( buf == NULL ) {
-				continue;
-			} else {
-				break;
-			}
+		rc = ldap_result( ld, msgid, LDAP_MSG_ALL, &tv, &res );
+		if ( tool_check_abandon( ld, msgid ) ) {
+			return LDAP_CANCELLED;
 		}
 
-		if ( lcur + len + 1 > lmax ) {
-			lmax = LDAPMOD_MAXLINE
-				* (( lcur + len + 1 ) / LDAPMOD_MAXLINE + 1 );
+		if ( rc == -1 ) {
+			ldap_get_option( ld, LDAP_OPT_RESULT_CODE, &rc );
+			tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
+			return rc;
+		}
 
-			if (( buf = (char *)ber_memrealloc( buf, lmax )) == NULL ) {
-				perror( "realloc" );
-				exit( EXIT_FAILURE );
-			}
+		if ( rc != 0 ) {
+			break;
 		}
+	}
 
-		strcpy( buf + lcur, line );
-		lcur += len;
+	msgtype = ldap_msgtype( res );
+
+	rc = ldap_parse_result( ld, res, &err, &matched, &text, &refs, &ctrls, 1 );
+	if ( rc == LDAP_SUCCESS ) rc = err;
+
+#ifdef LDAP_X_TXN
+	if ( rc == LDAP_X_TXN_SPECIFY_OKAY ) {
+		rc = LDAP_SUCCESS;
+	} else
+#endif
+	if ( rc != LDAP_SUCCESS ) {
+		tool_perror( res2str( op ), rc, NULL, matched, text, refs );
+	} else if ( msgtype != op ) {
+		fprintf( stderr, "%s: msgtype: expected %d got %d\n",
+			res2str( op ), op, msgtype );
+		rc = LDAP_OTHER;
 	}
 
-	return( buf );
-}
+	if ( text ) ldap_memfree( text );
+	if ( matched ) ldap_memfree( matched );
+	if ( refs ) ber_memvfree( (void **)refs );
 
+	if ( ctrls ) {
+		tool_print_ctrls( ld, ctrls );
+		ldap_controls_free( ctrls );
+	}
 
+	return rc;
+}