4 files changed, 5 insertions, 7 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 297c608bc1..799818198c 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -1650,8 +1650,8 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 
  	status = centry->status;
  
-	DEBUG(10,("trusted_domains: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("trusted_domains: [Cached] - cached info for domain %s (%d trusts) status %s\n",
+		domain->name, *num_domains, get_friendly_nt_error_msg(status) ));
  
  	centry_free(centry);
  	return status;
@@ -1958,8 +1958,6 @@ void cache_cleanup_response(pid_t pid)
 	if (!init_wcache())
 		return;
 
-	DEBUG(10,("Cleaning up response for pid %d\n", pid));
-
 	fstr_sprintf(key_str, "DR/%d", pid);
 	tdb_delete(wcache->tdb, string_tdb_data(key_str));
 
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 568078f86e..9a1831e545 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -1273,7 +1273,7 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
 	/* Fall back to schannel if it's a W2K pre-SP1 box. */
 
 	if (!cm_get_schannel_dcinfo(domain, &p_dcinfo)) {
-		DEBUG(10, ("cm_connect_sam: Could not get schannel auth info "
+		DEBUG(10, ("cm_connect_lsa: Could not get schannel auth info "
 			   "for domain %s, trying anon\n", conn->cli->domain));
 		goto anonymous;
 	}
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index 1988f36b51..56a7afec9f 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -697,7 +697,7 @@ static BOOL fork_domain_child(struct winbindd_child *child)
 		ret = sys_select(state.sock + 1, &read_fds, NULL, NULL, tp);
 
 		if (ret == 0) {
-			DEBUG(10,("nothing is ready yet, continue\n"));
+			DEBUG(11,("nothing is ready yet, continue\n"));
 			continue;
 		}
 
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index 264134570a..499f225d2c 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -549,7 +549,7 @@ static NTSTATUS winbindd_raw_kerberos_login(struct winbindd_domain *domain,
 	}
 
 	DEBUG(10,("winbindd_raw_kerberos_login: winbindd validated ticket of %s\n", 
-		client_princ));
+		local_service));
 
 	if (!pac_data) {
 		DEBUG(3,("winbindd_raw_kerberos_login: no pac data\n"));