[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  2b67d93 winbindd: Simplify an if-condition
       via  e5b0669 winbindd: Add debug for ndr cache hit
       via  ed3b466 winbindd: Make wcache_query_user static
      from  6d65d67 tests samba_tool: fix flapping user-virtualCryptSHA test

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2b67d936c182f32ea46e490b56b3d471450ad1e1
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Aug 1 16:40:01 2017 +0200

    winbindd: Simplify an if-condition
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Mon Aug  7 09:32:09 CEST 2017 on sn-devel-144

commit e5b0669625735d93314cb007bddefdbc9904a24f
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Aug 1 16:36:27 2017 +0200

    winbindd: Add debug for ndr cache hit
    
    When looking through winbind debug logs, it's highly confusing if you don't
    find a call in the child that's supposed to handle it. Add a debug if the call
    was handled from the cache without calling into the child.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit ed3b4661fd29a3523c59007ebb7e7bf97786025c
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Aug 1 15:11:09 2017 +0200

    winbindd: Make wcache_query_user static
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/winbindd_cache.c    | 10 +++++-----
 source3/winbindd/winbindd_dual_ndr.c |  2 ++
 source3/winbindd/winbindd_proto.h    |  4 ----
 3 files changed, 7 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index ce5e5cd..93501e4 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2223,10 +2223,10 @@ NTSTATUS wb_cache_rids_to_names(struct winbindd_domain *domain,
 	return result;
 }
 
-NTSTATUS wcache_query_user(struct winbindd_domain *domain,
-			   TALLOC_CTX *mem_ctx,
-			   const struct dom_sid *user_sid,
-			   struct wbint_userinfo *info)
+static NTSTATUS wcache_query_user(struct winbindd_domain *domain,
+				  TALLOC_CTX *mem_ctx,
+				  const struct dom_sid *user_sid,
+				  struct wbint_userinfo *info)
 {
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
@@ -4805,7 +4805,7 @@ bool wcache_fetch_ndr(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
 		goto fail;
 	}
 
-	if (!is_domain_offline(domain)) {
+	if (is_domain_online(domain)) {
 		uint32_t entry_seqnum, dom_seqnum, last_check;
 		uint64_t entry_timeout;
 
diff --git a/source3/winbindd/winbindd_dual_ndr.c b/source3/winbindd/winbindd_dual_ndr.c
index 250d9d3..00c7df1 100644
--- a/source3/winbindd/winbindd_dual_ndr.c
+++ b/source3/winbindd/winbindd_dual_ndr.c
@@ -103,6 +103,8 @@ static struct tevent_req *wbint_bh_raw_call_send(TALLOC_CTX *mem_ctx,
 	if ((state->domain != NULL)
 	    && wcache_fetch_ndr(state, state->domain, state->opnum,
 				&state->in_data, &state->out_data)) {
+		DBG_DEBUG("Got opnum %"PRIu32" for domain %s from cache\n",
+			  state->opnum, state->domain->name);
 		tevent_req_done(req);
 		return tevent_req_post(req, ev);
 	}
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 6aa0ed9..7560fc5 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -148,10 +148,6 @@ void cache_name2sid_trusted(struct winbindd_domain *domain,
 void cache_name2sid(struct winbindd_domain *domain, 
 		    const char *domain_name, const char *name,
 		    enum lsa_SidType type, const struct dom_sid *sid);
-NTSTATUS wcache_query_user(struct winbindd_domain *domain,
-			   TALLOC_CTX *mem_ctx,
-			   const struct dom_sid *user_sid,
-			   struct wbint_userinfo *info);
 NTSTATUS wcache_query_user_fullname(struct winbindd_domain *domain,
 				    TALLOC_CTX *mem_ctx,
 				    const struct dom_sid *user_sid,


-- 
Samba Shared Repository