ports/net/samba47/files/patch-dbwrap
Timur I. Bakeyev 787829268c Update Samba 4.6 and 4.7 to the most recent versions
Sponsored by:	iXsystems Inc.
2018-05-17 03:37:14 +00:00

96 lines
2.8 KiB
Text

--- lib/dbwrap/dbwrap.c.orig 2018-01-17 10:08:39 UTC
+++ lib/dbwrap/dbwrap.c
@@ -28,6 +28,9 @@
#include "lib/util/util_tdb.h"
#include "lib/util/tevent_ntstatus.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/*
* Fall back using fetch if no genuine exists operation is provided
*/
--- lib/dbwrap/dbwrap_local_open.c.orig 2018-01-14 21:41:58.000000000 +0100
+++ lib/dbwrap/dbwrap_local_open.c 2018-03-29 23:49:51.888588000 +0200
@@ -24,6 +24,9 @@
#include "tdb.h"
#include "lib/param/param.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx,
struct loadparm_context *lp_ctx,
const char *name,
--- lib/dbwrap/dbwrap_rbt.c.orig 2018-01-17 09:08:39.000000000 +0100
+++ lib/dbwrap/dbwrap_rbt.c 2018-03-29 23:50:13.427755000 +0200
@@ -24,6 +24,9 @@
#include "../lib/util/rbtree.h"
#include "../lib/util/dlinklist.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
#define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)
struct db_rbt_ctx {
--- lib/dbwrap/dbwrap_tdb.c.orig 2018-01-17 09:08:39.000000000 +0100
+++ lib/dbwrap/dbwrap_tdb.c 2018-03-29 23:50:40.789642000 +0200
@@ -27,6 +27,9 @@
#include "lib/param/param.h"
#include "libcli/util/error.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
struct db_tdb_ctx {
struct tdb_wrap *wtdb;
--- lib/dbwrap/dbwrap_util.c.orig 2018-01-17 09:08:39.000000000 +0100
+++ lib/dbwrap/dbwrap_util.c 2018-03-29 23:51:35.907061000 +0200
@@ -26,6 +26,9 @@
#include "dbwrap.h"
#include "lib/util/util_tdb.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
struct dbwrap_fetch_int32_state {
NTSTATUS status;
int32_t result;
--- source3/lib/dbwrap/dbwrap_ctdb.c.orig 2018-01-17 09:08:39.000000000 +0100
+++ source3/lib/dbwrap/dbwrap_ctdb.c 2018-03-29 23:57:41.784931000 +0200
@@ -38,6 +38,9 @@
#include "lib/cluster_support.h"
#include "lib/util/tevent_ntstatus.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
struct db_ctdb_transaction_handle {
struct db_ctdb_ctx *ctx;
/*
--- source3/lib/dbwrap/dbwrap_open.c.orig 2018-01-17 09:08:39.000000000 +0100
+++ source3/lib/dbwrap/dbwrap_open.c 2018-03-29 23:57:54.680614000 +0200
@@ -31,6 +31,9 @@
#include "ctdbd_conn.h"
#include "messages.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
bool db_is_local(const char *name)
{
const char *sockname = lp_ctdbd_socket();
--- source3/lib/dbwrap/dbwrap_watch.c.orig 2018-01-17 09:08:39.000000000 +0100
+++ source3/lib/dbwrap/dbwrap_watch.c 2018-03-29 23:58:09.746298000 +0200
@@ -28,6 +28,9 @@
#include "server_id_watch.h"
#include "lib/dbwrap/dbwrap_private.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
static ssize_t dbwrap_record_watchers_key(struct db_context *db,
struct db_record *rec,
uint8_t *wkey, size_t wkey_len)