X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapmodify.c;h=9fef596368a5adbe7db9c1405651462735dfbb91;hb=8882fc4ddb31a73c2da0dfd5d717e8ed61c76307;hp=6f2efb878299b552a632b09f39ea5f0ac709c4e2;hpb=6b7cee69c2b4281dc366b97609630369b02cb553;p=openldap

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 6f2efb8782..9fef596368 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -1,20 +1,51 @@
+/* ldapmodify.c - generic program to modify or add entries using LDAP */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 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.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.  This
+ * software is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).  Additional significant contributors
+ * include:
+ *   Kurt D. Zeilenga
+ *   Norbert Klasen
+ *   Howard Chu
  */
-/* ldapmodify.c - generic program to modify or add entries using LDAP */
 
 #include "portable.h"
 
 #include <stdio.h>
 
 #include <ac/stdlib.h>
-
 #include <ac/ctype.h>
-#include <ac/signal.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>
@@ -35,162 +66,105 @@
 #include "ldap_defaults.h"
 #include "ldap_log.h"
 #include "ldap_pvt.h"
+#include "lber_pvt.h"
 
-static char	*prog;
-static char	*binddn = NULL;
-static struct berval passwd = { 0, NULL };
-static char *ldapuri = NULL;
-static char	*ldaphost = NULL;
-static int	ldapport = 0;
-#ifdef HAVE_CYRUS_SASL
-static unsigned sasl_flags = LDAP_SASL_AUTOMATIC;
-static char *sasl_realm = NULL;
-static char	*sasl_authc_id = NULL;
-static char	*sasl_authz_id = NULL;
-static char	*sasl_mech = NULL;
-static char	*sasl_secprops = NULL;
-#endif
-static int	use_tls = 0;
-static int	ldapadd, not, verbose, contoper, force;
+#include "common.h"
+
+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_MODSEPSTR		"-"
-#define T_NEWRDNSTR		"newrdn"
-#define T_DELETEOLDRDNSTR	"deleteoldrdn"
-#define T_NEWSUPSTR		"newsuperior"
-
-
-static void usage LDAP_P(( const char *prog )) LDAP_GCCATTR((noreturn));
-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 ));
+#define	M_SEP	0x7f
+
+/* strings found in LDIF entries */
+static struct berval BV_VERSION = BER_BVC("version");
+static struct berval BV_DN = BER_BVC("dn");
+static struct berval BV_CONTROL = BER_BVC("control");
+static struct berval BV_CHANGETYPE = BER_BVC("changetype");
+static struct berval BV_ADDCT = BER_BVC("add");
+static struct berval BV_MODIFYCT = BER_BVC("modify");
+static struct berval BV_DELETECT = BER_BVC("delete");
+static struct berval BV_MODRDNCT = BER_BVC("modrdn");
+static struct berval BV_MODDNCT = BER_BVC("moddn");
+static struct berval BV_RENAMECT = BER_BVC("rename");
+static struct berval BV_MODOPADD = BER_BVC("add");
+static struct berval BV_MODOPREPLACE = BER_BVC("replace");
+static struct berval BV_MODOPDELETE = BER_BVC("delete");
+static struct berval BV_MODOPINCREMENT = BER_BVC("increment");
+static struct berval BV_NEWRDN = BER_BVC("newrdn");
+static struct berval BV_DELETEOLDRDN = BER_BVC("deleteoldrdn");
+static struct berval BV_NEWSUP = BER_BVC("newsuperior");
+
+#define	BV_CASEMATCH(a, b) \
+	((a)->bv_len == (b)->bv_len && 0 == strcasecmp((a)->bv_val, (b)->bv_val))
+
+static int process_ldif_rec LDAP_P(( char *rbuf, int lineno ));
+static int parse_ldif_control LDAP_P(( struct berval *val, LDAPControl ***pctrls ));
 static int domodify LDAP_P((
 	const char *dn,
 	LDAPMod **pmods,
-    LDAPControl **pctrls,
+	LDAPControl **pctrls,
 	int newentry ));
 static int dodelete LDAP_P((
 	const char *dn,
-    LDAPControl **pctrls ));
+	LDAPControl **pctrls ));
 static int dorename LDAP_P((
 	const char *dn,
 	const char *newrdn,
 	const char *newsup,
 	int deleteoldrdn,
-    LDAPControl **pctrls ));
-static char *read_one_record LDAP_P(( FILE *fp ));
+	LDAPControl **pctrls ));
+static int process_response(
+	LDAP *ld,
+	int msgid,
+	int res,
+	const char *dn );
+
+#ifdef LDAP_X_TXN
+static int txn = 0;
+static int txnabort = 0;
+struct berval *txn_id = NULL;
+#endif
 
-static void
-usage( const char *prog )
+void
+usage( void )
 {
-    fprintf( stderr,
-"Add or modify entries from an LDAP server\n\n"
-"usage: %s [options]\n"
-"	The list of desired operations are read from stdin or from the file\n"
-"	specified by \"-f file\".\n"
-"Add or modify options:\n"
-"  -a         add values (default%s)\n"
-"  -c         continuous operation mode (do not stop on errors)\n"
-"  -F         force all changes records to be used\n"
-"  -S file    write skipped modifications to `file'\n"
-
-"Common options:\n"
-"  -d level   set LDAP debugging level to `level'\n"
-"  -D binddn  bind DN\n"
-"  -e [!]<ctrl>[=<ctrlparam>] general controls (! indicates criticality)\n"
-"             [!]manageDSAit   (alternate form, see -M)\n"
-"             [!]noop\n"
-"  -f file    read operations from `file'\n"
-"  -h host    LDAP server\n"
-"  -H URI     LDAP Uniform Resource Indentifier(s)\n"
-"  -I         use SASL Interactive mode\n"
-"  -k         use Kerberos authentication\n"
-"  -K         like -k, but do only step 1 of the Kerberos bind\n"
-"  -M         enable Manage DSA IT control (-MM to make critical)\n"
-"  -n         show what would be done but don't actually update\n"
-"  -O props   SASL security properties\n"
-"  -p port    port on LDAP server\n"
-"  -P version procotol version (default: 3)\n"
-"  -Q         use SASL Quiet mode\n"
-"  -R realm   SASL realm\n"
-"  -U authcid SASL authentication identity\n"
-"  -v         run in verbose mode (diagnostics to standard output)\n"
-"  -w passwd  bind passwd (for simple authentication)\n"
-"  -W         prompt for bind passwd\n"
-"  -x         Simple authentication\n"
-"  -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
-"  -y file    Read passwd from file\n"
-"  -Y mech    SASL mechanism\n"
-"  -Z         Start TLS request (-ZZ to require successful response)\n"
-	     , prog, (strcmp( prog, "ldapadd" ) ? " is to replace" : "") );
-
-    exit( EXIT_FAILURE );
+	fprintf( stderr, _("Add or modify entries from an LDAP server\n\n"));
+	fprintf( stderr, _("usage: %s [options]\n"), prog);
+	fprintf( stderr, _("	The list of desired operations are read from stdin"
+		" or from the file\n"));
+	fprintf( stderr, _("	specified by \"-f file\".\n"));
+	fprintf( stderr, _("Add or modify options:\n"));
+	fprintf( stderr, _("  -a         add values (%s)\n"),
+		(ldapadd ? _("default") : _("default is to replace")));
+	fprintf( stderr, _("  -E [!]ext=extparam	modify extensions"
+		" (! indicate s criticality)\n"));
+#ifdef LDAP_X_TXN
+ 	fprintf( stderr,
+		_("             [!]txn=<commit|abort>         (transaction)\n"));
+#endif
+	fprintf( stderr, _("  -S file    write skipped modifications to `file'\n"));
+
+	tool_common_usage();
+	exit( EXIT_FAILURE );
 }
 
 
+const char options[] = "aE:rS:"
+	"cd:D:e:f:h:H:IMnO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+
 int
-main( int argc, char **argv )
+handle_private_option( int i )
 {
-    char		*infile, *rejfile, *rbuf, *start, *rejbuf = NULL;
-    FILE		*fp, *rejfp;
-	char		*matched_msg = NULL, *error_msg = NULL;
-	int		rc, retval, i, authmethod, version, want_bindpw;
-	int		debug, manageDSAit, noop, referrals;
-	int count, len;
-	char	*pw_file = NULL;
 	char	*control, *cvalue;
 	int		crit;
 
-    prog = lutil_progname( "ldapmodify", argc, argv );
-
-    /* Print usage when no parameters */
-    if( argc < 2 ) usage( prog );
-
-	/* strncmp instead of strcmp since NT binaries carry .exe extension */
-    ldapadd = ( strncmp( prog, "ldapadd", sizeof("ldapadd")-1 ) == 0 );
-
-    infile = NULL;
-    rejfile = NULL;
-    not = verbose = want_bindpw = debug = manageDSAit = noop = referrals = 0;
-    authmethod = -1;
-	version = -1;
-
-    while (( i = getopt( argc, argv, "acrf:E:F"
-		"Cd:D:e:h:H:IkKMnO:p:P:QR:S:U:vw:WxX:y:Y:Z" )) != EOF )
-	{
-	switch( i ) {
-	/* Modify Options */
-	case 'a':	/* add */
-	    ldapadd = 1;
-	    break;
-	case 'c':	/* continuous operation */
-	    contoper = 1;
-	    break;
-	case 'E': /* modify controls */
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -E incompatible with LDAPv%d\n",
-				prog, version );
-			return EXIT_FAILURE;
+	switch ( i ) {
+	case 'E': /* modify extensions */
+		if( protocol == LDAP_VERSION2 ) {
+			fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
+				prog, protocol );
+			exit( EXIT_FAILURE );
 		}
 
 		/* should be extended to support comma separated list of
@@ -208,985 +182,711 @@ main( int argc, char **argv )
 		if ( (cvalue = strchr( control, '=' )) != NULL ) {
 			*cvalue++ = '\0';
 		}
-		fprintf( stderr, "Invalid modify control name: %s\n", control );
-		usage(prog);
-		return EXIT_FAILURE;
-	case 'f':	/* read from file */
-		if( infile != NULL ) {
-			fprintf( stderr, "%s: -f previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-	    infile = ber_strdup( optarg );
-	    break;
-	case 'F':	/* force all changes records to be used */
-	    force = 1;
-	    break;
-
-	/* Common Options */
-	case 'C':
-		referrals++;
-		break;
-	case 'd':
-	    debug |= atoi( optarg );
-	    break;
-	case 'D':	/* bind DN */
-		if( binddn != NULL ) {
-			fprintf( stderr, "%s: -D previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-	    binddn = ber_strdup( optarg );
-	    break;
-	case 'e': /* general controls */
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -e incompatible with LDAPv%d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-
-		/* should be extended to support comma separated list of
-		 *	[!]key[=value] parameters, e.g.  -e !foo,bar=567
-		 */
-
-		crit = 0;
-		cvalue = NULL;
-		if( optarg[0] == '!' ) {
-			crit = 1;
-			optarg++;
-		}
-
-		control = ber_strdup( optarg );
-		if ( (cvalue = strchr( control, '=' )) != NULL ) {
-			*cvalue++ = '\0';
-		}
-
-		if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
-			if( manageDSAit ) {
-				fprintf( stderr, "manageDSAit control previously specified");
-				return EXIT_FAILURE;
-			}
-			if( cvalue != NULL ) {
-				fprintf( stderr, "manageDSAit: no control value expected" );
-				usage(prog);
-				return EXIT_FAILURE;
-			}
 
-			manageDSAit = 1 + crit;
-			free( control );
-			break;
-			
-		} else if ( strcasecmp( control, "noop" ) == 0 ) {
-			if( noop ) {
-				fprintf( stderr, "noop control previously specified");
-				return EXIT_FAILURE;
+#ifdef LDAP_X_TXN
+		if( strcasecmp( control, "txn" ) == 0 ) {
+			/* Transaction */
+			if( txn ) {
+				fprintf( stderr,
+					_("txn control previously specified\n"));
+				exit( EXIT_FAILURE );
 			}
 			if( cvalue != NULL ) {
-				fprintf( stderr, "noop: no control value expected" );
-				usage(prog);
-				return EXIT_FAILURE;
+				if( strcasecmp( cvalue, "abort" ) == 0 ) {
+					txnabort=1;
+				} else if( strcasecmp( cvalue, "commit" ) != 0 ) {
+					fprintf( stderr, _("Invalid value for txn control, %s\n"),
+						cvalue );
+					exit( EXIT_FAILURE );
+				}
 			}
 
-			noop = 1 + crit;
-			free( control );
-			break;
-
-		} else {
-			fprintf( stderr, "Invalid general control name: %s\n", control );
-			usage(prog);
-			return EXIT_FAILURE;
-		}
-	case 'h':	/* ldap host */
-		if( ldapuri != NULL ) {
-			fprintf( stderr, "%s: -h incompatible with -H\n", prog );
-			return EXIT_FAILURE;
-		}
-		if( ldaphost != NULL ) {
-			fprintf( stderr, "%s: -h previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-	    ldaphost = ber_strdup( optarg );
-	    break;
-	case 'H':	/* ldap URI */
-		if( ldaphost != NULL ) {
-			fprintf( stderr, "%s: -H incompatible with -h\n", prog );
-			return EXIT_FAILURE;
-		}
-		if( ldapport ) {
-			fprintf( stderr, "%s: -H incompatible with -p\n", prog );
-			return EXIT_FAILURE;
-		}
-		if( ldapuri != NULL ) {
-			fprintf( stderr, "%s: -H previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-	    ldapuri = ber_strdup( optarg );
-	    break;
-	case 'I':
-#ifdef HAVE_CYRUS_SASL
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -I incompatible with version %d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
-			fprintf( stderr, "%s: incompatible previous "
-				"authentication choice\n",
-				prog );
-			return EXIT_FAILURE;
-		}
-		authmethod = LDAP_AUTH_SASL;
-		version = LDAP_VERSION3;
-		sasl_flags = LDAP_SASL_INTERACTIVE;
-		break;
-#else
-		fprintf( stderr, "%s: was not compiled with SASL support\n",
-			prog );
-		return( EXIT_FAILURE );
+			txn = 1 + crit;
+		} else
 #endif
-	case 'k':	/* kerberos bind */
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-		if( version > LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -k incompatible with LDAPv%d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-
-		if( authmethod != -1 ) {
-			fprintf( stderr, "%s: -k incompatible with previous "
-				"authentication choice\n", prog );
-			return EXIT_FAILURE;
-		}
-			
-		authmethod = LDAP_AUTH_KRBV4;
-#else
-		fprintf( stderr, "%s: not compiled with Kerberos support\n", prog );
-		return EXIT_FAILURE;
-#endif
-	    break;
-	case 'K':	/* kerberos bind, part one only */
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-		if( version > LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -k incompatible with LDAPv%d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		if( authmethod != -1 ) {
-			fprintf( stderr, "%s: incompatible with previous "
-				"authentication choice\n", prog );
-			return EXIT_FAILURE;
-		}
-
-		authmethod = LDAP_AUTH_KRBV41;
-#else
-		fprintf( stderr, "%s: not compiled with Kerberos support\n", prog );
-		return( EXIT_FAILURE );
-#endif
-	    break;
-	case 'M':
-		/* enable Manage DSA IT */
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -M incompatible with LDAPv%d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		manageDSAit++;
-		version = LDAP_VERSION3;
-		break;
-	case 'n':	/* print deletes, don't actually do them */
-	    ++not;
-	    break;
-	case 'O':
-#ifdef HAVE_CYRUS_SASL
-		if( sasl_secprops != NULL ) {
-			fprintf( stderr, "%s: -O previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -O incompatible with LDAPv%d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
-			fprintf( stderr, "%s: incompatible previous "
-				"authentication choice\n", prog );
-			return EXIT_FAILURE;
+		{
+			fprintf( stderr, _("Invalid modify extension name: %s\n"),
+				control );
+			usage();
 		}
-		authmethod = LDAP_AUTH_SASL;
-		version = LDAP_VERSION3;
-		sasl_secprops = ber_strdup( optarg );
-#else
-		fprintf( stderr, "%s: not compiled with SASL support\n",
-			prog );
-		return( EXIT_FAILURE );
-#endif
 		break;
-	case 'p':
-		if( ldapport ) {
-			fprintf( stderr, "%s: -p previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-	    ldapport = atoi( optarg );
-	    break;
-	case 'P':
-		switch( atoi(optarg) ) {
-		case 2:
-			if( version == LDAP_VERSION3 ) {
-				fprintf( stderr, "%s: -P 2 incompatible with version %d\n",
-					prog, version );
-				return EXIT_FAILURE;
-			}
-			version = LDAP_VERSION2;
-			break;
-		case 3:
-			if( version == LDAP_VERSION2 ) {
-				fprintf( stderr, "%s: -P 2 incompatible with version %d\n",
-					prog, version );
-				return EXIT_FAILURE;
-			}
-			version = LDAP_VERSION3;
-			break;
-		default:
-			fprintf( stderr, "%s: protocol version should be 2 or 3\n",
-				prog );
-			usage( prog );
-			return( EXIT_FAILURE );
-		} break;
-	case 'Q':
-#ifdef HAVE_CYRUS_SASL
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -Q incompatible with version %d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
-			fprintf( stderr, "%s: incompatible previous "
-				"authentication choice\n",
-				prog );
-			return EXIT_FAILURE;
-		}
-		authmethod = LDAP_AUTH_SASL;
-		version = LDAP_VERSION3;
-		sasl_flags = LDAP_SASL_QUIET;
+
+	case 'a':	/* add */
+		ldapadd = 1;
 		break;
-#else
-		fprintf( stderr, "%s: not compiled with SASL support\n",
-			prog );
-		return( EXIT_FAILURE );
-#endif
+
 	case 'r':	/* replace (obsolete) */
 		break;
 
-	case 'R':
-#ifdef HAVE_CYRUS_SASL
-		if( sasl_realm != NULL ) {
-			fprintf( stderr, "%s: -R previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -R incompatible with version %d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
-			fprintf( stderr, "%s: incompatible previous "
-				"authentication choice\n",
-				prog );
-			return EXIT_FAILURE;
-		}
-		authmethod = LDAP_AUTH_SASL;
-		version = LDAP_VERSION3;
-		sasl_realm = ber_strdup( optarg );
-#else
-		fprintf( stderr, "%s: not compiled with SASL support\n",
-			prog );
-		return( EXIT_FAILURE );
-#endif
-		break;
 	case 'S':	/* skipped modifications to file */
 		if( rejfile != NULL ) {
-			fprintf( stderr, "%s: -S previously specified\n", prog );
-			return EXIT_FAILURE;
+			fprintf( stderr, _("%s: -S previously specified\n"), prog );
+			exit( EXIT_FAILURE );
 		}
 		rejfile = ber_strdup( optarg );
 		break;
-	case 'U':
-#ifdef HAVE_CYRUS_SASL
-		if( sasl_authc_id != NULL ) {
-			fprintf( stderr, "%s: -U previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -U incompatible with version %d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
-			fprintf( stderr, "%s: incompatible previous "
-				"authentication choice\n",
-				prog );
-			return EXIT_FAILURE;
-		}
-		authmethod = LDAP_AUTH_SASL;
-		version = LDAP_VERSION3;
-		sasl_authc_id = ber_strdup( optarg );
-#else
-		fprintf( stderr, "%s: not compiled with SASL support\n",
-			prog );
-		return( EXIT_FAILURE );
-#endif
-		break;
-	case 'v':	/* verbose mode */
-	    verbose++;
-	    break;
-	case 'w':	/* password */
-	    passwd.bv_val = ber_strdup( optarg );
-		{
-			char* p;
 
-			for( p = optarg; *p != '\0'; p++ ) {
-				*p = '\0';
-			}
-		}
-		passwd.bv_len = strlen( passwd.bv_val );
-	    break;
-	case 'W':
-		want_bindpw++;
-		break;
-	case 'y':
-		pw_file = optarg;
-		break;
-	case 'Y':
-#ifdef HAVE_CYRUS_SASL
-		if( sasl_mech != NULL ) {
-			fprintf( stderr, "%s: -Y previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -Y incompatible with version %d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
-			fprintf( stderr, "%s: incompatible with authentication choice\n", prog );
-			return EXIT_FAILURE;
-		}
-		authmethod = LDAP_AUTH_SASL;
-		version = LDAP_VERSION3;
-		sasl_mech = ber_strdup( optarg );
-#else
-		fprintf( stderr, "%s: not compiled with SASL support\n",
-			prog );
-		return( EXIT_FAILURE );
-#endif
-		break;
-	case 'x':
-		if( authmethod != -1 && authmethod != LDAP_AUTH_SIMPLE ) {
-			fprintf( stderr, "%s: incompatible with previous "
-				"authentication choice\n", prog );
-			return EXIT_FAILURE;
-		}
-		authmethod = LDAP_AUTH_SIMPLE;
-		break;
-	case 'X':
-#ifdef HAVE_CYRUS_SASL
-		if( sasl_authz_id != NULL ) {
-			fprintf( stderr, "%s: -X previously specified\n", prog );
-			return EXIT_FAILURE;
-		}
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -X incompatible with LDAPv%d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
-			fprintf( stderr, "%s: -X incompatible with "
-				"authentication choice\n", prog );
-			return EXIT_FAILURE;
-		}
-		authmethod = LDAP_AUTH_SASL;
-		version = LDAP_VERSION3;
-		sasl_authz_id = ber_strdup( optarg );
-#else
-		fprintf( stderr, "%s: not compiled with SASL support\n",
-			prog );
-		return( EXIT_FAILURE );
-#endif
-		break;
-	case 'Z':
-#ifdef HAVE_TLS
-		if( version == LDAP_VERSION2 ) {
-			fprintf( stderr, "%s: -Z incompatible with version %d\n",
-				prog, version );
-			return EXIT_FAILURE;
-		}
-		version = LDAP_VERSION3;
-		use_tls++;
-#else
-		fprintf( stderr, "%s: not compiled with TLS support\n",
-			prog );
-		return( EXIT_FAILURE );
-#endif
-		break;
 	default:
-		fprintf( stderr, "%s: unrecognized option -%c\n",
-			prog, optopt );
-	    usage( prog );
-	}
-    }
-
-	if (version == -1) {
-		version = LDAP_VERSION3;
-	}
-	if (authmethod == -1 && version > LDAP_VERSION2) {
-#ifdef HAVE_CYRUS_SASL
-		authmethod = LDAP_AUTH_SASL;
-#else
-		authmethod = LDAP_AUTH_SIMPLE;
-#endif
+		return 0;
 	}
+	return 1;
+}
 
-	if ( argc != optind )
-	usage( prog );
 
-    if ( rejfile != NULL ) {
-	if (( rejfp = fopen( rejfile, "w" )) == NULL ) {
-	    perror( rejfile );
-	    return( EXIT_FAILURE );
-	}
-    } else {
-	rejfp = NULL;
-    }
+int
+main( int argc, char **argv )
+{
+	char		*rbuf = NULL, *rejbuf = NULL;
+	FILE		*rejfp;
+	struct LDIFFP *ldiffp, ldifdummy = {0};
+	char		*matched_msg, *error_msg;
+	int		rc, retval;
+	int		len;
+	int		i = 0;
+	int		lineno, nextline = 0, lmax = 0;
+	LDAPControl	c[1];
+
+	prog = lutil_progname( "ldapmodify", argc, argv );
 
-    if ( infile != NULL ) {
-	if (( fp = fopen( infile, "r" )) == NULL ) {
-	    perror( infile );
-	    return( EXIT_FAILURE );
-	}
-    } else {
-	fp = stdin;
-    }
+	/* strncmp instead of strcmp since NT binaries carry .exe extension */
+	ldapadd = ( strncasecmp( prog, "ldapadd", sizeof("ldapadd")-1 ) == 0 );
 
-	if ( debug ) {
-		if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
-			fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
-		}
-		if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
-			fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
-		}
-		ldif_debug = debug;
-	}
+	tool_init( ldapadd ? TOOL_ADD : TOOL_MODIFY );
 
-#ifdef SIGPIPE
-	(void) SIGNAL( SIGPIPE, SIG_IGN );
-#endif
+	tool_args( argc, argv );
 
-    if ( !not ) {
-	if( ( ldaphost != NULL || ldapport ) && ( ldapuri == NULL ) ) {
-		if ( verbose ) {
-			fprintf( stderr, "ldap_init( %s, %d )\n",
-				ldaphost != NULL ? ldaphost : "<DEFAULT>",
-				ldapport );
-		}
+	if ( argc != optind ) usage();
 
-		ld = ldap_init( ldaphost, ldapport );
-		if( ld == NULL ) {
-			perror("ldapmodify: ldap_init");
-			return EXIT_FAILURE;
+	if ( rejfile != NULL ) {
+		if (( rejfp = fopen( rejfile, "w" )) == NULL ) {
+			perror( rejfile );
+			return( EXIT_FAILURE );
 		}
-
 	} else {
-		if ( verbose ) {
-			fprintf( stderr, "ldap_initialize( %s )\n",
-				ldapuri != NULL ? ldapuri : "<DEFAULT>" );
-		}
-
-		rc = ldap_initialize( &ld, ldapuri );
-		if( rc != LDAP_SUCCESS ) {
-			fprintf( stderr, "Could not create LDAP session handle (%d): %s\n",
-				rc, ldap_err2string(rc) );
-			return EXIT_FAILURE;
-		}
-	}
-
-	/* referrals */
-	if( ldap_set_option( ld, LDAP_OPT_REFERRALS,
-		referrals ? LDAP_OPT_ON : LDAP_OPT_OFF ) != LDAP_OPT_SUCCESS )
-	{
-		fprintf( stderr, "Could not set LDAP_OPT_REFERRALS %s\n",
-			referrals ? "on" : "off" );
-		return EXIT_FAILURE;
+		rejfp = NULL;
 	}
 
-
-	if (version == -1 ) {
-		version = LDAP_VERSION3;
-	}
-
-	if( ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version )
-		!= LDAP_OPT_SUCCESS )
-	{
-		fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n",
-			version );
-		return EXIT_FAILURE;
-	}
-
-	if ( use_tls && ( ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS )) {
-		ldap_perror( ld, "ldap_start_tls" );
-		if ( use_tls > 1 ) {
+	if ( infile != NULL ) {
+		if (( ldiffp = ldif_open( infile, "r" )) == NULL ) {
+			perror( infile );
 			return( EXIT_FAILURE );
 		}
+	} else {
+		ldifdummy.fp = stdin;
+		ldiffp = &ldifdummy;
 	}
 
-	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 ( debug ) ldif_debug = debug;
 
-	if ( authmethod == LDAP_AUTH_SASL ) {
-#ifdef HAVE_CYRUS_SASL
-		void *defaults;
+	ld = tool_conn_setup( dont, 0 );
 
-		if( sasl_secprops != NULL ) {
-			rc = ldap_set_option( ld, LDAP_OPT_X_SASL_SECPROPS,
-				(void *) sasl_secprops );
-			
-			if( rc != LDAP_OPT_SUCCESS ) {
-				fprintf( stderr,
-					"Could not set LDAP_OPT_X_SASL_SECPROPS: %s\n",
-					sasl_secprops );
-				return( EXIT_FAILURE );
+	if ( !dont ) {
+		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;
 			}
 		}
-		
-		defaults = lutil_sasl_defaults( ld,
-			sasl_mech,
-			sasl_realm,
-			sasl_authc_id,
-			passwd.bv_val,
-			sasl_authz_id );
-
-		rc = ldap_sasl_interactive_bind_s( ld, binddn,
-			sasl_mech, NULL, NULL,
-			sasl_flags, lutil_sasl_interact, defaults );
+		tool_bind( ld );
+	}
 
+#ifdef LDAP_X_TXN
+	if( txn ) {
+		/* start transaction */
+		rc = ldap_txn_start_s( ld, NULL, NULL, &txn_id );
 		if( rc != LDAP_SUCCESS ) {
-			ldap_perror( ld, "ldap_sasl_interactive_bind_s" );
-			return( EXIT_FAILURE );
+			tool_perror( "ldap_txn_start_s", rc, NULL, NULL, NULL, NULL );
+			if( txn > 1 ) return EXIT_FAILURE;
+			txn = 0;
 		}
-#else
-		fprintf( stderr, "%s: not compiled with SASL support\n",
-			prog );
-		return( EXIT_FAILURE );
-#endif
 	}
-	else {
-		if ( ldap_bind_s( ld, binddn, passwd.bv_val, authmethod )
-				!= LDAP_SUCCESS ) {
-			ldap_perror( ld, "ldap_bind" );
-			return( EXIT_FAILURE );
-		}
+#endif
 
+	if ( 0
+#ifdef LDAP_X_TXN
+		|| txn
+#endif
+		)
+	{
+#ifdef LDAP_X_TXN
+		if( txn ) {
+			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 );
 
-    rc = 0;
+	rc = 0;
+	retval = 0;
+	lineno = 1;
+	while (( rc == 0 || contoper ) && ldif_read_record( ldiffp, &nextline,
+		&rbuf, &lmax ))
+	{
+		if ( rejfp ) {
+			len = strlen( rbuf );
+			if (( rejbuf = (char *)ber_memalloc( len+1 )) == NULL ) {
+				perror( "malloc" );
+				exit( EXIT_FAILURE );
+			}
+			memcpy( rejbuf, rbuf, len+1 );
+		}
 
-	if ( manageDSAit || noop ) {
-		int err, i = 0;
-		LDAPControl c1, c2;
-		LDAPControl *ctrls[3];
+		rc = process_ldif_rec( rbuf, lineno );
+		lineno = nextline+1;
 
-		if ( manageDSAit ) {
-			ctrls[i++] = &c1;
-			ctrls[i] = NULL;
-			c1.ldctl_oid = LDAP_CONTROL_MANAGEDSAIT;
-			c1.ldctl_value.bv_val = NULL;
-			c1.ldctl_value.bv_len = 0;
-			c1.ldctl_iscritical = manageDSAit > 1;
-		}
+		if ( rc ) retval = rc;
+		if ( rc && rejfp ) {
+			fprintf(rejfp, _("# Error: %s (%d)"), ldap_err2string(rc), rc);
 
-		if ( noop ) {
-			ctrls[i++] = &c2;
-			ctrls[i] = NULL;
+			matched_msg = NULL;
+			ldap_get_option(ld, LDAP_OPT_MATCHED_DN, &matched_msg);
+			if ( matched_msg != NULL ) {
+				if ( *matched_msg != '\0' ) {
+					fprintf( rejfp, _(", matched DN: %s"), matched_msg );
+				}
+				ldap_memfree( matched_msg );
+			}
 
-			c2.ldctl_oid = LDAP_CONTROL_NOOP;
-			c2.ldctl_value.bv_val = NULL;
-			c2.ldctl_value.bv_len = 0;
-			c2.ldctl_iscritical = noop > 1;
-		}
-	
-		err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
-
-		if( err != LDAP_OPT_SUCCESS ) {
-			fprintf( stderr, "Could not set %scontrols\n",
-				(c1.ldctl_iscritical || c2.ldctl_iscritical)
-				? "critical " : "" );
-			if ( c1.ldctl_iscritical && c2.ldctl_iscritical ) {
-				return EXIT_FAILURE;
+			error_msg = NULL;
+			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 );
+				}
+				ldap_memfree( error_msg );
 			}
+			fprintf( rejfp, "\n%s\n", rejbuf );
 		}
-	}
-
-	count = 0;
-	retval = 0;
-    while (( rc == 0 || contoper ) &&
-		( rbuf = read_one_record( fp )) != NULL ) {
-	count++;
-
-	start = rbuf;
 
-	if ( rejfp ) {
-		len = strlen( rbuf );
-		if (( rejbuf = (char *)ber_memalloc( len+1 )) == NULL ) {
-			perror( "malloc" );
-			exit( EXIT_FAILURE );
-		}
-		memcpy( rejbuf, rbuf, len+1 );
+		if (rejfp) ber_memfree( rejbuf );
 	}
+	ber_memfree( rbuf );
 
-    rc = process_ldif_rec( start, count );
-
-	if ( rc )
-		retval = rc;
-	if ( rc && rejfp ) {
-		fprintf(rejfp, "# Error: %s (%d)", ldap_err2string(rc), rc);
-
-		ldap_get_option(ld, LDAP_OPT_MATCHED_DN, &matched_msg);
-		if ( matched_msg != NULL && *matched_msg != '\0' ) {
-			fprintf( rejfp, ", matched DN: %s", matched_msg );
+#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");
 		}
 
-		ldap_get_option(ld, LDAP_OPT_ERROR_STRING, &error_msg);
-		if ( error_msg != NULL && *error_msg != '\0' ) {
-			fprintf( rejfp, ", additional info: %s", error_msg );
+		/* create transaction */
+		rc = ldap_txn_end_s( ld, !txnabort, txn_id, NULL, NULL, NULL );
+		if( rc != LDAP_SUCCESS ) {
+			tool_perror( "ldap_txn_end_s", rc, NULL, NULL, NULL, NULL );
+			retval = rc;
 		}
-		fprintf( rejfp, "\n%s\n", rejbuf );
 	}
-		if (rejfp) 
-			free( rejbuf );
-		free( rbuf );
-    }
+#endif
 
-    if ( !not ) {
-		ldap_unbind( ld );
-    }
+	if ( !dont ) {
+		tool_unbind( ld );
+	}
 
-    if ( rejfp != NULL ) {
-	    fclose( rejfp );
-    }
+	if ( rejfp != NULL ) {
+		fclose( rejfp );
+	}
 
-    return( retval );
+	tool_destroy();
+	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;
+	char	*line, *dn, *newrdn, *newsup;
+	int		rc, modop;
+	int		expect_modop, expect_sep;
+	int		deleteoldrdn;
+	int		new_entry, delete_entry, got_all;
+	LDAPMod	**pmods, *lm = NULL;
 	int version;
-	struct berval val;
-    LDAPControl **pctrls;
+	LDAPControl **pctrls;
+	int i, j, k, lines, idn, nmods;
+	struct berval *btype, *vals, **bvl, bv;
+	char *freeval;
+	unsigned char *mops = NULL;
 
-    new_entry = ldapadd;
+	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;
+	rc = got_all = delete_entry = modop = expect_modop = 0;
+	expect_sep = 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;
-	}
+	deleteoldrdn = 1;
+	pmods = NULL;
+	pctrls = NULL;
+	dn = newrdn = newsup = NULL;
 
-	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 );
+	lines = ldif_countlines( rbuf );
+	btype = ber_memcalloc( 1, (lines+1)*2*sizeof(struct berval)+lines );
+	if ( !btype )
+		return LDAP_NO_MEMORY;
+
+	vals = btype+lines+1;
+	freeval = (char *)(vals+lines+1);
+	i = -1;
+
+	while ( rc == 0 && ( line = ldif_getline( &rbuf )) != NULL ) {
+		int freev;
+
+		if ( *line == '\n' || *line == '\0' ) {
+			break;
 		}
-		if ( ldaphost != NULL && strcasecmp( val.bv_val, ldaphost ) == 0 &&
-			replicaport == ldapport ) {
-		    use_record = 1;
+
+		++i;
+
+		if ( line[0] == '-' && !line[1] ) {
+			BER_BVZERO( btype+i );
+			freeval[i] = 0;
+			continue;
 		}
-	    } 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 == NULL ? "(null)" : val.bv_val, linenum );
+	
+		if ( ( rc = ldif_parse_line2( line, btype+i, vals+i, &freev ) ) < 0 ) {
+			fprintf( stderr, _("%s: invalid format (line %d) entry: \"%s\"\n"),
+				prog, linenum+i, dn == NULL ? "" : dn );
+			rc = LDAP_PARAM_ERROR;
+			break;
+		}
+		freeval[i] = freev;
+
+		if ( dn == NULL ) {
+			if ( linenum+i == 1 && BV_CASEMATCH( btype+i, &BV_VERSION )) {
+				int	v;
+				if( vals[i].bv_len == 0 || lutil_atoi( &v, vals[i].bv_val) != 0 || v != 1 ) {
+					fprintf( stderr,
+						_("%s: invalid version %s, line %d (ignored)\n"),
+						prog, vals[i].bv_val, linenum );
+				}
+				version++;
+
+			} else if ( BV_CASEMATCH( btype+i, &BV_DN )) {
+				dn = vals[i].bv_val;
+				idn = i;
 			}
-			version++;
+			/* skip all lines until we see "dn:" */
+		}
+	}
+
+	/* check to make sure there was a dn: line */
+	if ( !dn ) {
+		rc = 0;
+		goto leave;
+	}
+
+	lines = i+1;
 
-	    } else if ( strcasecmp( type, T_DN_STR ) == 0 ) {
-		if (( dn = ber_strdup( val.bv_val ? val.bv_val : "" )) == NULL ) {
-		    perror( "strdup" );
-		    exit( EXIT_FAILURE );
+	if( lines == 0 ) {
+		rc = 0;
+		goto leave;
+	}
+
+	if( version && lines == 1 ) {
+		rc = 0;
+		goto leave;
+	}
+
+	i = idn+1;
+	/* Check for "control" tag after dn and before changetype. */
+	if ( BV_CASEMATCH( btype+i, &BV_CONTROL )) {
+		/* Parse and add it to the list of controls */
+		rc = parse_ldif_control( vals+i, &pctrls );
+		if (rc != 0) {
+			fprintf( stderr,
+				_("%s: Error processing %s line, line %d: %s\n"),
+				prog, BV_CONTROL.bv_val, linenum+i, ldap_err2string(rc) );
+		}
+		i++;
+		if ( i>= lines ) {
+short_input:
+			fprintf( stderr,
+				_("%s: Expecting more input after %s line, line %d\n"),
+				prog, btype[i-1].bv_val, linenum+i );
+			
+			rc = LDAP_PARAM_ERROR;
+			goto leave;
 		}
-		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"
-			"\t(LDAP host/port does not match replica: lines)\n",
-			prog, dn );
-		free( dn );
-		ber_memfree( type );
-		ber_memfree( val.bv_val );
-		return( 0 );
-	    }
-
-	    if ( strcasecmp( type, T_CHANGETYPESTR ) == 0 ) {
+	/* Check for changetype */
+	if ( BV_CASEMATCH( btype+i, &BV_CHANGETYPE )) {
 #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;
-		    }
+		for ( icnt = vals[i].bv_len; --icnt > 0; ) {
+			if ( !isspace( (unsigned char) vals[i].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';
+		if ( ++icnt != vals[i].bv_len ) {
+			fprintf( stderr, _("%s: illegal trailing space after"
+				" \"%s: %s\" trimmed (line %d, entry \"%s\")\n"),
+				prog, BV_CHANGETYPE.bv_val, vals[i].bv_val, linenum+i, dn );
+			vals[i].bv_val[icnt] = '\0';
 		}
 #endif /* LIBERAL_CHANGETYPE_MODOP */
 
-		if ( strcasecmp( val.bv_val, T_MODIFYCTSTR ) == 0 ) {
+		if ( BV_CASEMATCH( vals+i, &BV_MODIFYCT )) {
 			new_entry = 0;
 			expect_modop = 1;
-		} else if ( strcasecmp( val.bv_val, T_ADDCTSTR ) == 0 ) {
+		} else if ( BV_CASEMATCH( vals+i, &BV_ADDCT )) {
 			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)
+			modop = LDAP_MOD_ADD;
+		} else if ( BV_CASEMATCH( vals+i, &BV_MODRDNCT )
+			|| BV_CASEMATCH( vals+i, &BV_MODDNCT )
+			|| BV_CASEMATCH( vals+i, &BV_RENAMECT ))
 		{
-		    expect_newrdn = 1;
-		} else if ( strcasecmp( val.bv_val, T_DELETECTSTR ) == 0 ) {
-		    got_all = delete_entry = 1;
+			i++;
+			if ( i >= lines )
+				goto short_input;
+			if ( !BV_CASEMATCH( btype+i, &BV_NEWRDN )) {
+				fprintf( stderr, _("%s: expecting \"%s:\" but saw"
+					" \"%s:\" (line %d, entry \"%s\")\n"),
+					prog, BV_NEWRDN.bv_val, btype[i].bv_val, linenum+i, dn );
+				rc = LDAP_PARAM_ERROR;
+				goto leave;
+			}
+			newrdn = vals[i].bv_val;
+			i++;
+			if ( i >= lines )
+				goto short_input;
+			if ( !BV_CASEMATCH( btype+i, &BV_DELETEOLDRDN )) {
+				fprintf( stderr, _("%s: expecting \"%s:\" but saw"
+					" \"%s:\" (line %d, entry \"%s\")\n"),
+					prog, BV_DELETEOLDRDN.bv_val, btype[i].bv_val, linenum+i, dn );
+				rc = LDAP_PARAM_ERROR;
+				goto leave;
+			}
+			deleteoldrdn = ( vals[i].bv_val[0] == '0' ) ? 0 : 1;
+			i++;
+			if ( i < lines ) {
+				if ( !BV_CASEMATCH( btype+i, &BV_NEWSUP )) {
+					fprintf( stderr, _("%s: expecting \"%s:\" but saw"
+						" \"%s:\" (line %d, entry \"%s\")\n"),
+						prog, BV_NEWSUP.bv_val, btype[i].bv_val, linenum+i, dn );
+					rc = LDAP_PARAM_ERROR;
+					goto leave;
+				}
+				newsup = vals[i].bv_val;
+				i++;
+			}
+			got_all = 1;
+		} else if ( BV_CASEMATCH( vals+i, &BV_DELETECT )) {
+			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 */
+			fprintf( stderr,
+				_("%s:  unknown %s \"%s\" (line %d, entry \"%s\")\n"),
+				prog, BV_CHANGETYPE.bv_val, vals[i].bv_val, linenum+i, dn );
+			rc = LDAP_PARAM_ERROR;
+			goto leave;
+		}
+		i++;
+	} else if ( ldapadd ) {		/*  missing changetype => add */
 		new_entry = 1;
 		modop = LDAP_MOD_ADD;
-	    } else {
+	} 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 ( got_all ) {
+		if ( i < lines ) {
+			fprintf( stderr,
+				_("%s: extra lines at end (line %d, entry \"%s\")\n"),
+				prog, linenum+i, dn );
+			rc = LDAP_PARAM_ERROR;
+			goto leave;
 		}
-	    }
-	    
-	    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 {	/* no modify op:  use default */
-		modop = ldapadd ? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
-	    }
+		goto doit;
 	}
 
-	if ( expect_newrdn ) {
-	    if ( strcasecmp( type, T_NEWRDNSTR ) == 0 ) {
-			if (( newrdn = ber_strdup( val.bv_val ? val.bv_val : "" )) == NULL ) {
-		    perror( "strdup" );
-		    exit( EXIT_FAILURE );
+	nmods = lines - i;
+	idn = i;
+
+	if ( new_entry ) {
+		int fv;
+
+		/* Make sure all attributes with multiple values are contiguous */
+		for (; i<lines; i++) {
+			for (j=i+1; j<lines; j++) {
+				if ( BV_CASEMATCH( btype+i, btype+j )) {
+					nmods--;
+					/* out of order, move intervening attributes down */
+					if ( j != i+1 ) {
+						bv = vals[j];
+						fv = freeval[j];
+						for (k=j; k>i; k--) {
+							btype[k] = btype[k-1];
+							vals[k] = vals[k-1];
+							freeval[k] = freeval[k-1];
+						}
+						k++;
+						btype[k] = btype[i];
+						vals[k] = bv;
+						freeval[k] = fv;
+					}
+					i++;
+				}
+			}
 		}
-		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 ? val.bv_val : "" )) == NULL ) {
-		    perror( "strdup" );
-		    exit( EXIT_FAILURE );
+		/* Allocate space for array of mods, array of pointers to mods,
+		 * and array of pointers to values, allowing for NULL terminators
+		 * for the pointer arrays...
+		 */
+		lm = ber_memalloc( nmods * sizeof(LDAPMod) +
+			(nmods+1) * sizeof(LDAPMod*) +
+			(lines + nmods - idn) * sizeof(struct berval *));
+		pmods = (LDAPMod **)(lm+nmods);
+		bvl = (struct berval **)(pmods+nmods+1);
+
+		j = 0;
+		k = -1;
+		BER_BVZERO(&bv);
+		for (i=idn; i<lines; i++) {
+			if ( BV_CASEMATCH( btype+i, &BV_DN )) {
+				fprintf( stderr, _("%s: attributeDescription \"%s\":"
+					" (possible missing newline"
+						" after line %d, entry \"%s\"?)\n"),
+					prog, btype[i].bv_val, linenum+i - 1, dn );
+			}
+			if ( !BV_CASEMATCH( btype+i, &bv )) {
+				bvl[k++] = NULL;
+				bv = btype[i];
+				lm[j].mod_op = LDAP_MOD_ADD | LDAP_MOD_BVALUES;
+				lm[j].mod_type = bv.bv_val;
+				lm[j].mod_bvalues = bvl+k;
+				pmods[j] = lm+j;
+				j++;
+			}
+			bvl[k++] = vals+i;
 		}
-		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.bv_val == NULL ? NULL : &val );
+		bvl[k] = NULL;
+		pmods[j] = NULL;
+		goto doit;
 	}
 
-end_line:
-	ber_memfree( type );
-	ber_memfree( val.bv_val );
-    }
+	mops = ber_memalloc( lines+1 );
+	mops[lines] = M_SEP;
+	mops[i-1] = M_SEP;
 
-	if( linenum == 0 ) {
-		return 0;
-	}
+	for ( ; i<lines; i++ ) {
+		if ( expect_modop ) {
+#ifdef LIBERAL_CHANGETYPE_MODOP
+			/* trim trailing spaces (and log warning ...) */
+		    int icnt;
+		    for ( icnt = vals[i].bv_len; --icnt > 0; ) {
+				if ( !isspace( (unsigned char) vals[i].bv_val[icnt] ) ) break;
+			}
+    
+			if ( ++icnt != vals[i].bv_len ) {
+				fprintf( stderr, _("%s: illegal trailing space after"
+					" \"%s: %s\" trimmed (line %d, entry \"%s\")\n"),
+					prog, type, vals[i].bv_val, linenum+i, dn );
+				vals[i].bv_val[icnt] = '\0';
+			}
+#endif /* LIBERAL_CHANGETYPE_MODOP */
 
-	if( version && linenum == 1 ) {
-		return 0;
+			expect_modop = 0;
+			expect_sep = 1;
+			if ( BV_CASEMATCH( btype+i, &BV_MODOPADD )) {
+				modop = LDAP_MOD_ADD;
+				mops[i] = M_SEP;
+				nmods--;
+			} else if ( BV_CASEMATCH( btype+i, &BV_MODOPREPLACE )) {
+			/* defer handling these since they might have no values.
+			 * Use the BVALUES flag to signal that these were
+			 * deferred. If values are provided later, this
+			 * flag will be switched off.
+			 */
+				modop = LDAP_MOD_REPLACE;
+				mops[i] = modop | LDAP_MOD_BVALUES;
+				btype[i] = vals[i];
+			} else if ( BV_CASEMATCH( btype+i, &BV_MODOPDELETE )) {
+				modop = LDAP_MOD_DELETE;
+				mops[i] = modop | LDAP_MOD_BVALUES;
+				btype[i] = vals[i];
+			} else if ( BV_CASEMATCH( btype+i, &BV_MODOPINCREMENT )) {
+				modop = LDAP_MOD_INCREMENT;
+				mops[i] = M_SEP;
+				nmods--;
+			} else {	/* no modify op: invalid LDIF */
+				fprintf( stderr, _("%s: modify operation type is missing at"
+					" line %d, entry \"%s\"\n"),
+					prog, linenum+i, dn );
+				rc = LDAP_PARAM_ERROR;
+				goto leave;
+			}
+			bv = vals[i];
+		} else if ( expect_sep && BER_BVISEMPTY( btype+i )) {
+			mops[i] = M_SEP;
+			expect_sep = 0;
+			expect_modop = 1;
+			nmods--;
+		} else {
+			if ( !BV_CASEMATCH( btype+i, &bv )) {
+				fprintf( stderr, _("%s: wrong attributeType at"
+					" line %d, entry \"%s\"\n"),
+					prog, linenum+i, dn );
+				rc = LDAP_PARAM_ERROR;
+				goto leave;
+			}
+			mops[i] = modop;
+			/* If prev op was deferred and matches this type,
+			 * clear the flag
+			 */
+			if ( (mops[i-1] & LDAP_MOD_BVALUES)
+				&& BV_CASEMATCH( btype+i, btype+i-1 ))
+			{
+				mops[i-1] = M_SEP;
+				nmods--;
+			}
+		}
 	}
 
-    /* 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) {
-            LDAPControl **defctrls = NULL;   /* Default server controls */
-            LDAPControl **newctrls = NULL;
-            ldap_get_option(ld, LDAP_OPT_SERVER_CONTROLS, &defctrls);
-            if (defctrls) {
-                int npc=0;                  /* Number of LDIF controls */
-                int ndefc=0;                /* Number of default controls */
-                while (pctrls[npc])         /* Count LDIF controls */
-                    npc++; 
-                while (defctrls[ndefc])     /* Count default controls */
-                    ndefc++;
-                newctrls = ber_memrealloc(pctrls, (npc+ndefc+1)*sizeof(LDAPControl*));
-                if (newctrls == NULL)
-                    rc = LDAP_NO_MEMORY;
-                else {
-                    int i;
-                    pctrls = newctrls;
-                    for (i=npc; i<npc+ndefc; i++) {
-                        pctrls[i] = ldap_control_dup(defctrls[i-npc]);
-                        if (pctrls[i] == NULL) {
-                            rc = LDAP_NO_MEMORY;
-                            break;
-                        }
-                    }
-                    pctrls[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 );
-	} else {
-	    rc = domodify( dn, pmods, pctrls, new_entry );
+#if 0	/* we should faithfully encode the LDIF, not combine */
+	/* Make sure all modops with multiple values are contiguous */
+	for (i=idn; i<lines; i++) {
+		if ( mops[i] == M_SEP )
+			continue;
+		for (j=i+1; j<lines; j++) {
+			if ( mops[j] == M_SEP || mops[i] != mops[j] )
+				continue;
+			if ( BV_CASEMATCH( btype+i, btype+j )) {
+				nmods--;
+				/* out of order, move intervening attributes down */
+				if ( j != i+1 ) {
+					int c;
+					struct berval bv;
+					char fv;
+
+					c = mops[j];
+					bv = vals[j];
+					fv = freeval[j];
+					for (k=j; k>i; k--) {
+						btype[k] = btype[k-1];
+						vals[k] = vals[k-1];
+						freeval[k] = freeval[k-1];
+						mops[k] = mops[k-1];
+					}
+					k++;
+					btype[k] = btype[i];
+					vals[k] = bv;
+					freeval[k] = fv;
+					mops[k] = c;
+				}
+				i++;
+			}
+		}
 	}
+#endif
 
-	if ( rc == LDAP_SUCCESS ) {
-	    rc = 0;
+	/* Allocate space for array of mods, array of pointers to mods,
+	 * and array of pointers to values, allowing for NULL terminators
+	 * for the pointer arrays...
+	 */
+	lm = ber_memalloc( nmods * sizeof(LDAPMod) +
+		(nmods+1) * sizeof(LDAPMod*) +
+		(lines + nmods - idn) * sizeof(struct berval *));
+	pmods = (LDAPMod **)(lm+nmods);
+	bvl = (struct berval **)(pmods+nmods+1);
+
+	j = 0;
+	k = -1;
+	BER_BVZERO(&bv);
+	mops[idn-1] = M_SEP;
+	for (i=idn; i<lines; i++) {
+		if ( mops[i] == M_SEP )
+			continue;
+		if ( mops[i] != mops[i-1] || !BV_CASEMATCH( btype+i, &bv )) {
+			bvl[k++] = NULL;
+			bv = btype[i];
+			lm[j].mod_op = mops[i] | LDAP_MOD_BVALUES;
+			lm[j].mod_type = bv.bv_val;
+			if ( mops[i] & LDAP_MOD_BVALUES ) {
+				lm[j].mod_bvalues = NULL;
+			} else {
+				lm[j].mod_bvalues = bvl+k;
+			}
+			pmods[j] = lm+j;
+			j++;
+		}
+		bvl[k++] = vals+i;
+	}
+	bvl[k] = NULL;
+	pmods[j] = NULL;
+
+doit:
+	/* 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) {
+			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 (defctrls[ndefc]) ndefc++; /* Count default controls */
+				newctrls = ber_memrealloc(pctrls,
+					(npc+ndefc+1)*sizeof(LDAPControl*));
+
+				if (newctrls == NULL) {
+					rc = LDAP_NO_MEMORY;
+				} else {
+					int i;
+					pctrls = newctrls;
+					for (i=npc; i<npc+ndefc; i++) {
+						pctrls[i] = ldap_control_dup(defctrls[i-npc]);
+						if (pctrls[i] == NULL) {
+							rc = LDAP_NO_MEMORY;
+							break;
+						}
+					}
+					pctrls[npc+ndefc] = NULL;
+				}
+				ldap_controls_free(defctrls);  /* Must be freed by library */
+			}
+		}
 	}
-    }
 
-    if ( dn != NULL ) {
-	free( dn );
-    }
-    if ( newrdn != NULL ) {
-	free( newrdn );
-    }
-    if ( pmods != NULL ) {
-	ldap_mods_free( pmods, 1 );
-    }
+	if ( rc == 0 ) {
+		if ( delete_entry ) {
+			rc = dodelete( dn, pctrls );
+		} else if ( newrdn != NULL ) {
+			rc = dorename( dn, newrdn, newsup, deleteoldrdn, pctrls );
+		} else {
+			rc = domodify( dn, pmods, pctrls, new_entry );
+		}
 
+		if ( rc == LDAP_SUCCESS ) {
+			rc = 0;
+		}
+	}
+
+leave:
     if (pctrls != NULL) {
-        ldap_controls_free( pctrls );
-    }
+    	ldap_controls_free( pctrls );
+	}
+	if ( lm != NULL ) {
+		ber_memfree( lm );
+	}
+	if ( mops != NULL ) {
+		ber_memfree( mops );
+	}
+	for (i=lines-1; i>=0; i--)
+		if ( freeval[i] ) ber_memfree( vals[i].bv_val );
+	ber_memfree( btype );
 
-    return( rc );
+	return( rc );
 }
 
 /* Parse an LDIF control line of the form
@@ -1196,199 +896,123 @@ end_line:
    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(*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(*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(*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(*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(*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 */
-            ;
-        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 )
+parse_ldif_control(
+	struct berval *bval,
+	LDAPControl ***ppctrls )
 {
-	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;
-			}
-		}
+	char *oid = NULL;
+	int criticality = 0;   /* Default is false if not present */
+	int i, rc=0;
+	char *s, *oidStart;
+	LDAPControl *newctrl = NULL;
+	LDAPControl **pctrls = NULL;
+	struct berval type, bv;
+	int freeval;
+
+	if (ppctrls) pctrls = *ppctrls;
+	/* OID should come first. Validate and extract it. */
+	s = bval->bv_val;
+	if (*s == 0) return ( LDAP_PARAM_ERROR );
+	oidStart = s;
+	while (isdigit((unsigned char)*s) || *s == '.') {
+		s++;                           /* OID should be digits or . */
 	}
-
-	if ( pmods == NULL || pmods[ i ] == NULL ) {
-		if (( pmods = (LDAPMod **)ber_memrealloc( pmods, (i + 2) *
-			sizeof( LDAPMod * ))) == NULL )
-		{
-			perror( "realloc" );
-			exit( EXIT_FAILURE );
+	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 */
+	}
 
-		*pmodsp = pmods;
-		pmods[ i + 1 ] = NULL;
-
-		pmods[ i ] = (LDAPMod *)ber_memcalloc( 1, sizeof( LDAPMod ));
-		if ( pmods[ i ] == NULL ) {
-			perror( "calloc" );
-			exit( EXIT_FAILURE );
-		}
+	oid = ber_strdup(oidStart);
+	if (oid == NULL) return ( LDAP_NO_MEMORY );
 
-		pmods[ i ]->mod_op = modop;
-		pmods[ i ]->mod_type = ber_strdup( attr );
-		if ( pmods[ i ]->mod_type == NULL ) {
-			perror( "strdup" );
-			exit( EXIT_FAILURE );
-		}
+	/* 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;
 	}
 
-	if ( val != NULL ) {
-		j = 0;
-		if ( pmods[ i ]->mod_bvalues != NULL ) {
-			for ( ; pmods[ i ]->mod_bvalues[ j ] != NULL; ++j ) {
-				/* Empty */;
-			}
+	/* 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;
+		}
+
+		/* Back up so value is in the form
+		     a: value
+		     a:: base64-value
+		     a:< url
+		   Then we can use ldif_parse_line2 to extract and decode the value
+		*/
+		s--;
+		*s = 'a';
+
+		rc = ldif_parse_line2(s, &type, &bv, &freeval);
+		if (rc < 0) {
+			rc = LDAP_PARAM_ERROR;
+			goto cleanup;
 		}
+    }
 
-		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 );
+	/* 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;
+	if ( freeval )
+		newctrl->ldctl_value = bv;
+	else
+		ber_dupbv( &newctrl->ldctl_value, &bv );
+
+	/* 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;
 
-		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 );
+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 (oid) ber_memfree(oid);
+
+	return( rc );
 }
 
 
@@ -1396,105 +1020,135 @@ static int
 domodify(
 	const char *dn,
 	LDAPMod **pmods,
-    LDAPControl **pctrls,
+	LDAPControl **pctrls,
 	int newentry )
 {
-    int			i, j, k, notascii, op;
-    struct berval	*bvp;
-
-    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;
+	int			rc, i, j, k, notascii, op;
+	struct berval	*bvp;
+
+	if ( dn == NULL ) {
+		fprintf( stderr, _("%s: no DN specified\n"), prog );
+		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" : "delete", 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 ( pmods == NULL ) {
+		/* 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 );
+
+	} else {
+		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;
 			}
-		    }
-		    if ( notascii ) {
-			printf( "\tNOT ASCII (%ld bytes)\n", bvp->bv_len );
-		    } else {
-			printf( "\t%s\n", bvp->bv_val );
-		    }
 		}
-	    }
-	}
-    }
 
-    if ( newentry ) {
-	printf( "%sadding new entry \"%s\"\n", not ? "!" : "", dn );
-    } else {
-	printf( "%smodifying entry \"%s\"\n", not ? "!" : "", dn );
-    }
+		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 ( !not ) {
 	if ( newentry ) {
-	    i = ldap_add_ext_s( ld, dn, pmods, pctrls, NULL );
+		printf( "%sadding new entry \"%s\"\n", dont ? "!" : "", dn );
 	} else {
-	    i = ldap_modify_ext_s( ld, dn, pmods, pctrls, NULL );
-	}
-	if ( i != 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" );
-	} else if ( verbose ) {
-	    printf( "modify complete\n" );
+		printf( "%smodifying entry \"%s\"\n", dont ? "!" : "", dn );
 	}
-    } else {
-	i = LDAP_SUCCESS;
-    }
 
-    putchar( '\n' );
+	if ( !dont ) {
+		int	msgid;
+		if ( newentry ) {
+			rc = ldap_add_ext( ld, dn, pmods, pctrls, NULL, &msgid );
+		} else {
+			rc = ldap_modify_ext( ld, dn, pmods, pctrls, NULL, &msgid );
+		}
 
-    return( i );
+		if ( rc != LDAP_SUCCESS ) {
+			/* print error message about failed update including DN */
+			fprintf( stderr, _("%s: update failed: %s\n"), prog, dn );
+			tool_perror( newentry ? "ldap_add" : "ldap_modify",
+				rc, NULL, NULL, NULL, NULL );
+			goto done;
+		}
+		rc = process_response( ld, msgid,
+			newentry ? LDAP_RES_ADD : LDAP_RES_MODIFY, dn );
+
+		if ( verbose && rc == LDAP_SUCCESS ) {
+			printf( _("modify complete\n") );
+		}
+
+	} else {
+		rc = LDAP_SUCCESS;
+	}
+
+done:
+	putchar( '\n' );
+	return rc;
 }
 
 
 static int
 dodelete(
 	const char *dn,
-    LDAPControl **pctrls )
+	LDAPControl **pctrls )
 {
-    int	rc;
-
-    printf( "%sdeleting entry \"%s\"\n", not ? "!" : "", dn );
-    if ( !not ) {
-	if (( rc = ldap_delete_ext_s( ld, dn, pctrls, NULL )) != LDAP_SUCCESS ) {
-		fprintf( stderr, "%s: delete failed: %s\n", prog, dn );
-		ldap_perror( ld, "ldap_delete" );
-	} else if ( verbose ) {
-	    printf( "delete complete" );
-	}
-    } else {
-	rc = LDAP_SUCCESS;
-    }
+	int	rc;
+	int msgid;
 
-    putchar( '\n' );
+	printf( _("%sdeleting entry \"%s\"\n"), dont ? "!" : "", dn );
+	if ( !dont ) {
+		rc = ldap_delete_ext( ld, dn, pctrls, NULL, &msgid );
+		if ( rc != LDAP_SUCCESS ) {
+			fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn );
+			tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
+			goto done;
+		}
+		rc = process_response( ld, msgid, LDAP_RES_DELETE, dn );
+
+		if ( verbose && rc == LDAP_SUCCESS ) {
+			printf( _("delete complete\n") );
+		}
+	} else {
+		rc = LDAP_SUCCESS;
+	}
 
-    return( rc );
+done:
+	putchar( '\n' );
+	return( rc );
 }
 
 
@@ -1504,69 +1158,115 @@ dorename(
 	const char *newrdn,
 	const char* newsup,
 	int deleteoldrdn,
-    LDAPControl **pctrls )
+	LDAPControl **pctrls )
 {
-    int	rc;
+	int	rc;
+	int msgid;
 
+	printf( _("%smodifying rdn of entry \"%s\"\n"), dont ? "!" : "", dn );
+	if ( verbose ) {
+		printf( _("\tnew RDN: \"%s\" (%skeep existing values)\n"),
+			newrdn, deleteoldrdn ? _("do not ") : "" );
+	}
+	if ( !dont ) {
+		rc = ldap_rename( ld, dn, newrdn, newsup, deleteoldrdn,
+			pctrls, NULL, &msgid );
+		if ( rc != LDAP_SUCCESS ) {
+			fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn );
+			tool_perror( "ldap_rename", rc, NULL, NULL, NULL, NULL );
+			goto done;
+		}
+		rc = process_response( ld, msgid, LDAP_RES_RENAME, dn );
 
-    printf( "%smodifying rdn of entry \"%s\"\n", not ? "!" : "", dn );
-    if ( verbose ) {
-	printf( "\tnew RDN: \"%s\" (%skeep existing values)\n",
-		newrdn, deleteoldrdn ? "do not " : "" );
-    }
-    if ( !not ) {
-	if (( rc = ldap_rename_s( ld, dn, newrdn, newsup, deleteoldrdn, pctrls, NULL ))
-		!= LDAP_SUCCESS ) {
-		fprintf( stderr, "%s: rename failed: %s\n", prog, dn );
-		ldap_perror( ld, "ldap_modrdn" );
+		if ( verbose && rc == LDAP_SUCCESS ) {
+			printf( _("rename complete\n") );
+		}
 	} else {
-	    printf( "modrdn completed\n" );
+		rc = LDAP_SUCCESS;
 	}
-    } else {
-	rc = LDAP_SUCCESS;
-    }
-
-    putchar( '\n' );
 
-    return( rc );
+done:
+	putchar( '\n' );
+	return( rc );
 }
 
+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 );
+	}
 
-static char *
-read_one_record( FILE *fp )
-{
-    char        *buf, line[ LDAPMOD_MAXLINE ];
-    int		lcur, lmax;
+	return "ldap_unknown";
+}
 
-    lcur = lmax = 0;
-    buf = NULL;
+static int process_response(
+	LDAP *ld,
+	int msgid,
+	int op,
+	const char *dn )
+{
+	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 );
+	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 );
 
-    return( buf );
-}
+	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;
+	}
+
+	if ( text ) ldap_memfree( text );
+	if ( matched ) ldap_memfree( matched );
+	if ( text ) ber_memvfree( (void **)refs );
 
+	if ( ctrls ) {
+		tool_print_ctrls( ld, ctrls );
+		ldap_controls_free( ctrls );
+	}
+
+	return rc;
+}