From eab60e2bb13e0197f3771ab6d60da48a72fb311d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 9 Sep 2006 21:40:47 +0000 Subject: r18312: Change gencache_get slightly: Delete expired keys, and only strdup the value if a valid entry was found. The newer calls got the latter one wrong, change the older calls. Volker (This used to be commit 554e68887bc84510690226c9b07a872e7a282abe) --- source3/libsmb/namecache.c | 4 ---- source3/libsmb/trustdom_cache.c | 1 - 2 files changed, 5 deletions(-) (limited to 'source3/libsmb') diff --git a/source3/libsmb/namecache.c b/source3/libsmb/namecache.c index afbd807198..bd4b3caeb7 100644 --- a/source3/libsmb/namecache.c +++ b/source3/libsmb/namecache.c @@ -201,9 +201,7 @@ BOOL namecache_fetch(const char *name, int name_type, struct ip_service **ip_lis if (!gencache_get(key, &value, &timeout)) { DEBUG(5, ("no entry for %s#%02X found.\n", name, name_type)); - gencache_del(key); SAFE_FREE(key); - SAFE_FREE(value); return False; } else { DEBUG(5, ("name %s#%02X found.\n", name, name_type)); @@ -314,9 +312,7 @@ BOOL namecache_status_fetch(const char *keyname, int keyname_type, if (!gencache_get(key, &value, &timeout)) { DEBUG(5, ("namecache_status_fetch: no entry for %s found.\n", key)); - gencache_del(key); SAFE_FREE(key); - SAFE_FREE(value); return False; } else { DEBUG(5, ("namecache_status_fetch: key %s -> %s\n", key, value )); diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c index 8c5fb4d907..fa35f8d423 100644 --- a/source3/libsmb/trustdom_cache.c +++ b/source3/libsmb/trustdom_cache.c @@ -183,7 +183,6 @@ BOOL trustdom_cache_fetch(const char* name, DOM_SID* sid) if (!gencache_get(key, &value, &timeout)) { DEBUG(5, ("no entry for trusted domain %s found.\n", name)); SAFE_FREE(key); - SAFE_FREE(value); return False; } else { SAFE_FREE(key); -- cgit