From b1b14817eaa6e6579596d54166e17bc8d5605c01 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 27 Feb 2005 11:35:47 +0000
Subject: r5585: LDB interfaces change:

changes:
- ldb_wrap disappears from code and become a private structure of db_wrap.c
  thanks to our move to talloc in ldb code, we do not need to expose it anymore

- removal of ldb_close() function form the code
  thanks to our move to talloc in ldb code, we do not need it anymore
  use talloc_free() to close and free an ldb database

- some minor updates to ldb modules code to cope with the change and fix some
  bugs I found out during the process
(This used to be commit d58be9e74b786a11a57e89df36081d55730dfe0a)
---
 source4/lib/ldb/tools/ldbadd.c    | 2 +-
 source4/lib/ldb/tools/ldbdel.c    | 2 +-
 source4/lib/ldb/tools/ldbedit.c   | 2 +-
 source4/lib/ldb/tools/ldbmodify.c | 2 +-
 source4/lib/ldb/tools/ldbrename.c | 2 +-
 source4/lib/ldb/tools/ldbsearch.c | 2 +-
 source4/lib/ldb/tools/ldbtest.c   | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'source4/lib/ldb/tools')

diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 927debc65e..41273a08da 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -153,7 +153,7 @@ static int process_file(struct ldb_context *ldb, FILE *f)
 		}
 	}
 
-	ldb_close(ldb);
+	talloc_free(ldb);
 
 	printf("Added %d records with %d failures\n", count, failures);
 	
diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index 2241a0b823..72540db07a 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.c
@@ -146,7 +146,7 @@ static void usage(void)
 		}
 	}
 
-	ldb_close(ldb);
+	talloc_free(ldb);
 
 	return 0;
 }
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index 20cb7da810..b9f82c282a 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -434,6 +434,6 @@ static void usage(void)
 		}
 	}
 
-	ldb_close(ldb);
+	talloc_free(ldb);
 	return 0;
 }
diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index 97dec1050e..78baa0e36c 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -156,7 +156,7 @@ static int process_file(struct ldb_context *ldb, FILE *f)
 		}
 	}
 
-	ldb_close(ldb);
+	talloc_free(ldb);
 
 	printf("Modified %d records with %d failures\n", count, failures);
 
diff --git a/source4/lib/ldb/tools/ldbrename.c b/source4/lib/ldb/tools/ldbrename.c
index ba870b0a45..273c792584 100644
--- a/source4/lib/ldb/tools/ldbrename.c
+++ b/source4/lib/ldb/tools/ldbrename.c
@@ -112,7 +112,7 @@ static void usage(void)
 			argv[0], argv[1], ldb_errstring(ldb));
 	}
 
-	ldb_close(ldb);
+	talloc_free(ldb);
 	
 	return ret;
 }
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index f764b28557..8d435e7661 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -176,6 +176,6 @@ static int do_search(struct ldb_context *ldb,
 		ret = do_search(ldb, basedn, scope, argv[0], attrs);
 	}
 
-	ldb_close(ldb);
+	talloc_free(ldb);
 	return ret;
 }
diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index a166447aae..86f39d4606 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -323,8 +323,8 @@ static void start_test_index(struct ldb_context **ldb)
 		exit(1);
 	}
 
-	if (ldb_close(*ldb) != 0) {
-		printf("ldb_close failed - %s\n", ldb_errstring(*ldb));
+	if (talloc_free(*ldb) != 0) {
+		printf("failed to free/close ldb database");
 		exit(1);
 	}
 
@@ -427,7 +427,7 @@ static void usage(void)
 
 	start_test_index(&ldb);
 
-	ldb_close(ldb);
+	talloc_free(ldb);
 
 	return 0;
 }
-- 
cgit