From 1bb0104070eb1188ed0256535907f2bed006a939 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 2 Feb 2009 09:46:59 +0100
Subject: s4:cldap: s/private/private_data

metze
---
 source4/cldap_server/netlogon.c     | 2 +-
 source4/cldap_server/rootdse.c      | 2 +-
 source4/libcli/cldap/cldap.c        | 2 +-
 source4/libcli/cldap/cldap.h        | 4 ++--
 source4/libnet/libnet_become_dc.c   | 4 ++--
 source4/libnet/libnet_unbecome_dc.c | 4 ++--
 source4/torture/ldap/cldapbench.c   | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'source4')

diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index 3c12954c31..0df35be6fd 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -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;
diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c
index 65786e6708..daa5060d07 100644
--- a/source4/cldap_server/rootdse.c
+++ b/source4/cldap_server/rootdse.c
@@ -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;
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index d9a6c970b9..8d2e2e374c 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -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;
 }
diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index 1841e82540..8951daa775 100644
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -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;
 };
 
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 294ea4b79c..bf046745e6 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -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;
 
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index 79c6dc0fc1..3f92daab28 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -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;
 
diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index df2a5b0551..1fcfe5a050 100644
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -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) {
-- 
cgit