summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2009-02-02 22:14:57 +0100
committerKai Blin <kai@samba.org>2009-02-02 22:14:57 +0100
commit6ed02233c3d873d4aa6ee4306d61cc2aad465a5d (patch)
tree68aba520a40eb1a814bddc92e67f6581a04691a3
parentd3f9b0fab67285d061719e69c1c6e9c4ce80fb36 (diff)
downloadsamba-6ed02233c3d873d4aa6ee4306d61cc2aad465a5d.tar.gz
samba-6ed02233c3d873d4aa6ee4306d61cc2aad465a5d.tar.bz2
samba-6ed02233c3d873d4aa6ee4306d61cc2aad465a5d.zip
s3-wbclient: Use new tevent data types
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/lib/wb_reqtrans.c16
-rw-r--r--source3/lib/wbclient.c14
3 files changed, 16 insertions, 16 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 285b44dcde..dfe42db245 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -7671,7 +7671,7 @@ NTSTATUS nss_info_template_init( void );
/* Misc protos */
-struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct wb_context *wb_ctx, bool need_priv,
const struct winbindd_request *wb_req);
NTSTATUS wb_trans_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
diff --git a/source3/lib/wb_reqtrans.c b/source3/lib/wb_reqtrans.c
index e779e47d28..b56c0fd4d3 100644
--- a/source3/lib/wb_reqtrans.c
+++ b/source3/lib/wb_reqtrans.c
@@ -27,7 +27,7 @@
struct req_read_state {
struct winbindd_request *wb_req;
- struct event_context *ev;
+ struct tevent_context *ev;
size_t max_extra_data;
int fd;
};
@@ -37,7 +37,7 @@ static void wb_req_read_main(struct async_req *subreq);
static void wb_req_read_extra(struct async_req *subreq);
struct async_req *wb_req_read_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
int fd, size_t max_extra_data)
{
struct async_req *result, *subreq;
@@ -184,7 +184,7 @@ NTSTATUS wb_req_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
struct req_write_state {
struct winbindd_request *wb_req;
- struct event_context *ev;
+ struct tevent_context *ev;
int fd;
};
@@ -192,7 +192,7 @@ static void wb_req_write_main(struct async_req *subreq);
static void wb_req_write_extra(struct async_req *subreq);
struct async_req *wb_req_write_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev, int fd,
+ struct tevent_context *ev, int fd,
struct winbindd_request *wb_req)
{
struct async_req *result, *subreq;
@@ -275,7 +275,7 @@ NTSTATUS wb_req_write_recv(struct async_req *req)
struct resp_read_state {
struct winbindd_response *wb_resp;
- struct event_context *ev;
+ struct tevent_context *ev;
size_t max_extra_data;
int fd;
};
@@ -285,7 +285,7 @@ static void wb_resp_read_main(struct async_req *subreq);
static void wb_resp_read_extra(struct async_req *subreq);
struct async_req *wb_resp_read_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev, int fd)
+ struct tevent_context *ev, int fd)
{
struct async_req *result, *subreq;
struct resp_read_state *state;
@@ -423,7 +423,7 @@ NTSTATUS wb_resp_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
struct resp_write_state {
struct winbindd_response *wb_resp;
- struct event_context *ev;
+ struct tevent_context *ev;
int fd;
};
@@ -431,7 +431,7 @@ static void wb_resp_write_main(struct async_req *subreq);
static void wb_resp_write_extra(struct async_req *subreq);
struct async_req *wb_resp_write_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev, int fd,
+ struct tevent_context *ev, int fd,
struct winbindd_response *wb_resp)
{
struct async_req *result, *subreq;
diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index f22b96a99a..ae9a034cc8 100644
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -155,7 +155,7 @@ struct wb_context *wb_context_init(TALLOC_CTX *mem_ctx)
}
static struct async_req *wb_connect_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
struct wb_context *wb_ctx,
const char *dir)
{
@@ -272,7 +272,7 @@ static struct winbindd_request *winbindd_request_copy(
}
struct wb_int_trans_state {
- struct event_context *ev;
+ struct tevent_context *ev;
int fd;
struct winbindd_request *wb_req;
struct winbindd_response *wb_resp;
@@ -282,7 +282,7 @@ static void wb_int_trans_write_done(struct async_req *subreq);
static void wb_int_trans_read_done(struct async_req *subreq);
static struct async_req *wb_int_trans_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev, int fd,
+ struct tevent_context *ev, int fd,
struct winbindd_request *wb_req)
{
struct async_req *result;
@@ -396,7 +396,7 @@ static const char *winbindd_socket_dir(void)
struct wb_open_pipe_state {
struct wb_context *wb_ctx;
- struct event_context *ev;
+ struct tevent_context *ev;
bool need_priv;
struct winbindd_request wb_req;
};
@@ -407,7 +407,7 @@ static void wb_open_pipe_getpriv_done(struct async_req *subreq);
static void wb_open_pipe_connect_priv_done(struct async_req *subreq);
static struct async_req *wb_open_pipe_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
struct wb_context *wb_ctx,
bool need_priv)
{
@@ -560,7 +560,7 @@ static NTSTATUS wb_open_pipe_recv(struct async_req *req)
struct wb_trans_state {
struct wb_trans_state *prev, *next;
struct wb_context *wb_ctx;
- struct event_context *ev;
+ struct tevent_context *ev;
struct winbindd_request *wb_req;
struct winbindd_response *wb_resp;
int num_retries;
@@ -599,7 +599,7 @@ static void wb_trigger_trans(struct async_req *req)
subreq->async.priv = req;
}
-struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct wb_context *wb_ctx, bool need_priv,
const struct winbindd_request *wb_req)
{