Merge branch 'master' of ssh://git.samba.org/data/git/samba

Conflicts:
	librpc/ndr.pc.in

6 files changed, 25 insertions, 25 deletions

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_samdump.c b/source4/libnet/libnet_samdump.c
index e259d4df40..b35fef2c16 100644
--- a/source4/libnet/libnet_samdump.c
+++ b/source4/libnet/libnet_samdump.c
@@ -75,13 +75,13 @@ static NTSTATUS vampire_samdump_handle_secret(TALLOC_CTX *mem_ctx,
 {
 	struct netr_DELTA_SECRET *secret = delta->delta_union.secret;
 	const char *name = delta->delta_id_union.name;
-	struct samdump_secret *new = talloc(samdump_state, struct samdump_secret);
+	struct samdump_secret *n = talloc(samdump_state, struct samdump_secret);
 
-	new->name = talloc_strdup(new, name);
-	new->secret = data_blob_talloc(new, secret->current_cipher.cipher_data, secret->current_cipher.maxlen);
-	new->mtime = secret->current_cipher_set_time;
+	n->name = talloc_strdup(n, name);
+	n->secret = data_blob_talloc(n, secret->current_cipher.cipher_data, secret->current_cipher.maxlen);
+	n->mtime = secret->current_cipher_set_time;
 
-	DLIST_ADD(samdump_state->secrets, new);
+	DLIST_ADD(samdump_state->secrets, n);
 
 	return NT_STATUS_OK;
 }
@@ -93,24 +93,24 @@ static NTSTATUS vampire_samdump_handle_trusted_domain(TALLOC_CTX *mem_ctx,
 	struct netr_DELTA_TRUSTED_DOMAIN *trusted_domain = delta->delta_union.trusted_domain;
 	struct dom_sid *dom_sid = delta->delta_id_union.sid;
 
-	struct samdump_trusted_domain *new = talloc(samdump_state, struct samdump_trusted_domain);
+	struct samdump_trusted_domain *n = talloc(samdump_state, struct samdump_trusted_domain);
 
-	new->name = talloc_strdup(new, trusted_domain->domain_name.string);
-	new->sid = talloc_steal(new, dom_sid);
+	n->name = talloc_strdup(n, trusted_domain->domain_name.string);
+	n->sid = talloc_steal(n, dom_sid);
 
-	DLIST_ADD(samdump_state->trusted_domains, new);
+	DLIST_ADD(samdump_state->trusted_domains, n);
 
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS libnet_samdump_fn(TALLOC_CTX *mem_ctx, 		
-				  void *private, 			
+static NTSTATUS libnet_samdump_fn(TALLOC_CTX *mem_ctx,
+				  void *private_data,
 				  enum netr_SamDatabaseID database,
 				  struct netr_DELTA_ENUM *delta,
 				  char **error_string)
 {
 	NTSTATUS nt_status = NT_STATUS_OK;
-	struct samdump_state *samdump_state = (struct samdump_state *)private;
+	struct samdump_state *samdump_state = (struct samdump_state *)private_data;
 
 	*error_string = NULL;
 	switch (delta->delta_type) {
diff --git a/source4/libnet/libnet_samdump_keytab.c b/source4/libnet/libnet_samdump_keytab.c
index 2218d20f6b..a1846b81da 100644
--- a/source4/libnet/libnet_samdump_keytab.c
+++ b/source4/libnet/libnet_samdump_keytab.c
@@ -74,14 +74,14 @@ struct libnet_samdump_keytab_data {
 	struct loadparm_context *lp_ctx;
 };
 
-static NTSTATUS libnet_samdump_keytab_fn(TALLOC_CTX *mem_ctx, 		
-					 void *private, 			
+static NTSTATUS libnet_samdump_keytab_fn(TALLOC_CTX *mem_ctx,
+					 void *private_data,
 					 enum netr_SamDatabaseID database,
 					 struct netr_DELTA_ENUM *delta,
 					 char **error_string)
 {
 	NTSTATUS nt_status = NT_STATUS_OK;
-	struct libnet_samdump_keytab_data *data = private; 
+	struct libnet_samdump_keytab_data *data = private_data;
 	*error_string = NULL;
 	switch (delta->delta_type) {
 	case NETR_DELTA_USER:
diff --git a/source4/libnet/libnet_samsync.h b/source4/libnet/libnet_samsync.h
index d2ac30fe14..c2295f3957 100644
--- a/source4/libnet/libnet_samsync.h
+++ b/source4/libnet/libnet_samsync.h
@@ -34,11 +34,11 @@ struct libnet_SamSync {
 		const char *binding_string;
 		bool rid_crypt;
 		NTSTATUS (*init_fn)(TALLOC_CTX *mem_ctx, 		
-				    void *private,
+				    void *private_data,
 				    struct libnet_SamSync_state *samsync_state,
 				    char **error_string);
 		NTSTATUS (*delta_fn)(TALLOC_CTX *mem_ctx, 		
-				     void *private, 			
+				     void *private_data,
 				     enum netr_SamDatabaseID database,
 				     struct netr_DELTA_ENUM *delta,
 				     char **error_string);
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 160b4b3e19..e24c54a8c2 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -1052,13 +1052,13 @@ static NTSTATUS samsync_ldb_delete_account(TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS libnet_samsync_ldb_fn(TALLOC_CTX *mem_ctx, 		
-				      void *private, 			
+				      void *private_data,
 				      enum netr_SamDatabaseID database,
 				      struct netr_DELTA_ENUM *delta,
 				      char **error_string)
 {
 	NTSTATUS nt_status = NT_STATUS_OK;
-	struct samsync_ldb_state *state = talloc_get_type(private, struct samsync_ldb_state);
+	struct samsync_ldb_state *state = talloc_get_type(private_data, struct samsync_ldb_state);
 
 	*error_string = NULL;
 	switch (delta->delta_type) {
@@ -1172,11 +1172,11 @@ static NTSTATUS libnet_samsync_ldb_fn(TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS libnet_samsync_ldb_init(TALLOC_CTX *mem_ctx, 		
-					void *private,
+					void *private_data,
 					struct libnet_SamSync_state *samsync_state,
 					char **error_string)
 {
-	struct samsync_ldb_state *state = talloc_get_type(private, struct samsync_ldb_state);
+	struct samsync_ldb_state *state = talloc_get_type(private_data, struct samsync_ldb_state);
 	const char *server = dcerpc_server_name(samsync_state->netlogon_pipe);
 	char *ldap_url;
 
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;