Pass domain structure around in cache code rather than the domain name.

(This used to be commit c6338d7eaeb31db2666603fcdd9179e61891a1c9)

1 files changed, 17 insertions, 20 deletions

diff --git a/source3/nsswitch/winbindd_proto.h b/source3/nsswitch/winbindd_proto.h
index b32ca11424..46751553ac 100644
--- a/source3/nsswitch/winbindd_proto.h
+++ b/source3/nsswitch/winbindd_proto.h
@@ -10,36 +10,36 @@ int main(int argc, char **argv);
 /* The following definitions come from nsswitch/winbindd_cache.c  */
 
 void winbindd_cache_init(void);
-void winbindd_store_user_cache(char *domain, 
+void winbindd_store_user_cache(struct winbindd_domain *domain, 
 			       struct getpwent_user *sam_entries,
 			       int num_sam_entries);
-void winbindd_store_group_cache(char *domain,
+void winbindd_store_group_cache(struct winbindd_domain *domain,
 				struct acct_info *sam_entries,
 				int num_sam_entries);
-void winbindd_store_user_cache_entry(char *domain, char *user_name, 
-				     struct winbindd_pw *pw);
-void winbindd_store_uid_cache_entry(char *domain, uid_t uid, 
+void winbindd_store_user_cache_entry(struct winbindd_domain *domain, 
+                                     char *user_name, struct winbindd_pw *pw);
+void winbindd_store_uid_cache_entry(struct winbindd_domain *domain, uid_t uid, 
                                     struct winbindd_pw *pw);
-void winbindd_store_group_cache_entry(char *domain, char *group_name, 
-				      struct winbindd_gr *gr, void *extra_data,
-				      int extra_data_len);
-void winbindd_store_gid_cache_entry(char *domain, gid_t gid, 
+void winbindd_store_group_cache_entry(struct winbindd_domain *domain, 
+                                      char *group_name, struct winbindd_gr *gr,
+                                      void *extra_data, int extra_data_len);
+void winbindd_store_gid_cache_entry(struct winbindd_domain *domain, gid_t gid, 
 				    struct winbindd_gr *gr, void *extra_data,
 				    int extra_data_len);
-BOOL winbindd_fetch_user_cache(char *domain_name, 
+BOOL winbindd_fetch_user_cache(struct winbindd_domain *domain, 
 			       struct getpwent_user **sam_entries,
                                int *num_entries);
-BOOL winbindd_fetch_group_cache(char *domain_name, 
+BOOL winbindd_fetch_group_cache(struct winbindd_domain *domain, 
 				struct acct_info **sam_entries,
                                 int *num_entries);
-BOOL winbindd_fetch_user_cache_entry(char *domain_name, char *user, 
-                                     struct winbindd_pw *pw);
-BOOL winbindd_fetch_uid_cache_entry(char *domain_name, uid_t uid, 
+BOOL winbindd_fetch_user_cache_entry(struct winbindd_domain *domain, 
+                                     char *user, struct winbindd_pw *pw);
+BOOL winbindd_fetch_uid_cache_entry(struct winbindd_domain *domain, uid_t uid, 
 				    struct winbindd_pw *pw);
-BOOL winbindd_fetch_group_cache_entry(char *domain_name, char *group, 
-                                      struct winbindd_gr *gr,
+BOOL winbindd_fetch_group_cache_entry(struct winbindd_domain *domain, 
+                                      char *group, struct winbindd_gr *gr,
                                       void **extra_data, int *extra_data_len);
-BOOL winbindd_fetch_gid_cache_entry(char *domain_name, gid_t gid,
+BOOL winbindd_fetch_gid_cache_entry(struct winbindd_domain *domain, gid_t gid,
 				    struct winbindd_gr *gr,
 				    void **extra_data, int *extra_data_len);
 void winbindd_flush_cache(void);
@@ -118,9 +118,6 @@ enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state);
 /* The following definitions come from nsswitch/winbindd_util.c  */
 
 BOOL get_domain_info(void);
-BOOL domain_handles_open(struct winbindd_domain *domain);
-void winbindd_kill_all_connections(void);
-void establish_connections(BOOL force_reestablish) ;
 BOOL lookup_domain_sid(char *domain_name, struct winbindd_domain *domain);
 BOOL winbindd_lookup_sid_by_name(char *name, DOM_SID *sid,
                                  enum SID_NAME_USE *type);