The branch, master has been updated via cce6b67 dbwrap_ctdb: Fix ENOENT->NT_STATUS_NOT_FOUND from 32b1f78 LDB: Redudant test on NULL context remove
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit cce6b677ff90ef361c45a7b8ad3d482908c3c4a7 Author: Volker Lendecke <v...@samba.org> Date: Wed Apr 20 13:27:07 2016 +0200 dbwrap_ctdb: Fix ENOENT->NT_STATUS_NOT_FOUND Bug: https://bugzilla.samba.org/show_bug.cgi?id=11844 Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Tue Apr 26 14:34:14 CEST 2016 on sn-devel-144 ----------------------------------------------------------------------- Summary of changes: source3/lib/dbwrap/dbwrap_ctdb.c | 10 ++++++++++ 1 file changed, 10 insertions(+) Changeset truncated at 500 lines: diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 1e4df09..532240d 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -1298,6 +1298,16 @@ static NTSTATUS db_ctdb_parse_record(struct db_context *db, TDB_DATA key, ret = ctdbd_parse(messaging_ctdbd_connection(), ctx->db_id, key, state.ask_for_readonly_copy, parser, private_data); if (ret != 0) { + if (ret == ENOENT) { + /* + * This maps to + * NT_STATUS_OBJECT_NAME_NOT_FOUND. Our upper + * layers expect NT_STATUS_NOT_FOUND for "no + * record around". We need to convert dbwrap + * to 0/errno away from NTSTATUS ... :-) + */ + return NT_STATUS_NOT_FOUND; + } return map_nt_error_from_unix(ret); } return NT_STATUS_OK; -- Samba Shared Repository