diff options
| author | Volker Lendecke <vl@samba.org> | 2017-12-03 20:47:02 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2018-02-08 14:50:49 +0100 |
| commit | be3c8d08ec6331c2d4c1724cb3933c34fb7d7f0f (patch) | |
| tree | 5052987050aee2e858a5579069b81d7ad2e6f408 /source3/lib/g_lock.c | |
| parent | 67fcc7dbb9ad63886c594b1f563b6c1d2060cbd1 (diff) | |
| download | samba-be3c8d08ec6331c2d4c1724cb3933c34fb7d7f0f.tar.gz | |
lib: Make g_lock_locks use TDB_DATA
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
Diffstat (limited to 'source3/lib/g_lock.c')
| -rw-r--r-- | source3/lib/g_lock.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c index 3988cec2e3c..9ce0e062275 100644 --- a/source3/lib/g_lock.c +++ b/source3/lib/g_lock.c @@ -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; |