r16254: pulling klocwork fixes for 3.0.23rc3 (current up to r16251)

2 files changed, 29 insertions, 30 deletions

diff --git a/source/nsswitch/winbindd_cache.c b/source/nsswitch/winbindd_cache.c
index 0c096352d39..86846f7835c 100644
--- a/source/nsswitch/winbindd_cache.c
+++ b/source/nsswitch/winbindd_cache.c
@@ -717,7 +717,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain *domain,
 	fstrcpy(uname, name);
 	strupper_m(uname);
 	centry_end(centry, "NS/%s/%s", domain_name, uname);
-	DEBUG(10,("wcache_save_name_to_sid: %s -> %s\n", uname,
+	DEBUG(10,("wcache_save_name_to_sid: %s\\%s -> %s\n", domain_name, uname,
 		  sid_string_static(sid)));
 	centry_free(centry);
 }
@@ -870,8 +870,8 @@ NTSTATUS wcache_get_creds(struct winbindd_domain *domain,
 #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 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 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 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 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 @@ do_cached:
 	} 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 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
 		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 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 	}
 	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 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
 	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 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 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 @@ static NTSTATUS lookup_useraliases(struct winbindd_domain *domain,
 
 	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 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 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 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 
  	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 @@ static NTSTATUS lockout_policy(struct winbindd_domain *domain,
  
  	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 @@ static NTSTATUS password_policy(struct winbindd_domain *domain,
 
 	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;
@@ -2232,7 +2231,7 @@ NTSTATUS wcache_remove_oldest_cached_creds(struct winbindd_domain *domain, const
 	ret = tdb_traverse(cache->tdb, traverse_fn_get_credlist, NULL);
 	if (ret == 0) {
 		return NT_STATUS_OK;
-	} else if (ret == -1) {
+	} else if ((ret == -1) || (wcache_cred_list == NULL)) {
 		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 	}
 
diff --git a/source/nsswitch/winbindd_rpc.c b/source/nsswitch/winbindd_rpc.c
index 22df8d4db96..de4dbc9a79b 100644
--- a/source/nsswitch/winbindd_rpc.c
+++ b/source/nsswitch/winbindd_rpc.c
@@ -262,7 +262,7 @@ NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	DEBUG(3,("name_to_sid [rpc] %s for domain %s\n", name?name:"", domain_name ));
+	DEBUG(3,("name_to_sid [rpc] %s for domain %s\n", full_name?full_name:"", domain_name ));
 
 	result = cm_connect_lsa(domain, mem_ctx, &cli, &lsa_policy);
 	if (!NT_STATUS_IS_OK(result))