sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

s3: winbind: refresh_sequence_number is only ever called with 'false'.

Browse Source 
Remove redundant parameter.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
This commit is contained in:
Jeremy Allison 2016-09-28 10:12:36 -07:00 committed by Günther Deschner
parent a5264b187b
commit 32ae6721cf
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source3/winbindd/winbindd_cache.c
View File

@ -518,11 +518,10 @@ static bool store_cache_seqnum( struct winbindd_domain *domain )
}
/*
refresh the domain sequence number. If force is true
then always refresh it, no matter how recently we fetched it
refresh the domain sequence number on timeout.
*/
static void refresh_sequence_number(struct winbindd_domain *domain, bool force)
static void refresh_sequence_number(struct winbindd_domain *domain)
{
NTSTATUS status;
unsigned time_diff;
@ -545,7 +544,7 @@ static void refresh_sequence_number(struct winbindd_domain *domain, bool force)
time_diff = t - domain->last_seq_check;
/* see if we have to refetch the domain sequence number */
if (!force && (time_diff < cache_time) &&
if ((time_diff < cache_time) &&
(domain->sequence_number != DOM_SEQUENCE_NONE) &&
NT_STATUS_IS_OK(domain->last_status)) {
DEBUG(10, ("refresh_sequence_number: %s time ok\n", domain->name));
@ -719,7 +718,7 @@ static struct cache_entry *wcache_fetch(struct winbind_cache *cache,
return NULL;
}
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
va_start(ap, format);
smb_xvasprintf(&kstr, format, ap);
@ -1567,7 +1566,7 @@ do_query:
(retry++ < 5));
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -1679,7 +1678,7 @@ do_query:
}
}
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -1784,7 +1783,7 @@ do_query:
}
}
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -1899,7 +1898,7 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
}
}
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (domain->online &&
(NT_STATUS_IS_OK(status) || NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED))) {
@ -2013,7 +2012,7 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
}
}
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -2238,7 +2237,7 @@ static NTSTATUS rids_to_names(struct winbindd_domain *domain,
return result;
}
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
for (i=0; i<num_rids; i++) {
struct dom_sid sid;
@ -2399,7 +2398,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
}
}
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -2517,7 +2516,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
goto skip_save;
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -2670,7 +2669,7 @@ static NTSTATUS lookup_useraliases(struct winbindd_domain *domain,
}
}
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -2806,7 +2805,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
}
}
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -2829,7 +2828,7 @@ skip_save:
/* find the sequence number for a domain */
static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32_t *seq)
{
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
*seq = domain->sequence_number;
@ -3007,7 +3006,7 @@ do_query:
}
}
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -3079,7 +3078,7 @@ do_query:
}
}
/* and save it */
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@ -3344,7 +3343,7 @@ void cache_name2sid(struct winbindd_domain *domain,
const char *domain_name, const char *name,
enum lsa_SidType type, const struct dom_sid *sid)
{
refresh_sequence_number(domain, false);
refresh_sequence_number(domain);
wcache_save_name_to_sid(domain, NT_STATUS_OK, domain_name, name,
sid, type);
}