[SCM] Samba Shared Repository - branch master updated - 2a35985283be45adbba63b5d7ced8499bcb64f59

[Gerald Carter]

The branch, master has been updated
       via  2a35985283be45adbba63b5d7ced8499bcb64f59 (commit)
       via  338f658a5a300e21cc69b1a84ebbdc7d63262448 (commit)
      from  9e492b1ba2ccf2d7c62ef7295b33260687e3aeae (commit)

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


- Log -----------------------------------------------------------------
commit 2a35985283be45adbba63b5d7ced8499bcb64f59
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Mon Oct 6 11:47:57 2008 -0500

    idmap_adex: Add more debugging to the basic search function.
    
    Log the dn of all located entries in order to verify search results.

commit 338f658a5a300e21cc69b1a84ebbdc7d63262448
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Mon Oct 6 11:34:45 2008 -0500

    idmap_adex: Add log messages to dc_add_domain for easier debugging.
    
    Part of continue work on BUG 5806.

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

Summary of changes:
 source3/winbindd/idmap_adex/domain_util.c   |    8 ++++++++
 source3/winbindd/idmap_adex/likewise_cell.c |   18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_adex/domain_util.c b/source3/winbindd/idmap_adex/domain_util.c
index ab31cce..6851503 100644
--- a/source3/winbindd/idmap_adex/domain_util.c
+++ b/source3/winbindd/idmap_adex/domain_util.c
@@ -49,6 +49,12 @@ static NTSTATUS dc_add_domain(const char *domain)
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	struct dc_info *dc = NULL;
 
+	if (!domain) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	DEBUG(10,("dc_add_domain: Attempting to add domain %s\n", domain));
+
 	/* Check for duplicates */
 
 	dc = dc_list_head();
@@ -73,6 +79,8 @@ static NTSTATUS dc_add_domain(const char *domain)
 
 	nt_status = NT_STATUS_OK;
 
+	DEBUG(5,("dc_add_domain: Successfully added %s\n", domain));
+
 done:
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		talloc_destroy(dc);
diff --git a/source3/winbindd/idmap_adex/likewise_cell.c b/source3/winbindd/idmap_adex/likewise_cell.c
index 77eeee4..7723b3e 100644
--- a/source3/winbindd/idmap_adex/likewise_cell.c
+++ b/source3/winbindd/idmap_adex/likewise_cell.c
@@ -389,6 +389,24 @@ done:
 		status = ads_do_search(c->conn, search_base,
 				       scope, expr, attrs, msg);
 		if (ADS_ERR_OK(status)) {
+			if (DEBUGLEVEL >= 10) {
+				LDAPMessage *e = NULL;
+
+				int n = ads_count_replies(c->conn, *msg);
+
+				DEBUG(10,("cell_do_search: Located %d entries\n", n));
+
+				for (e=ads_first_entry(c->conn, *msg);
+				     e!=NULL;
+				     e = ads_next_entry(c->conn, e))
+				{
+					char *dn = ads_get_dn(c->conn, e);
+
+					DEBUGADD(10,("   dn: %s\n", dn ? dn : "<NULL>"));
+					SAFE_FREE(dn);
+				}
+			}
+
 			return status;
 		}
 


-- 
Samba Shared Repository