3 files changed, 105 insertions, 8 deletions

diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 3eb7cb8de2..92ed29e6b8 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -37,7 +37,7 @@
  int main(void)
 {
 	static struct ldb_context *ldb;
-	struct ldb_message *msg;
+	struct ldb_ldif *ldif;
 	int ret;
 	int count=0, failures=0;
 	const char *ldb_url;
@@ -54,16 +54,23 @@
 		exit(1);
 	}
 
-	while ((msg = ldif_read_file(stdin))) {
-		ret = ldb_add(ldb, msg);
+	while ((ldif = ldif_read_file(stdin))) {
+
+		if (ldif->changetype != LDB_CHANGETYPE_ADD &&
+		    ldif->changetype != LDB_CHANGETYPE_NONE) {
+			fprintf(stderr, "Only CHANGETYPE_ADD records allowed\n");
+			break;
+		}
+
+		ret = ldb_add(ldb, &ldif->msg);
 		if (ret != 0) {
 			fprintf(stderr, "ERR: \"%s\" on DN %s\n", 
-				ldb_errstring(ldb), msg->dn);
+				ldb_errstring(ldb), ldif->msg.dn);
 			failures++;
 		} else {
 			count++;
 		}
-		ldif_read_free(msg);
+		ldif_read_free(ldif);
 	}
 
 	ldb_close(ldb);
diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
new file mode 100644
index 0000000000..e1cff655db
--- /dev/null
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -0,0 +1,85 @@
+/* 
+   ldb database library
+
+   Copyright (C) Andrew Tridgell  2004
+
+     ** NOTE! The following LGPL license applies to the ldb
+     ** library. This does NOT imply that all of Samba is released
+     ** under the LGPL
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ *  Name: ldb
+ *
+ *  Component: ldbmodify
+ *
+ *  Description: utility to modify records - modelled on ldapmodify
+ *
+ *  Author: Andrew Tridgell
+ */
+
+#include "includes.h"
+
+ int main(void)
+{
+	static struct ldb_context *ldb;
+	struct ldb_ldif *ldif;
+	int ret;
+	int count=0, failures=0;
+	const char *ldb_url;
+
+	ldb_url = getenv("LDB_URL");
+	if (!ldb_url) {
+		ldb_url = "tdb://test.ldb";
+	}
+
+	ldb = ldb_connect(ldb_url, 0, NULL);
+
+	if (!ldb) {
+		perror("ldb_connect");
+		exit(1);
+	}
+
+	while ((ldif = ldif_read_file(stdin))) {
+		switch (ldif->changetype) {
+		case LDB_CHANGETYPE_NONE:
+		case LDB_CHANGETYPE_ADD:
+			ret = ldb_add(ldb, &ldif->msg);
+			break;
+		case LDB_CHANGETYPE_DELETE:
+			ret = ldb_delete(ldb, ldif->msg.dn);
+			break;
+		case LDB_CHANGETYPE_MODIFY:
+			ret = ldb_modify(ldb, &ldif->msg);
+			break;
+		}
+		if (ret != 0) {
+			fprintf(stderr, "ERR: \"%s\" on DN %s\n", 
+				ldb_errstring(ldb), ldif->msg.dn);
+			failures++;
+		} else {
+			count++;
+		}
+		ldif_read_free(ldif);
+	}
+
+	ldb_close(ldb);
+
+	printf("Modified %d records with %d failures\n", count, failures);
+	
+	return 0;
+}
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index d7d3c83162..f4eb8f00db 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -45,7 +45,7 @@
 	const char *ldb_url;
 	const char *basedn = NULL;
 	int opt;
-	enum ldb_scope scope = LDB_SCOPE_DEFAULT;
+	enum ldb_scope scope = LDB_SCOPE_SUBTREE;
 
 	ldb_url = getenv("LDB_URL");
 	if (!ldb_url) {
@@ -98,15 +98,20 @@
 	ret = ldb_search(ldb, basedn, scope, expression, attrs, &msgs);
 
 	if (ret == -1) {
-		printf("search failed\n");
+		printf("search failed - %s\n", ldb_errstring(ldb));
 		exit(1);
 	}
 
 	printf("# returned %d records\n", ret);
 
 	for (i=0;i<ret;i++) {
+		struct ldb_ldif ldif;
 		printf("# record %d\n", i+1);
-		ldif_write_file(stdout, msgs[i]);
+
+		ldif.changetype = LDB_CHANGETYPE_NONE;
+		ldif.msg = *msgs[i];
+
+		ldif_write_file(stdout, &ldif);
 	}
 
 	if (ret > 0) {