s3-dbwrap: Make dbwrap_fallback_fetch private

diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index adda8e6060e93239d8c50ee50a5f0b354a9ec37f..1232b7991f234db69e84cc69823ae3fae29159d1 100644 (file)
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -28,8 +28,9 @@
  * Fall back using fetch_locked if no genuine fetch operation is provided
  */
 
-NTSTATUS dbwrap_fallback_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
-                              TDB_DATA key, TDB_DATA *data)
+static NTSTATUS dbwrap_fallback_fetch(struct db_context *db,
+                                     TALLOC_CTX *mem_ctx,
+                                     TDB_DATA key, TDB_DATA *data)
 {
        struct db_record *rec;
 
@@ -133,7 +134,9 @@ NTSTATUS dbwrap_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
        if (value == NULL) {
                return NT_STATUS_INVALID_PARAMETER;
        }
-
+       if (db->fetch == NULL) {
+               return dbwrap_fallback_fetch(db, mem_ctx, key, value);
+       }
        return db->fetch(db, mem_ctx, key, value);
 }
 

diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index 47cc5a769e0007d187428c0a6e9a6c57f29952fe..bc2dbab449e46b3bf0f64fe91ebc9ccd556c53a7 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -110,9 +110,6 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
                                     tdb_flags, open_flags, mode);
        }
 
-       if ((result != NULL) && (result->fetch == NULL)) {
-               result->fetch = dbwrap_fallback_fetch;
-       }
        if ((result != NULL) && (result->parse_record == NULL)) {
                result->parse_record = dbwrap_fallback_parse_record;
        }

diff --git a/source3/lib/dbwrap/dbwrap_private.h b/source3/lib/dbwrap/dbwrap_private.h
index e7bd480cbbab52a449858a2ecf940e04f7fdcc71..5a7ca335139ede9b421b76e37ff1465ff6dd0d05 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_private.h
+++ b/source3/lib/dbwrap/dbwrap_private.h
@@ -59,10 +59,6 @@ struct db_context {
        bool persistent;
 };
 
-NTSTATUS dbwrap_fallback_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
-                              TDB_DATA key, TDB_DATA *data);
-
-
 int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key,
                                 int (*parser)(TDB_DATA key,
                                               TDB_DATA data,