sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

Attempt to fix the s4 build -- we can not use map_nt_error_from_unix in lib/

Browse Source
This commit is contained in:
Volker Lendecke 2009-11-14 11:32:00 +01:00
parent f668e4104f
commit 4a777ec4d7
4 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/util/tevent_ntstatus.c
View File

@ -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;
}

8
lib/util/tevent_ntstatus.h
View File

@ -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

3
source3/include/proto.h
View File

@ -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 */

11
source3/lib/util.c
View File

@ -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;
}