sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

lib: Make g_lock_locks use TDB_DATA

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

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Thu Feb  8 14:50:49 CET 2018 on sn-devel-144
This commit is contained in:
Volker Lendecke 2017-12-03 20:47:02 +01:00 committed by Ralph Boehme
parent 67fcc7dbb9
commit be3c8d08ec
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/g_lock.h
View File

@ -56,7 +56,7 @@ NTSTATUS g_lock_do(TDB_DATA key, enum g_lock_type lock_type,
void (*fn)(void *private_data), void *private_data);
int g_lock_locks(struct g_lock_ctx *ctx,
int (*fn)(const char *name, void *private_data),
int (*fn)(TDB_DATA key, void *private_data),
void *private_data);
NTSTATUS g_lock_dump(struct g_lock_ctx *ctx, TDB_DATA key,
void (*fn)(const struct g_lock_rec *locks,

10
source3/lib/g_lock.c
View File

@ -625,7 +625,7 @@ NTSTATUS g_lock_write_data(struct g_lock_ctx *ctx, TDB_DATA key,
}
struct g_lock_locks_state {
int (*fn)(const char *name, void *private_data);
int (*fn)(TDB_DATA key, void *private_data);
void *private_data;
};
@ -635,15 +635,11 @@ static int g_lock_locks_fn(struct db_record *rec, void *priv)
struct g_lock_locks_state *state = (struct g_lock_locks_state *)priv;
key = dbwrap_record_get_key(rec);
if ((key.dsize == 0) || (key.dptr[key.dsize-1] != 0)) {
DEBUG(1, ("invalid key in g_lock.tdb, ignoring\n"));
return 0;
}
return state->fn((char *)key.dptr, state->private_data);
return state->fn(key, state->private_data);
}
int g_lock_locks(struct g_lock_ctx *ctx,
int (*fn)(const char *name, void *private_data),
int (*fn)(TDB_DATA key, void *private_data),
void *private_data)
{
struct g_lock_locks_state state;

8
source3/utils/net_g_lock.c
View File

@ -154,9 +154,13 @@ done:
return ret;
}
static int net_g_lock_locks_fn(const char *name, void *private_data)
static int net_g_lock_locks_fn(TDB_DATA key, void *private_data)
{
d_printf("%s\n", name);
if ((key.dsize == 0) || (key.dptr[key.dsize-1] != 0)) {
DEBUG(1, ("invalid key in g_lock.tdb, ignoring\n"));
return 0;
}
d_printf("%s\n", (const char *)key.dptr);
return 0;
}