summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-02-10 03:51:19 +0000
committerGerald Carter <jerry@samba.org>2004-02-10 03:51:19 +0000
commit19b8f496f8d7cf91c67645ee5163bb3a90bef0dd (patch)
tree04fd59f887e9ba754bfe37ad6e46776dba4c040b
parent57dacbe948e10797776eaf214eaf393983ebda55 (diff)
downloadsamba-19b8f496f8d7cf91c67645ee5163bb3a90bef0dd.tar.gz
samba-19b8f496f8d7cf91c67645ee5163bb3a90bef0dd.tar.bz2
samba-19b8f496f8d7cf91c67645ee5163bb3a90bef0dd.zip
fix more compiler warning after the latest static rampage
(This used to be commit 4f97988dd652983b7cdbb2f2e5a85c9d97ec697e)
-rw-r--r--source3/nsswitch/winbindd_util.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index eecb36a30f..403ba399c8 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -169,34 +169,6 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
}
/********************************************************************
- Periodically we need to refresh the trusted domain cache for smbd
-********************************************************************/
-
-void rescan_trusted_domains( void )
-{
- time_t now = time(NULL);
- struct winbindd_domain *mydomain = NULL;
-
- /* see if the time has come... */
-
- if ( (now > last_trustdom_scan) && ((now-last_trustdom_scan) < WINBINDD_RESCAN_FREQ) )
- return;
-
- if ( (mydomain = find_our_domain()) == NULL ) {
- DEBUG(0,("rescan_trusted_domains: Can't find my own domain!\n"));
- return;
- }
-
- /* this will only add new domains we didn't already know about */
-
- add_trusted_domains( mydomain );
-
- last_trustdom_scan = now;
-
- return;
-}
-
-/********************************************************************
rescan our domains looking for new trusted domains
********************************************************************/
@@ -271,6 +243,34 @@ static void add_trusted_domains( struct winbindd_domain *domain )
talloc_destroy(mem_ctx);
}
+/********************************************************************
+ Periodically we need to refresh the trusted domain cache for smbd
+********************************************************************/
+
+void rescan_trusted_domains( void )
+{
+ time_t now = time(NULL);
+ struct winbindd_domain *mydomain = NULL;
+
+ /* see if the time has come... */
+
+ if ( (now > last_trustdom_scan) && ((now-last_trustdom_scan) < WINBINDD_RESCAN_FREQ) )
+ return;
+
+ if ( (mydomain = find_our_domain()) == NULL ) {
+ DEBUG(0,("rescan_trusted_domains: Can't find my own domain!\n"));
+ return;
+ }
+
+ /* this will only add new domains we didn't already know about */
+
+ add_trusted_domains( mydomain );
+
+ last_trustdom_scan = now;
+
+ return;
+}
+
/* Look up global info for the winbind daemon */
BOOL init_domain_list(void)
{