r13409: No functional changes, just some DEBUG cleanup.

Guenther
(This used to be commit 286f6fc2339cf4ef232c16466b8dffdcddbe343f)

diff --git a/source3/lib/events.c b/source3/lib/events.c
index 314f0749794ae2f3ce5135d69ca2a535e1bcef6d..3670d960aaebe8ab3751b42b416635b82085d7c5 100644 (file)
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -84,7 +84,7 @@ void run_events(void)
 
        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 @@ void run_events(void)
 
        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;
        }
 

diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 297c608bc1018439b960c151ab3370519271b60d..799818198c222fd7b7871c6c81db0736c5f7230a 100644 (file)
--- 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 568078f86e538968b4369c9f3c89602619fad73e..9a1831e545958b351a9e7c3b720ba847d80e9158 100644 (file)
--- 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 1988f36b51d193b60fa96f4b4026f5d18cb96ba9..56a7afec9fea4e8b2a15641d5219e501ef987c37 100644 (file)
--- 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 264134570a77aac04021a145086da896c8009cea..499f225d2cb7c0422fb98101f90aee745c8d4cdd 100644 (file)
--- 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"));