svn commit: samba r13409 - branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/nsswitch trunk/source/lib trunk/source/nsswitch

gd at samba.org gd at samba.org
Thu Feb 9 10:17:39 GMT 2006


Author: gd
Date: 2006-02-09 10:17:38 +0000 (Thu, 09 Feb 2006)
New Revision: 13409

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13409

Log:
No functional changes, just some DEBUG cleanup.

Guenther

Modified:
   branches/SAMBA_3_0/source/lib/events.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
   trunk/source/lib/events.c
   trunk/source/nsswitch/winbindd_cache.c
   trunk/source/nsswitch/winbindd_cm.c
   trunk/source/nsswitch/winbindd_dual.c
   trunk/source/nsswitch/winbindd_pam.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/events.c
===================================================================
--- branches/SAMBA_3_0/source/lib/events.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ branches/SAMBA_3_0/source/lib/events.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -84,7 +84,7 @@
 
 	if (timed_events == NULL) {
 		/* No syscall if there are no events */
-		DEBUG(10, ("run_events: No events\n"));
+		DEBUG(11, ("run_events: No events\n"));
 		return;
 	}
 
@@ -92,7 +92,7 @@
 
 	if (timeval_compare(&now, &timed_events->when) < 0) {
 		/* Nothing to do yet */
-		DEBUG(10, ("run_events: Nothing to do\n"));
+		DEBUG(11, ("run_events: Nothing to do\n"));
 		return;
 	}
 

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -1650,8 +1650,8 @@
 
  	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 @@
 	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));
 

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -1273,7 +1273,7 @@
 	/* 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;
 	}

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -697,7 +697,7 @@
 		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;
 		}
 

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -549,7 +549,7 @@
 	}
 
 	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"));

Modified: trunk/source/lib/events.c
===================================================================
--- trunk/source/lib/events.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ trunk/source/lib/events.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -84,7 +84,7 @@
 
 	if (timed_events == NULL) {
 		/* No syscall if there are no events */
-		DEBUG(10, ("run_events: No events\n"));
+		DEBUG(11, ("run_events: No events\n"));
 		return;
 	}
 
@@ -92,7 +92,7 @@
 
 	if (timeval_compare(&now, &timed_events->when) < 0) {
 		/* Nothing to do yet */
-		DEBUG(10, ("run_events: Nothing to do\n"));
+		DEBUG(11, ("run_events: Nothing to do\n"));
 		return;
 	}
 

Modified: trunk/source/nsswitch/winbindd_cache.c
===================================================================
--- trunk/source/nsswitch/winbindd_cache.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ trunk/source/nsswitch/winbindd_cache.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -1650,8 +1650,8 @@
 
  	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 @@
 	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));
 

Modified: trunk/source/nsswitch/winbindd_cm.c
===================================================================
--- trunk/source/nsswitch/winbindd_cm.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ trunk/source/nsswitch/winbindd_cm.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -1273,7 +1273,7 @@
 	/* 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;
 	}

Modified: trunk/source/nsswitch/winbindd_dual.c
===================================================================
--- trunk/source/nsswitch/winbindd_dual.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ trunk/source/nsswitch/winbindd_dual.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -697,7 +697,7 @@
 		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;
 		}
 

Modified: trunk/source/nsswitch/winbindd_pam.c
===================================================================
--- trunk/source/nsswitch/winbindd_pam.c	2006-02-09 10:09:32 UTC (rev 13408)
+++ trunk/source/nsswitch/winbindd_pam.c	2006-02-09 10:17:38 UTC (rev 13409)
@@ -549,7 +549,7 @@
 	}
 
 	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"));



More information about the samba-cvs mailing list