diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-06-08 08:15:57 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-06-08 09:40:06 +0200 |
| commit | faabc97c9adffd9468a5d1606467359a81445cf3 (patch) | |
| tree | 14f47ad167a071bd73c25398fcb4cdbad61f5b2b /nsswitch | |
| parent | 9726e760288df8ec80a07063bab9f7e96d2e80da (diff) | |
| download | samba-faabc97c9adffd9468a5d1606467359a81445cf3.tar.gz | |
async_sock: try fix the source4 build on FreeBSD, Solaris, SLES8
metze
Diffstat (limited to 'nsswitch')
| -rw-r--r-- | nsswitch/libwbclient/wb_reqtrans.c | 8 | ||||
| -rw-r--r-- | nsswitch/libwbclient/wbc_async.c | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/nsswitch/libwbclient/wb_reqtrans.c b/nsswitch/libwbclient/wb_reqtrans.c index 84ed7198f2f..5328423b15f 100644 --- a/nsswitch/libwbclient/wb_reqtrans.c +++ b/nsswitch/libwbclient/wb_reqtrans.c @@ -28,18 +28,14 @@ #include "system/network.h" #include <talloc.h> #include <tevent.h> -struct fd_event; -struct event_context; #include "lib/async_req/async_sock.h" #include "lib/util/tevent_unix.h" #include "nsswitch/winbind_struct_protocol.h" #include "nsswitch/libwbclient/wbclient.h" #include "nsswitch/libwbclient/wbc_async.h" -#ifdef DBGC_CLASS -#undef DBGC_CLASS -#define DBGC_CLASS DBGC_WINBIND -#endif +/* can't use DEBUG here... */ +#define DEBUG(a,b) struct req_read_state { struct winbindd_request *wb_req; diff --git a/nsswitch/libwbclient/wbc_async.c b/nsswitch/libwbclient/wbc_async.c index 5f985f9d5ac..fb8d8b102d4 100644 --- a/nsswitch/libwbclient/wbc_async.c +++ b/nsswitch/libwbclient/wbc_async.c @@ -26,8 +26,6 @@ #include "system/network.h" #include <talloc.h> #include <tevent.h> -struct fd_event; -struct event_context; #include "lib/async_req/async_sock.h" #include "nsswitch/winbind_struct_protocol.h" #include "nsswitch/libwbclient/wbclient.h" @@ -254,7 +252,7 @@ static struct tevent_req *wb_connect_send(TALLOC_CTX *mem_ctx, /* Connect to socket */ - path = talloc_asprintf(talloc_tos(), "%s/%s", dir, + path = talloc_asprintf(mem_ctx, "%s/%s", dir, WINBINDD_SOCKET_NAME); if (path == NULL) { goto nomem; @@ -613,7 +611,7 @@ static bool wb_trans_retry(struct tevent_req *req, } subreq = tevent_wakeup_send(state, state->ev, - timeval_current_ofs(1, 0)); + tevent_timeval_current_ofs(1, 0)); if (tevent_req_nomem(subreq, req)) { return true; } |