diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-12-24 09:00:01 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-01-30 18:49:37 +0100 |
| commit | 0b23345676c6f02d5bb1a327174d8456705ec0c7 (patch) | |
| tree | 3b4481940b67fc1aa247d5608d71c00f59a73a01 /source3 | |
| parent | 6b2d67a345e90306f0d35402d0f4e3067a014057 (diff) | |
| download | samba-0b23345676c6f02d5bb1a327174d8456705ec0c7.tar.gz | |
s3:smbd: skip empty records in smbXsrv_open_cleanup()
This should avoid scary ndr_pull errors, if there's
a cleanup race.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Jan 30 18:49:37 CET 2014 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/smbXsrv_open.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c index 3566dc25918..3e2fed3ac14 100644 --- a/source3/smbd/smbXsrv_open.c +++ b/source3/smbd/smbXsrv_open.c @@ -1388,6 +1388,7 @@ NTSTATUS smbXsrv_open_cleanup(uint64_t persistent_id) struct smbXsrv_open_global0 *op = NULL; uint8_t key_buf[SMBXSRV_OPEN_GLOBAL_TDB_KEY_SIZE]; TDB_DATA key; + TDB_DATA val; struct db_record *rec; bool delete_open = false; uint32_t global_id = persistent_id & UINT32_MAX; @@ -1403,6 +1404,14 @@ NTSTATUS smbXsrv_open_cleanup(uint64_t persistent_id) goto done; } + val = dbwrap_record_get_value(rec); + if (val.dsize == 0) { + DEBUG(10, ("smbXsrv_open_cleanup[global: 0x%08x] " + "empty record in %s, skipping...\n", + global_id, dbwrap_name(smbXsrv_open_global_db_ctx))); + goto done; + } + status = smbXsrv_open_global_parse_record(talloc_tos(), rec, &op); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("smbXsrv_open_cleanup[global: 0x%08x] " |