r7882: Looks like a large patch - but what it actually does is make Samba

safe for using our headers and linking with C++ modules. Stops us
from using C++ reserved keywords in our code.
Jeremy
(This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)

1 files changed, 5 insertions, 5 deletions

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index c6880b1d50..d4407492c2 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -1614,7 +1614,7 @@ struct user_search {
 static BOOL next_entry_users(struct pdb_search *s,
 			     struct samr_displayentry *entry)
 {
-	struct user_search *state = s->private;
+	struct user_search *state = s->private_data;
 	SAM_ACCOUNT *user = NULL;
 	NTSTATUS status;
 
@@ -1677,7 +1677,7 @@ static BOOL pdb_default_search_users(struct pdb_methods *methods,
 
 	state->acct_flags = acct_flags;
 
-	search->private = state;
+	search->private_data = state;
 	search->next_entry = next_entry_users;
 	search->search_end = search_end_users;
 	return True;
@@ -1691,7 +1691,7 @@ struct group_search {
 static BOOL next_entry_groups(struct pdb_search *s,
 			      struct samr_displayentry *entry)
 {
-	struct group_search *state = s->private;
+	struct group_search *state = s->private_data;
 	uint32 rid;
 	GROUP_MAP *map = &state->groups[state->current_group];
 
@@ -1709,7 +1709,7 @@ static BOOL next_entry_groups(struct pdb_search *s,
 
 static void search_end_groups(struct pdb_search *search)
 {
-	struct group_search *state = search->private;
+	struct group_search *state = search->private_data;
 	SAFE_FREE(state->groups);
 }
 
@@ -1731,7 +1731,7 @@ static BOOL pdb_search_grouptype(struct pdb_search *search,
 	}
 
 	state->current_group = 0;
-	search->private = state;
+	search->private_data = state;
 	search->next_entry = next_entry_groups;
 	search->search_end = search_end_groups;
 	return True;