mirror of
https://github.com/samba-team/samba.git
synced 2025-02-02 09:47:23 +03:00
fix more compiler warning after the latest static rampage
(This used to be commit 4f97988dd652983b7cdbb2f2e5a85c9d97ec697e)
This commit is contained in:
parent
57dacbe948
commit
19b8f496f8
@ -168,34 +168,6 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
|
||||
return domain;
|
||||
}
|
||||
|
||||
/********************************************************************
|
||||
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)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user