From ba97fc434ac233179633f6acd3b2cd56cb2b1f86 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 6 Jan 2004 18:26:53 +0000
Subject: [PATCH] isolate ldap debug messages to the common smbldap_XXX()
 functions (This used to be commit 4c877ccc16bcb69490c4d34d2ef5f727bf98438e)

---
 source3/lib/smbldap.c     | 13 +++++++++----
 source3/passdb/pdb_ldap.c |  3 ---
 source3/sam/idmap_ldap.c  |  5 -----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 2eeec156bdd..1156bd66394 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -914,6 +914,9 @@ int smbldap_search(struct smbldap_state *ldap_state,
 	char           *utf8_filter;
 
 	SMB_ASSERT(ldap_state);
+	
+	DEBUG(5,("smbldap_search: base => [%s], filter => [%s], scope => [%d]\n",
+		base, filter, scope));
 
 	if (ldap_state->last_rebind.tv_sec > 0) {
 		struct timeval	tval;
@@ -970,6 +973,8 @@ int smbldap_modify(struct smbldap_state *ldap_state, const char *dn, LDAPMod *at
 
 	SMB_ASSERT(ldap_state);
 
+	DEBUG(5,("smbldap_modify: dn => [%s]\n", dn ));
+
 	if (push_utf8_allocate(&utf8_dn, dn) == (size_t)-1) {
 		return LDAP_NO_MEMORY;
 	}
@@ -1001,6 +1006,8 @@ int smbldap_add(struct smbldap_state *ldap_state, const char *dn, LDAPMod *attrs
 	
 	SMB_ASSERT(ldap_state);
 
+	DEBUG(5,("smbldap_add: dn => [%s]\n", dn ));
+
 	if (push_utf8_allocate(&utf8_dn, dn) == (size_t)-1) {
 		return LDAP_NO_MEMORY;
 	}
@@ -1032,6 +1039,8 @@ int smbldap_delete(struct smbldap_state *ldap_state, const char *dn)
 	
 	SMB_ASSERT(ldap_state);
 
+	DEBUG(5,("smbldap_delete: dn => [%s]\n", dn ));
+
 	if (push_utf8_allocate(&utf8_dn, dn) == (size_t)-1) {
 		return LDAP_NO_MEMORY;
 	}
@@ -1094,8 +1103,6 @@ int smbldap_search_suffix (struct smbldap_state *ldap_state, const char *filter,
 	int scope = LDAP_SCOPE_SUBTREE;
 	int rc;
 
-	DEBUG(2, ("smbldap_search_suffix: searching for:[%s]\n", filter));
-
 	rc = smbldap_search(ldap_state, lp_ldap_suffix(), scope, filter, search_attr, 0, result);
 
 	if (rc != LDAP_SUCCESS)	{
@@ -1104,8 +1111,6 @@ int smbldap_search_suffix (struct smbldap_state *ldap_state, const char *filter,
 				&ld_error);
 		DEBUG(0,("smbldap_search_suffix: Problem during the LDAP search: %s (%s)\n", 
 			ld_error?ld_error:"(unknown)", ldap_err2string (rc)));
-		DEBUG(3,("smbldap_search_suffix: Query was: %s, %s\n", lp_ldap_suffix(), 
-			filter));
 		SAFE_FREE(ld_error);
 	}
 	
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 1f44f5ab605..6e8ff835077 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1639,9 +1639,6 @@ static int ldapsam_search_one_group (struct ldapsam_privates *ldap_state,
 	int rc;
 	char **attr_list;
 
-	DEBUG(2, ("ldapsam_search_one_group: searching for:[%s]\n", filter));
-
-
 	attr_list = get_attr_list(groupmap_attr_list);
 	rc = smbldap_search(ldap_state->smbldap_state, 
 			    lp_ldap_group_suffix (), scope,
diff --git a/source3/sam/idmap_ldap.c b/source3/sam/idmap_ldap.c
index db1bb74de53..a2afd7d424a 100644
--- a/source3/sam/idmap_ldap.c
+++ b/source3/sam/idmap_ldap.c
@@ -507,9 +507,6 @@ static NTSTATUS ldap_get_sid_from_id(DOM_SID *sid, unid_t id, int id_type)
 		LDAP_OBJ_IDMAP_ENTRY, type,  
 		((id_type & ID_USERID) ? (unsigned long)id.uid : (unsigned long)id.gid));
 		
-
-	DEBUG(5,("ldap_get_sid_from_id: Searching \"%s\"\n", filter ));
-		 
 	attr_list = get_attr_list( sidmap_attr_list );
 	rc = smbldap_search(ldap_state.smbldap_state, suffix, LDAP_SCOPE_SUBTREE, 
 		filter, attr_list, 0, &result);
@@ -580,8 +577,6 @@ static NTSTATUS ldap_get_id_from_sid(unid_t *id, int *id_type, const DOM_SID *si
 	else 
 		type = get_attr_key2string( sidmap_attr_list, LDAP_ATTR_UIDNUMBER );
 
-	DEBUG(10,("ldap_get_id_from_sid: Searching for \"%s\"\n", filter));
-
 	/* do the search and check for errors */
 
 	attr_list = get_attr_list( sidmap_attr_list );
-- 
2.11.4.GIT