diff options
| author | Jeremy Allison <jra@samba.org> | 2005-06-24 20:25:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:00 -0500 |
| commit | 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff (patch) | |
| tree | 18d7d81e2c1aa7cf9325899b7e8fc90b41c14c8b /source3/passdb/pdb_ldap.c | |
| parent | 8387af752f81e26f1c141f6053bf6d106f0af5eb (diff) | |
| download | samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.gz samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.bz2 samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.zip | |
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)
Diffstat (limited to 'source3/passdb/pdb_ldap.c')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index d688a04dc4..002ec70464 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -3387,7 +3387,7 @@ struct ldap_search_state { static BOOL ldapsam_search_firstpage(struct pdb_search *search) { - struct ldap_search_state *state = search->private; + struct ldap_search_state *state = search->private_data; LDAP *ld; int rc = LDAP_OPERATIONS_ERROR; @@ -3439,7 +3439,7 @@ static BOOL ldapsam_search_firstpage(struct pdb_search *search) static BOOL ldapsam_search_nextpage(struct pdb_search *search) { - struct ldap_search_state *state = search->private; + struct ldap_search_state *state = search->private_data; LDAP *ld = state->connection->ldap_struct; int rc; @@ -3470,7 +3470,7 @@ static BOOL ldapsam_search_nextpage(struct pdb_search *search) static BOOL ldapsam_search_next_entry(struct pdb_search *search, struct samr_displayentry *entry) { - struct ldap_search_state *state = search->private; + struct ldap_search_state *state = search->private_data; LDAP *ld = state->connection->ldap_struct; BOOL result; @@ -3506,7 +3506,7 @@ static BOOL ldapsam_search_next_entry(struct pdb_search *search, static void ldapsam_search_end(struct pdb_search *search) { - struct ldap_search_state *state = search->private; + struct ldap_search_state *state = search->private_data; int rc; if (state->pagedresults_cookie == NULL) @@ -3657,7 +3657,7 @@ static BOOL ldapsam_search_users(struct pdb_methods *methods, return False; } - search->private = state; + search->private_data = state; search->next_entry = ldapsam_search_next_entry; search->search_end = ldapsam_search_end; @@ -3764,7 +3764,7 @@ static BOOL ldapsam_search_grouptype(struct pdb_methods *methods, return False; } - search->private = state; + search->private_data = state; search->next_entry = ldapsam_search_next_entry; search->search_end = ldapsam_search_end; |