s3: Remove unused args from nss_get_info_cached

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 838e74b83c9a39a6e464600b693a333f2247a4e4..744c357bdcf185b593d8cf6c6f7b99332929464b 100644 (file)
--- 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 a8b2e23414884383cd32fb03d752e713ed6199b2..243c46a03c03530a25cb0fa0352777d16a86bb12 100644 (file)
--- 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 874112bbbb9f94ff2525a6e91dfc0bf7c217ce05..e66b675e23136d4cbcb057434045cb7c3ef3bc93 100644 (file)
--- 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