[SCM] Samba Shared Repository - branch master updated

[Uri Simchoni]

The branch, master has been updated
       via  e70fef9 winbindd: prevent log spam when enumerating users
       via  32c7d0c winbindd: log domain name of failures to get trustdoms
      from  e8c9e10 talloc: rename local timeval function copies

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


- Log -----------------------------------------------------------------
commit e70fef92b2da7593f32c92079b257299bd8fb8b9
Author: Ralph Boehme <slow at samba.org>
Date:   Tue May 31 18:52:12 2016 +0200

    winbindd: prevent log spam when enumerating users
    
    When enumerating users we try to fetch sAMAccountType attribute which
    might not be present for whatever reason.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Thu Jun  2 09:04:13 CEST 2016 on sn-devel-144

commit 32c7d0c410abb9e5c51347404a5b71ac56e0b24f
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Feb 3 08:07:02 2016 +0100

    winbindd: log domain name of failures to get trustdoms
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 source3/winbindd/winbindd_ads.c  | 11 ++++++++---
 source3/winbindd/winbindd_util.c |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index a9a23db..dc92a4a 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -343,10 +343,15 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 		struct wbint_userinfo *info = &((*pinfo)[count]);
 		uint32_t group;
 		uint32_t atype;
+		bool ok;
 
-		if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype) ||
-		    ds_atype_map(atype) != SID_NAME_USER) {
-			DEBUG(1,("Not a user account? atype=0x%x\n", atype));
+		ok = ads_pull_uint32(ads, msg, "sAMAccountType", &atype);
+		if (!ok) {
+			DBG_INFO("Object lacks sAMAccountType attribute\n");
+			continue;
+		}
+		if (ds_atype_map(atype) != SID_NAME_USER) {
+			DBG_INFO("Not a user account? atype=0x%x\n", atype);
 			continue;
 		}
 
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index c323520..f0344b1 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -348,7 +348,8 @@ static void trustdom_list_done(struct tevent_req *req)
 
 	res = wb_domain_request_recv(req, state, &response, &err);
 	if ((res == -1) || (response->result != WINBINDD_OK)) {
-		DBG_WARNING("Could not receive trustdoms\n");
+		DBG_WARNING("Could not receive trusts for domain %s\n",
+			    state->domain->name);
 		TALLOC_FREE(state);
 		return;
 	}


-- 
Samba Shared Repository