diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-09-03 21:07:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:39:49 -0500 |
| commit | ee0e397d6f003c583768803aa27716b2b7a23981 (patch) | |
| tree | 786de5b93275551f5f9a518c4973ffa980d76845 /source3/nsswitch | |
| parent | b540e4dc846b8002e8208183bde4ea0f312d98a8 (diff) | |
| download | samba-ee0e397d6f003c583768803aa27716b2b7a23981.tar.gz samba-ee0e397d6f003c583768803aa27716b2b7a23981.tar.bz2 samba-ee0e397d6f003c583768803aa27716b2b7a23981.zip | |
r18019: Fix a C++ warnings: Don't use void * in libads/ for LDAPMessage anymore.
Compiled it on systems with and without LDAP, I hope it does not break the
build farm too badly. If it does, I'll fix it tomorrow.
Volker
(This used to be commit b2ff9680ebe0979fbeef7f2dabc2e3f27c959d11)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_ads.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c index 07127a6316..943d69e882 100644 --- a/source3/nsswitch/winbindd_ads.c +++ b/source3/nsswitch/winbindd_ads.c @@ -171,8 +171,8 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain, NULL}; int i, count; ADS_STATUS rc; - void *res = NULL; - void *msg = NULL; + LDAPMessage *res = NULL; + LDAPMessage *msg = NULL; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; *num_entries = 0; @@ -279,8 +279,8 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain, "name", "objectSid", NULL}; int i, count; ADS_STATUS rc; - void *res = NULL; - void *msg = NULL; + LDAPMessage *res = NULL; + LDAPMessage *msg = NULL; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; const char *filter; BOOL enum_dom_local_groups = False; @@ -413,7 +413,7 @@ static BOOL dn_lookup(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char *dn, char **name, uint32 *name_type, DOM_SID *sid) { - void *res = NULL; + LDAPMessage *res = NULL; const char *attrs[] = {"userPrincipalName", "sAMAccountName", "objectSid", "sAMAccountType", NULL}; ADS_STATUS rc; @@ -469,7 +469,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain, NULL}; ADS_STATUS rc; int count; - void *msg = NULL; + LDAPMessage *msg = NULL; char *ldap_exp; char *sidstr; uint32 group_rid; @@ -551,8 +551,8 @@ static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain, ADS_STATUS rc; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; int count; - void *res = NULL; - void *msg = NULL; + LDAPMessage *res = NULL; + LDAPMessage *msg = NULL; char *ldap_exp; ADS_STRUCT *ads; const char *group_attrs[] = {"objectSid", NULL}; @@ -640,7 +640,7 @@ static NTSTATUS lookup_usergroups_memberof(struct winbindd_domain *domain, ADS_STATUS rc; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; int count; - void *res = NULL; + LDAPMessage *res = NULL; ADS_STRUCT *ads; const char *attrs[] = {"memberOf", NULL}; size_t num_groups = 0; @@ -749,7 +749,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, goto done; } - rc = ads_search_retry_sid(ads, (void**)(void *)&msg, sid, attrs); + rc = ads_search_retry_sid(ads, &msg, sid, attrs); if (!ADS_ERR_OK(rc)) { status = ads_ntstatus(rc); @@ -860,7 +860,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, { ADS_STATUS rc; int count; - void *res=NULL; + LDAPMessage *res=NULL; ADS_STRUCT *ads = NULL; char *ldap_exp; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; |