diff options
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd_ads.c | 9 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_cache.c | 1 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_proto.h | 1 |
3 files changed, 4 insertions, 7 deletions
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index 838e74b83c..744c357bdc 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -252,8 +252,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain, * the domain. */ status = nss_get_info_cached(domain, &info->user_sid, mem_ctx, - ads_cached_connection(domain), - msg, &info->homedir, &info->shell, + &info->homedir, &info->shell, &gecos, &primary_gid); if (!NT_STATUS_IS_OK(status)) { /* @@ -504,7 +503,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain, info->acct_name = talloc_strdup(mem_ctx, user->base.account_name.string); info->full_name = talloc_strdup(mem_ctx, user->base.full_name.string); - nss_get_info_cached( domain, sid, mem_ctx, NULL, NULL, + nss_get_info_cached( domain, sid, mem_ctx, &info->homedir, &info->shell, &info->full_name, &gid ); info->primary_gid = gid; @@ -530,7 +529,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain, /* Try to fill in what the nss_info backend can do */ - nss_get_info_cached( domain, sid, mem_ctx, NULL, NULL, + nss_get_info_cached( domain, sid, mem_ctx, &info->homedir, &info->shell, &info->full_name, &gid); info->primary_gid = gid; @@ -589,7 +588,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain, ads_msgfree(ads, msg); msg = NULL; - status = nss_get_info_cached( domain, sid, mem_ctx, ads, msg, + status = nss_get_info_cached( domain, sid, mem_ctx, &info->homedir, &info->shell, &info->full_name, &gid); info->primary_gid = gid; diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index a8b2e23414..243c46a03c 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -4641,7 +4641,6 @@ static void wcache_save_user_pwinfo(struct winbindd_domain *domain, NTSTATUS nss_get_info_cached( struct winbindd_domain *domain, const struct dom_sid *user_sid, TALLOC_CTX *ctx, - ADS_STRUCT *ads, LDAPMessage *msg, const char **homedir, const char **shell, const char **gecos, gid_t *p_gid) { diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 874112bbbb..e66b675e23 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -134,7 +134,6 @@ struct ads_struct; NTSTATUS nss_get_info_cached( struct winbindd_domain *domain, const struct dom_sid *user_sid, TALLOC_CTX *ctx, - struct ads_struct *ads, LDAPMessage *msg, const char **homedir, const char **shell, const char **gecos, gid_t *p_gid); #endif |