s4:libnet/: s/private/private_data

metze

4 files changed, 12 insertions, 12 deletions

diff --git a/source4/libnet/libnet_samdump.c b/source4/libnet/libnet_samdump.c
index e259d4df40..21361f1eca 100644
--- a/source4/libnet/libnet_samdump.c
+++ b/source4/libnet/libnet_samdump.c
@@ -103,14 +103,14 @@ static NTSTATUS vampire_samdump_handle_trusted_domain(TALLOC_CTX *mem_ctx,
 	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;