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, 3 insertions, 3 deletions

diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index 9a3dd9c8d3..114585346e 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -195,7 +195,7 @@ typedef struct sam_passwd
 		const struct pdb_methods *backend_private_methods;
 		void *backend_private_data; 
 		void (*backend_private_data_free_fn)(void **);
-	} private;
+	} private_u;
 
 	/* Lets see if the remaining code can get the hint that you
 	   are meant to use the pdb_...() functions. */
@@ -221,7 +221,7 @@ typedef struct sam_group {
 
 		uint32 mem_num;			/* Number of member SIDs */
 		DOM_SID *members;		/* SID array */
-	} private;
+	} private_g;
 
 } SAM_GROUP;
 
@@ -253,7 +253,7 @@ struct pdb_search {
 	uint32 num_entries;
 	ssize_t cache_size;
 	BOOL search_ended;
-	void *private;
+	void *private_data;
 	BOOL (*next_entry)(struct pdb_search *search,
 			   struct samr_displayentry *entry);
 	void (*search_end)(struct pdb_search *search);