summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-08-17 08:35:21 +0200
committerMichael Adam <obnox@samba.org>2011-10-11 14:17:55 +0200
commitc3868b74889ccce800557a64d2a5ae6a8891a8ee (patch)
tree3ee5fe633dc069c0739202718c9642df13f72096 /source3
parent7a72c84ee74cb91fd9e98b1edc74e6b3c2ba1c36 (diff)
downloadsamba-c3868b74889ccce800557a64d2a5ae6a8891a8ee.tar.gz
samba-c3868b74889ccce800557a64d2a5ae6a8891a8ee.tar.bz2
samba-c3868b74889ccce800557a64d2a5ae6a8891a8ee.zip
s3:dbwrap: move dbwrap_fetch() back to dbwrap.c, the core of the dbwrap subsystem
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/dbwrap/dbwrap.c14
-rw-r--r--source3/lib/dbwrap/dbwrap_util.c12
2 files changed, 14 insertions, 12 deletions
diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index 6a6d4c64e5..5b87fd3154 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_private.h"
+#include "util_tdb.h"
/*
* Fall back using fetch_locked if no genuine fetch operation is provided
@@ -64,3 +65,16 @@ int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key,
TALLOC_FREE(data.dptr);
return res;
}
+
+
+TDB_DATA dbwrap_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
+ TDB_DATA key)
+{
+ TDB_DATA result;
+
+ if (db->fetch(db, mem_ctx, key, &result) != 0) {
+ return make_tdb_data(NULL, 0);
+ }
+
+ return result;
+}
diff --git a/source3/lib/dbwrap/dbwrap_util.c b/source3/lib/dbwrap/dbwrap_util.c
index effcf40c6b..a950d51404 100644
--- a/source3/lib/dbwrap/dbwrap_util.c
+++ b/source3/lib/dbwrap/dbwrap_util.c
@@ -487,18 +487,6 @@ NTSTATUS dbwrap_store(struct db_context *db, TDB_DATA key,
return status;
}
-TDB_DATA dbwrap_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
- TDB_DATA key)
-{
- TDB_DATA result;
-
- if (db->fetch(db, mem_ctx, key, &result) != 0) {
- return make_tdb_data(NULL, 0);
- }
-
- return result;
-}
-
NTSTATUS dbwrap_delete_bystring(struct db_context *db, const char *key)
{
return dbwrap_delete(db, string_term_tdb_data(key));