Sequence number was not getting updated with ldap hack. Only a bug in this

branch.
Jeremy.

diff --git a/source/nsswitch/winbindd_cache.c b/source/nsswitch/winbindd_cache.c
index 9f7d3686a5b514a68bfb57385c74605f50a17cba..eb7170ff6077a57e64723079d26d0d884904437d 100644 (file)
--- a/source/nsswitch/winbindd_cache.c
+++ b/source/nsswitch/winbindd_cache.c
@@ -338,7 +338,7 @@ static void refresh_sequence_number(struct winbindd_domain *domain, BOOL force)
        /* see if we have to refetch the domain sequence number */
        if (!force && (time_diff < cache_time)) {
                DEBUG(10, ("refresh_sequence_number: %s time ok\n", domain->name));
-               return;
+               goto done;
        }
        
        /* try to get the sequence number from the tdb cache first */

diff --git a/source/nsswitch/winbindd_rpc.c b/source/nsswitch/winbindd_rpc.c
index 131a7cfd43ba43d7acbaaa4faa314f1e561715f9..6436d4860cac5ca2e11a0322dc5157241686518f 100644 (file)
--- a/source/nsswitch/winbindd_rpc.c
+++ b/source/nsswitch/winbindd_rpc.c
@@ -817,7 +817,6 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
        SAM_UNK_CTR ctr;
        uint16 switch_value = 2;
        NTSTATUS result;
-       uint32 seqnum = DOM_SEQUENCE_NONE;
        POLICY_HND dom_pol;
        BOOL got_dom_pol = False;
        uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
@@ -868,11 +867,11 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
                                         switch_value, &ctr);
 
        if (NT_STATUS_IS_OK(result)) {
-               seqnum = ctr.info.inf2.seq_num;
-               DEBUG(10,("domain_sequence_number: for domain %s is %u\n", domain->name, (unsigned)seqnum ));
+               *seq = ctr.info.inf2.seq_num;
+               DEBUG(10,("domain_sequence_number: for domain %s is %u\n", domain->name, (unsigned)*seq));
        } else {
                DEBUG(10,("domain_sequence_number: failed to get sequence number (%u) for domain %s\n",
-                       (unsigned)seqnum, domain->name ));
+                       (unsigned)*seq, domain->name ));
        }
 
   done:
@@ -882,8 +881,6 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
 
        talloc_destroy(mem_ctx);
 
-       *seq = seqnum;
-
        return result;
 }