summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-09-25 15:47:01 +0000
committerGerald Carter <jerry@samba.org>2002-09-25 15:47:01 +0000
commitd0e106338d93a06583fc421bdb334a2739912188 (patch)
treeea9d5a9d5bd7bc25912a8ae8e5727712f97728ac /source3/nsswitch
parent28f76a4162afdeda6c1ead6dc99e5b6c0491ad4f (diff)
downloadsamba-d0e106338d93a06583fc421bdb334a2739912188.tar.gz
samba-d0e106338d93a06583fc421bdb334a2739912188.tar.bz2
samba-d0e106338d93a06583fc421bdb334a2739912188.zip
merge from HEAD
(This used to be commit da44b196a977b6edf7cdf27e344295ed15d198f7)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbind_nss_config.h2
-rw-r--r--source3/nsswitch/winbindd_proto.h1
2 files changed, 3 insertions, 0 deletions
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 <config.h>
+#endif
#include <stdio.h>
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);