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

[gd at samba.org]

Author: gd
Date: 2006-06-14 14:38:59 +0000 (Wed, 14 Jun 2006)
New Revision: 16221

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

Log:
No need for friednly error messages at log level 10.

Guenther

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


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-06-14 14:26:18 UTC (rev 16220)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-06-14 14:38:59 UTC (rev 16221)
@@ -870,8 +870,8 @@
 #endif
 	status = centry->status;
 
-	DEBUG(10,("wcache_get_creds: [Cached] - cached creds for user %s status %s\n",
-		sid_string_static(sid), get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("wcache_get_creds: [Cached] - cached creds for user %s status: %s\n",
+		sid_string_static(sid), nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -953,8 +953,8 @@
 do_cached:	
 	status = centry->status;
 
-	DEBUG(10,("query_user_list: [Cached] - cached list for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("query_user_list: [Cached] - cached list for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1065,8 +1065,8 @@
 do_cached:	
 	status = centry->status;
 
-	DEBUG(10,("enum_dom_groups: [Cached] - cached list for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("enum_dom_groups: [Cached] - cached list for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1148,8 +1148,8 @@
 	} else
 		status = centry->status;
 
-	DEBUG(10,("enum_local_groups: [Cached] - cached list for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("enum_local_groups: [Cached] - cached list for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1213,8 +1213,8 @@
 		centry_sid(centry, mem_ctx, sid);
 	}
 
-	DEBUG(10,("name_to_sid: [Cached] - cached name for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("name_to_sid: [Cached] - cached name for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1279,8 +1279,8 @@
 	}
 	status = centry->status;
 
-	DEBUG(10,("sid_to_name: [Cached] - cached name for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("sid_to_name: [Cached] - cached name for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1353,8 +1353,8 @@
 	centry_sid(centry, mem_ctx, &info->group_sid);
 	status = centry->status;
 
-	DEBUG(10,("query_user: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("query_user: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1427,8 +1427,8 @@
 do_cached:	
 	status = centry->status;
 
-	DEBUG(10,("lookup_usergroups: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("lookup_usergroups: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1513,9 +1513,8 @@
 
 	status = centry->status;
 
-	DEBUG(10,("lookup_useraliases: [Cached] - cached info for domain %s "
-		  "status %s\n", domain->name,
-		  get_friendly_nt_error_msg(status)));
+	DEBUG(10,("lookup_useraliases: [Cached] - cached info for domain: %s "
+		  "status %s\n", domain->name, nt_errstr(status)));
 
 	centry_free(centry);
 	return status;
@@ -1591,8 +1590,8 @@
 do_cached:	
 	status = centry->status;
 
-	DEBUG(10,("lookup_groupmem: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("lookup_groupmem: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status)));
 
 	centry_free(centry);
 	return status;
@@ -1684,8 +1683,8 @@
 
  	status = centry->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) ));
+	DEBUG(10,("trusted_domains: [Cached] - cached info for domain %s (%d trusts) status: %s\n",
+		domain->name, *num_domains, nt_errstr(status) ));
  
  	centry_free(centry);
  	return status;
@@ -1760,8 +1759,8 @@
  
  	status = centry->status;
  
-	DEBUG(10,("lockout_policy: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("lockout_policy: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
  
  	centry_free(centry);
  	return status;
@@ -1811,8 +1810,8 @@
 
 	status = centry->status;
 
-	DEBUG(10,("lockout_policy: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("lockout_policy: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;

Modified: trunk/source/nsswitch/winbindd_cache.c
===================================================================
--- trunk/source/nsswitch/winbindd_cache.c	2006-06-14 14:26:18 UTC (rev 16220)
+++ trunk/source/nsswitch/winbindd_cache.c	2006-06-14 14:38:59 UTC (rev 16221)
@@ -870,8 +870,8 @@
 #endif
 	status = centry->status;
 
-	DEBUG(10,("wcache_get_creds: [Cached] - cached creds for user %s status %s\n",
-		sid_string_static(sid), get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("wcache_get_creds: [Cached] - cached creds for user %s status: %s\n",
+		sid_string_static(sid), nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -953,8 +953,8 @@
 do_cached:	
 	status = centry->status;
 
-	DEBUG(10,("query_user_list: [Cached] - cached list for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("query_user_list: [Cached] - cached list for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1065,8 +1065,8 @@
 do_cached:	
 	status = centry->status;
 
-	DEBUG(10,("enum_dom_groups: [Cached] - cached list for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("enum_dom_groups: [Cached] - cached list for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1148,8 +1148,8 @@
 	} else
 		status = centry->status;
 
-	DEBUG(10,("enum_local_groups: [Cached] - cached list for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("enum_local_groups: [Cached] - cached list for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1213,8 +1213,8 @@
 		centry_sid(centry, mem_ctx, sid);
 	}
 
-	DEBUG(10,("name_to_sid: [Cached] - cached name for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("name_to_sid: [Cached] - cached name for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1279,8 +1279,8 @@
 	}
 	status = centry->status;
 
-	DEBUG(10,("sid_to_name: [Cached] - cached name for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("sid_to_name: [Cached] - cached name for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1475,8 +1475,8 @@
 	centry_sid(centry, mem_ctx, &info->group_sid);
 	status = centry->status;
 
-	DEBUG(10,("query_user: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("query_user: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1549,8 +1549,8 @@
 do_cached:	
 	status = centry->status;
 
-	DEBUG(10,("lookup_usergroups: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("lookup_usergroups: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;
@@ -1635,9 +1635,8 @@
 
 	status = centry->status;
 
-	DEBUG(10,("lookup_useraliases: [Cached] - cached info for domain %s "
-		  "status %s\n", domain->name,
-		  get_friendly_nt_error_msg(status)));
+	DEBUG(10,("lookup_useraliases: [Cached] - cached info for domain: %s "
+		  "status %s\n", domain->name, nt_errstr(status)));
 
 	centry_free(centry);
 	return status;
@@ -1713,8 +1712,8 @@
 do_cached:	
 	status = centry->status;
 
-	DEBUG(10,("lookup_groupmem: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("lookup_groupmem: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status)));
 
 	centry_free(centry);
 	return status;
@@ -1806,8 +1805,8 @@
 
  	status = centry->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) ));
+	DEBUG(10,("trusted_domains: [Cached] - cached info for domain %s (%d trusts) status: %s\n",
+		domain->name, *num_domains, nt_errstr(status) ));
  
  	centry_free(centry);
  	return status;
@@ -1882,8 +1881,8 @@
  
  	status = centry->status;
  
-	DEBUG(10,("lockout_policy: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("lockout_policy: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
  
  	centry_free(centry);
  	return status;
@@ -1933,8 +1932,8 @@
 
 	status = centry->status;
 
-	DEBUG(10,("lockout_policy: [Cached] - cached info for domain %s status %s\n",
-		domain->name, get_friendly_nt_error_msg(status) ));
+	DEBUG(10,("lockout_policy: [Cached] - cached info for domain %s status: %s\n",
+		domain->name, nt_errstr(status) ));
 
 	centry_free(centry);
 	return status;