summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-08-17 08:38:39 +0200
committerMichael Adam <obnox@samba.org>2011-10-11 14:17:55 +0200
commit663c661b11396076a079a99d1f66fafb732af1d8 (patch)
tree60dc3081cb60960fabf8ba275fcf09e3837a86ea
parent2aa5601c0aa1c38e2cb3b86331b746261e74b2ce (diff)
downloadsamba-663c661b11396076a079a99d1f66fafb732af1d8.tar.gz
samba-663c661b11396076a079a99d1f66fafb732af1d8.tar.bz2
samba-663c661b11396076a079a99d1f66fafb732af1d8.zip
s3:dbwrap: move dbwrap_store() back to dbwrap.c, the core of the dbwrap subsystem
-rw-r--r--source3/lib/dbwrap/dbwrap.c16
-rw-r--r--source3/lib/dbwrap/dbwrap_util.c16
2 files changed, 16 insertions, 16 deletions
diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index 5054316271..e9baa13c1b 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -79,6 +79,22 @@ TDB_DATA dbwrap_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
return result;
}
+NTSTATUS dbwrap_store(struct db_context *db, TDB_DATA key,
+ TDB_DATA data, int flags)
+{
+ struct db_record *rec;
+ NTSTATUS status;
+
+ rec = db->fetch_locked(db, talloc_tos(), key);
+ if (rec == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ status = rec->store(rec, data, flags);
+ TALLOC_FREE(rec);
+ return status;
+}
+
NTSTATUS dbwrap_delete(struct db_context *db, TDB_DATA key)
{
struct db_record *rec;
diff --git a/source3/lib/dbwrap/dbwrap_util.c b/source3/lib/dbwrap/dbwrap_util.c
index 1216e2e25f..9ca781caf2 100644
--- a/source3/lib/dbwrap/dbwrap_util.c
+++ b/source3/lib/dbwrap/dbwrap_util.c
@@ -456,22 +456,6 @@ NTSTATUS dbwrap_traverse(struct db_context *db,
}
-NTSTATUS dbwrap_store(struct db_context *db, TDB_DATA key,
- TDB_DATA data, int flags)
-{
- struct db_record *rec;
- NTSTATUS status;
-
- rec = db->fetch_locked(db, talloc_tos(), key);
- if (rec == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
-
- status = rec->store(rec, data, flags);
- TALLOC_FREE(rec);
- return status;
-}
-
NTSTATUS dbwrap_delete_bystring(struct db_context *db, const char *key)
{
return dbwrap_delete(db, string_term_tdb_data(key));