svn commit: samba r14674 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-03-23 12:50:25 +0000 (Thu, 23 Mar 2006)
New Revision: 14674

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

Log:
Further cleanup for cached logins, only dump hashes with DEBUG_PASSWORD.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_creds.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
   trunk/source/nsswitch/winbindd_cache.c
   trunk/source/nsswitch/winbindd_creds.c
   trunk/source/nsswitch/winbindd_pam.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-03-23 12:00:00 UTC (rev 14673)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-03-23 12:50:25 UTC (rev 14674)
@@ -841,7 +841,9 @@
 	t = centry_time(centry);
 	*cached_nt_pass = (const uint8 *)centry_string(centry, mem_ctx);
 
-	dump_data(10, (const char *)cached_nt_pass, NT_HASH_LEN);
+#if DEBUG_PASSWORD
+	dump_data(100, (const char *)cached_nt_pass, NT_HASH_LEN);
+#endif
 	status = centry->status;
 
 	DEBUG(10,("wcache_get_creds: [Cached] - cached creds for user %s status %s\n",
@@ -865,7 +867,9 @@
 		return NT_STATUS_INTERNAL_DB_ERROR;
 	}
 
+#if DEBUG_PASSWORD
 	dump_data(100, (const char *)nt_pass, NT_HASH_LEN);
+#endif
 
 	centry_put_time(centry, time(NULL));
 	centry_put_string(centry, (const char *)nt_pass);

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_creds.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_creds.c	2006-03-23 12:00:00 UTC (rev 14673)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_creds.c	2006-03-23 12:50:25 UTC (rev 14674)
@@ -117,7 +117,9 @@
 
 		E_md4hash(pass, nt_pass);
 
+#if DEBUG_PASSWORD
 		dump_data(100, (const char *)nt_pass, NT_HASH_LEN);
+#endif
 
 		status = wcache_save_creds(domain, mem_ctx, &cred_sid, nt_pass);
 		if (!NT_STATUS_IS_OK(status)) {

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2006-03-23 12:00:00 UTC (rev 14673)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2006-03-23 12:50:25 UTC (rev 14674)
@@ -716,8 +716,10 @@
 
 	E_md4hash(state->request.data.auth.pass, new_nt_pass);
 
+#if DEBUG_PASSWORD
 	dump_data(100, (const char *)new_nt_pass, NT_HASH_LEN);
 	dump_data(100, (const char *)cached_nt_pass, NT_HASH_LEN);
+#endif
 
 	if (!memcmp(cached_nt_pass, new_nt_pass, NT_HASH_LEN)) {
 

Modified: trunk/source/nsswitch/winbindd_cache.c
===================================================================
--- trunk/source/nsswitch/winbindd_cache.c	2006-03-23 12:00:00 UTC (rev 14673)
+++ trunk/source/nsswitch/winbindd_cache.c	2006-03-23 12:50:25 UTC (rev 14674)
@@ -841,7 +841,9 @@
 	t = centry_time(centry);
 	*cached_nt_pass = (const uint8 *)centry_string(centry, mem_ctx);
 
-	dump_data(10, (const char *)cached_nt_pass, NT_HASH_LEN);
+#if DEBUG_PASSWORD
+	dump_data(100, (const char *)cached_nt_pass, NT_HASH_LEN);
+#endif
 	status = centry->status;
 
 	DEBUG(10,("wcache_get_creds: [Cached] - cached creds for user %s status %s\n",
@@ -865,7 +867,9 @@
 		return NT_STATUS_INTERNAL_DB_ERROR;
 	}
 
+#if DEBUG_PASSWORD
 	dump_data(100, (const char *)nt_pass, NT_HASH_LEN);
+#endif
 
 	centry_put_time(centry, time(NULL));
 	centry_put_string(centry, (const char *)nt_pass);

Modified: trunk/source/nsswitch/winbindd_creds.c
===================================================================
--- trunk/source/nsswitch/winbindd_creds.c	2006-03-23 12:00:00 UTC (rev 14673)
+++ trunk/source/nsswitch/winbindd_creds.c	2006-03-23 12:50:25 UTC (rev 14674)
@@ -117,7 +117,9 @@
 
 		E_md4hash(pass, nt_pass);
 
+#if DEBUG_PASSWORD
 		dump_data(100, (const char *)nt_pass, NT_HASH_LEN);
+#endif
 
 		status = wcache_save_creds(domain, mem_ctx, &cred_sid, nt_pass);
 		if (!NT_STATUS_IS_OK(status)) {

Modified: trunk/source/nsswitch/winbindd_pam.c
===================================================================
--- trunk/source/nsswitch/winbindd_pam.c	2006-03-23 12:00:00 UTC (rev 14673)
+++ trunk/source/nsswitch/winbindd_pam.c	2006-03-23 12:50:25 UTC (rev 14674)
@@ -716,8 +716,10 @@
 
 	E_md4hash(state->request.data.auth.pass, new_nt_pass);
 
+#if DEBUG_PASSWORD
 	dump_data(100, (const char *)new_nt_pass, NT_HASH_LEN);
 	dump_data(100, (const char *)cached_nt_pass, NT_HASH_LEN);
+#endif
 
 	if (!memcmp(cached_nt_pass, new_nt_pass, NT_HASH_LEN)) {