dbwrap: Add dbwrap_merge_dbufs

Transitional code to implement dbwrap_record_storev

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c
index 025d463b4bd74827f75aa4d27604166adb902a15..1f45558beb66c059b03063055437a2d609eaabb5 100644 (file)
--- a/lib/dbwrap/dbwrap.c
+++ b/lib/dbwrap/dbwrap.c
@@ -556,3 +556,51 @@ const char *dbwrap_name(struct db_context *db)
 {
        return db->name;
 }
+
+static ssize_t tdb_data_buf(const TDB_DATA *dbufs, int num_dbufs,
+                           uint8_t *buf, size_t buflen)
+{
+       size_t needed = 0;
+       uint8_t *p = buf;
+       int i;
+
+       for (i=0; i<num_dbufs; i++) {
+               size_t thislen = dbufs[i].dsize;
+               size_t tmp;
+
+               tmp = needed + thislen;
+               if (tmp < needed) {
+                       /* wrap */
+                       return -1;
+               }
+               needed = tmp;
+
+               if (needed <= buflen) {
+                       memcpy(p, dbufs[i].dptr, thislen);
+                       p += thislen;
+               }
+       }
+
+       return needed;
+}
+
+
+TDB_DATA dbwrap_merge_dbufs(TALLOC_CTX *mem_ctx,
+                           const TDB_DATA *dbufs, int num_dbufs)
+{
+       ssize_t len = tdb_data_buf(dbufs, num_dbufs, NULL, 0);
+       uint8_t *buf;
+
+       if (len == -1) {
+               return (TDB_DATA) {0};
+       }
+
+       buf = talloc_array(mem_ctx, uint8_t, len);
+       if (buf == NULL) {
+               return (TDB_DATA) {0};
+       }
+
+       tdb_data_buf(dbufs, num_dbufs, buf, len);
+
+       return (TDB_DATA) { .dptr = buf, .dsize = len };
+}

diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h
index fac65ee6cfeef36d6ff47e65273aa6d00c1425de..e34b2ab3882a7bdcba00d8019021007da878feb0 100644 (file)
--- a/lib/dbwrap/dbwrap.h
+++ b/lib/dbwrap/dbwrap.h
@@ -216,6 +216,9 @@ NTSTATUS dbwrap_parse_marshall_buf(const uint8_t *buf, size_t buflen,
 NTSTATUS dbwrap_unmarshall(struct db_context *db, const uint8_t *buf,
                           size_t buflen);
 
+TDB_DATA dbwrap_merge_dbufs(TALLOC_CTX *mem_ctx,
+                           const TDB_DATA *dbufs, int num_dbufs);
+
 
 /**
  * This opens a tdb file