sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lib: Make g_lock_lock_send use TDB_DATA

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2017-12-03 20:47:02 +01:00 committed by Ralph Boehme
parent c7d0e6f39b
commit 3bc87a20e9
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcli/auth/netlogon_creds_cli.c
View File

@ -765,7 +765,7 @@ struct tevent_req *netlogon_creds_cli_lock_send(TALLOC_CTX *mem_ctx,
subreq = g_lock_lock_send(state, ev, subreq = g_lock_lock_send(state, ev,
context->db.g_ctx, context->db.g_ctx,
context->db.key_name, string_term_tdb_data(context->db.key_name),
G_LOCK_WRITE); G_LOCK_WRITE);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev); return tevent_req_post(req, ev);
@ -978,7 +978,7 @@ struct tevent_req *netlogon_creds_cli_lck_send(
subreq = g_lock_lock_send(state, ev, subreq = g_lock_lock_send(state, ev,
context->db.g_ctx, context->db.g_ctx,
context->db.key_name, string_term_tdb_data(context->db.key_name),
gtype); gtype);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev); return tevent_req_post(req, ev);

2
source3/include/g_lock.h
View File

@ -41,7 +41,7 @@ struct g_lock_ctx *g_lock_ctx_init(TALLOC_CTX *mem_ctx,
struct tevent_req *g_lock_lock_send(TALLOC_CTX *mem_ctx, struct tevent_req *g_lock_lock_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev, struct tevent_context *ev,
struct g_lock_ctx *ctx, struct g_lock_ctx *ctx,
const char *name, TDB_DATA key,
enum g_lock_type type); enum g_lock_type type);
NTSTATUS g_lock_lock_recv(struct tevent_req *req); NTSTATUS g_lock_lock_recv(struct tevent_req *req);
NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name, NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,

15
source3/lib/g_lock.c
View File

@ -311,7 +311,7 @@ done:
struct g_lock_lock_state { struct g_lock_lock_state {
struct tevent_context *ev; struct tevent_context *ev;
struct g_lock_ctx *ctx; struct g_lock_ctx *ctx;
const char *name; TDB_DATA key;
enum g_lock_type type; enum g_lock_type type;
}; };
@ -343,7 +343,7 @@ static void g_lock_lock_fn(struct db_record *rec, void *private_data)
struct tevent_req *g_lock_lock_send(TALLOC_CTX *mem_ctx, struct tevent_req *g_lock_lock_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev, struct tevent_context *ev,
struct g_lock_ctx *ctx, struct g_lock_ctx *ctx,
const char *name, TDB_DATA key,
enum g_lock_type type) enum g_lock_type type)
{ {
struct tevent_req *req; struct tevent_req *req;
@ -357,15 +357,14 @@ struct tevent_req *g_lock_lock_send(TALLOC_CTX *mem_ctx,
} }
state->ev = ev; state->ev = ev;
state->ctx = ctx; state->ctx = ctx;
state->name = name; state->key = key;
state->type = type; state->type = type;
fn_state = (struct g_lock_lock_fn_state) { fn_state = (struct g_lock_lock_fn_state) {
.state = state, .self = messaging_server_id(ctx->msg) .state = state, .self = messaging_server_id(ctx->msg)
}; };
status = dbwrap_do_locked(ctx->db, string_term_tdb_data(name), status = dbwrap_do_locked(ctx->db, key, g_lock_lock_fn, &fn_state);
g_lock_lock_fn, &fn_state);
if (tevent_req_nterror(req, status)) { if (tevent_req_nterror(req, status)) {
DBG_DEBUG("dbwrap_do_locked failed: %s\n", DBG_DEBUG("dbwrap_do_locked failed: %s\n",
nt_errstr(status)); nt_errstr(status));
@ -418,8 +417,7 @@ static void g_lock_lock_retry(struct tevent_req *subreq)
.state = state, .self = messaging_server_id(state->ctx->msg) .state = state, .self = messaging_server_id(state->ctx->msg)
}; };
status = dbwrap_do_locked(state->ctx->db, status = dbwrap_do_locked(state->ctx->db, state->key,
string_term_tdb_data(state->name),
g_lock_lock_fn, &fn_state); g_lock_lock_fn, &fn_state);
if (tevent_req_nterror(req, status)) { if (tevent_req_nterror(req, status)) {
DBG_DEBUG("dbwrap_do_locked failed: %s\n", DBG_DEBUG("dbwrap_do_locked failed: %s\n",
@ -467,7 +465,8 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,
if (ev == NULL) { if (ev == NULL) {
goto fail; goto fail;
} }
req = g_lock_lock_send(frame, ev, ctx, name, type); req = g_lock_lock_send(frame, ev, ctx, string_term_tdb_data(name),
type);
if (req == NULL) { if (req == NULL) {
goto fail; goto fail;
} }

4
source3/torture/test_g_lock.c
View File

@ -24,6 +24,7 @@
#include "messages.h" #include "messages.h"
#include "lib/util/server_id.h" #include "lib/util/server_id.h"
#include "lib/util/sys_rw.h" #include "lib/util/sys_rw.h"
#include "lib/util/util_tdb.h"
static bool get_g_lock_ctx(TALLOC_CTX *mem_ctx, static bool get_g_lock_ctx(TALLOC_CTX *mem_ctx,
struct tevent_context **ev, struct tevent_context **ev,
@ -504,7 +505,8 @@ bool run_g_lock4(int dummy)
goto fail; goto fail;
} }
req = g_lock_lock_send(ev, ev, ctx, lockname, G_LOCK_WRITE); req = g_lock_lock_send(ev, ev, ctx, string_term_tdb_data(lockname),
G_LOCK_WRITE);
if (req == NULL) { if (req == NULL) {
fprintf(stderr, "g_lock_lock send failed\n"); fprintf(stderr, "g_lock_lock send failed\n");
goto fail; goto fail;