The branch, master has been updated
via 4a777ec... Attempt to fix the s4 build -- we can not use
map_nt_error_from_unix in lib/
from f668e41... s3: Convert cli_set_unix_extensions_capabilities_send to
async
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4a777ec4d709d2fce2378b7b4d740aa73c32e73b
Author: Volker Lendecke <[email protected]>
Date: Sat Nov 14 11:32:00 2009 +0100
Attempt to fix the s4 build -- we can not use map_nt_error_from_unix in lib/
-----------------------------------------------------------------------
Summary of changes:
lib/util/tevent_ntstatus.c | 17 -----------------
lib/util/tevent_ntstatus.h | 8 --------
source3/include/proto.h | 3 +++
source3/lib/util.c | 11 +++++++++++
4 files changed, 14 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/tevent_ntstatus.c b/lib/util/tevent_ntstatus.c
index e6b37f6..4be4575 100644
--- a/lib/util/tevent_ntstatus.c
+++ b/lib/util/tevent_ntstatus.c
@@ -74,20 +74,3 @@ void tevent_req_simple_finish_ntstatus(struct tevent_req
*subreq,
}
tevent_req_done(req);
}
-
-/*
- * We have to declare map_nt_error_from_unix here, both s3 and s4 have their
- * (different) implementations of it.
- */
-NTSTATUS map_nt_error_from_unix(int sys_errno);
-
-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;
-}
diff --git a/lib/util/tevent_ntstatus.h b/lib/util/tevent_ntstatus.h
index 7f312b7..4cf593a 100644
--- a/lib/util/tevent_ntstatus.h
+++ b/lib/util/tevent_ntstatus.h
@@ -36,12 +36,4 @@ NTSTATUS tevent_req_simple_recv_ntstatus(struct tevent_req
*req);
void tevent_req_simple_finish_ntstatus(struct tevent_req *subreq,
NTSTATUS subreq_status);
-/*
- * Wrapper for tevent_req_poll that grabs NTSTATUS directly in case of a
- * failure
- */
-bool tevent_req_poll_ntstatus(struct tevent_req *req,
- struct tevent_context *ev,
- NTSTATUS *status);
-
#endif
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8c0a3e3..d4e0ac5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1228,6 +1228,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 247042d..9d12e5b 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -3080,3 +3080,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;
+}
--
Samba Shared Repository
