1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00

s4:cldap: s/private/private_data

metze
This commit is contained in:
Stefan Metzmacher 2009-02-02 09:46:59 +01:00
parent 24d31c0e81
commit 1bb0104070
7 changed files with 11 additions and 11 deletions

View File

@ -407,7 +407,7 @@ void cldapd_netlogon_request(struct cldap_socket *cldap,
struct ldb_parse_tree *tree,
struct socket_address *src)
{
struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private, struct cldapd_server);
struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private_data, struct cldapd_server);
int i;
const char *domain = NULL;
const char *host = NULL;

View File

@ -155,7 +155,7 @@ void cldapd_rootdse_request(struct cldap_socket *cldap,
struct ldap_SearchRequest *search,
struct socket_address *src)
{
struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private, struct cldapd_server);
struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private_data, struct cldapd_server);
NTSTATUS status;
struct cldap_reply reply;
struct ldap_Result result;

View File

@ -285,7 +285,7 @@ NTSTATUS cldap_set_incoming_handler(struct cldap_socket *cldap,
void *private_data)
{
cldap->incoming.handler = handler;
cldap->incoming.private = private_data;
cldap->incoming.private_data = private_data;
EVENT_FD_READABLE(cldap->fde);
return NT_STATUS_OK;
}

View File

@ -63,7 +63,7 @@ struct cldap_request {
/* information on what to do on completion */
struct {
void (*fn)(struct cldap_request *);
void *private;
void *private_data;
} async;
};
@ -88,7 +88,7 @@ struct cldap_socket {
struct {
void (*handler)(struct cldap_socket *, struct ldap_message *,
struct socket_address *);
void *private;
void *private_data;
} incoming;
};

View File

@ -756,14 +756,14 @@ static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s)
req = cldap_netlogon_send(s->cldap.sock, &s->cldap.io);
if (composite_nomem(req, c)) return;
req->async.fn = becomeDC_recv_cldap;
req->async.private = s;
req->async.private_data = s;
}
static void becomeDC_connect_ldap1(struct libnet_BecomeDC_state *s);
static void becomeDC_recv_cldap(struct cldap_request *req)
{
struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private,
struct libnet_BecomeDC_state *s = talloc_get_type(req->async.private_data,
struct libnet_BecomeDC_state);
struct composite_context *c = s->creq;

View File

@ -275,14 +275,14 @@ static void unbecomeDC_send_cldap(struct libnet_UnbecomeDC_state *s)
req = cldap_netlogon_send(s->cldap.sock, &s->cldap.io);
if (composite_nomem(req, c)) return;
req->async.fn = unbecomeDC_recv_cldap;
req->async.private = s;
req->async.private_data = s;
}
static void unbecomeDC_connect_ldap(struct libnet_UnbecomeDC_state *s);
static void unbecomeDC_recv_cldap(struct cldap_request *req)
{
struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private,
struct libnet_UnbecomeDC_state *s = talloc_get_type(req->async.private_data,
struct libnet_UnbecomeDC_state);
struct composite_context *c = s->creq;

View File

@ -33,7 +33,7 @@ struct bench_state {
static void request_handler(struct cldap_request *req)
{
struct cldap_netlogon io;
struct bench_state *state = talloc_get_type(req->async.private, struct bench_state);
struct bench_state *state = talloc_get_type(req->async.private_data, struct bench_state);
NTSTATUS status;
TALLOC_CTX *tmp_ctx = talloc_new(NULL);
io.in.version = 6;
@ -75,7 +75,7 @@ static bool bench_cldap(struct torture_context *tctx, const char *address)
struct cldap_request *req;
req = cldap_netlogon_send(cldap, &search);
req->async.private = state;
req->async.private_data = state;
req->async.fn = request_handler;
num_sent++;
if (num_sent % 50 == 0) {