From d0e106338d93a06583fc421bdb334a2739912188 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 25 Sep 2002 15:47:01 +0000 Subject: merge from HEAD (This used to be commit da44b196a977b6edf7cdf27e344295ed15d198f7) --- source3/nsswitch/winbind_nss_config.h | 2 ++ source3/nsswitch/winbindd_proto.h | 1 + 2 files changed, 3 insertions(+) diff --git a/source3/nsswitch/winbind_nss_config.h b/source3/nsswitch/winbind_nss_config.h index d9a9b8aaae..2faaa30d1b 100644 --- a/source3/nsswitch/winbind_nss_config.h +++ b/source3/nsswitch/winbind_nss_config.h @@ -26,7 +26,9 @@ /* Include header files from data in config.h file */ +#ifndef NO_CONFIG_H #include +#endif #include diff --git a/source3/nsswitch/winbindd_proto.h b/source3/nsswitch/winbindd_proto.h index ef44fb655e..4d4dbbb06b 100644 --- a/source3/nsswitch/winbindd_proto.h +++ b/source3/nsswitch/winbindd_proto.h @@ -118,6 +118,7 @@ enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state); struct winbindd_domain *domain_list(void); void free_domain_list(void); +void rescan_trusted_domains(void); BOOL init_domain_list(void); struct winbindd_domain *find_domain_from_name(const char *domain_name); struct winbindd_domain *find_domain_from_sid(DOM_SID *sid); -- cgit