From 81333e1b9d67f58c05f44343a754376a0b5f4607 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 22 Dec 2010 15:21:27 +0100 Subject: [PATCH] v3-5-test: Pull in tevent_req_poll_ntstatus from master (cherry picked from commit 0b13028cb4d6fc2ff267df477b5c2c4291286a43) --- source3/include/proto.h | 3 +++ source3/lib/util.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/source3/include/proto.h b/source3/include/proto.h index bcedbd6d2d4..9f025e2c599 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1238,6 +1238,9 @@ bool is_valid_policy_hnd(const struct policy_handle *hnd); bool policy_hnd_equal(const struct policy_handle *hnd1, const struct policy_handle *hnd2); const char *strip_hostname(const char *s); +bool tevent_req_poll_ntstatus(struct tevent_req *req, + struct tevent_context *ev, + NTSTATUS *status); /* The following definitions come from lib/util_file.c */ diff --git a/source3/lib/util.c b/source3/lib/util.c index fad6c7aa42f..ee45da09004 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -3070,3 +3070,14 @@ const char *strip_hostname(const char *s) return s; } + +bool tevent_req_poll_ntstatus(struct tevent_req *req, + struct tevent_context *ev, + NTSTATUS *status) +{ + bool ret = tevent_req_poll(req, ev); + if (!ret) { + *status = map_nt_error_from_unix(errno); + } + return ret; +} -- 2.11.4.GIT