v3-4-test: Pull in tevent_req_poll_ntstatus from master

(cherry picked from commit 9b79de1553cfa57d24d1ac0316b814933ef3d33d)

2 files changed, 14 insertions, 0 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index a6ac5122d1f..35ac19b38b7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1221,6 +1221,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 3d7336f957b..c9afe7b6a91 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -3188,3 +3188,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;
+}