summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-07-03 15:15:57 +0200
committerVolker Lendecke <vl@samba.org>2008-07-03 15:17:58 +0200
commit962beb287239b525ed4828ae13b85de31448d256 (patch)
tree97576b7c27fcd8a65dc0e0668814b31b5ea312a6 /source3
parent47f1090de77937ad5fece426a04eb7a3406a1284 (diff)
downloadsamba-962beb287239b525ed4828ae13b85de31448d256.tar.gz
samba-962beb287239b525ed4828ae13b85de31448d256.tar.bz2
samba-962beb287239b525ed4828ae13b85de31448d256.zip
Pass NULL to gencache_get when we are not interested in the timeout value
(This used to be commit 16062dfc3dcc8f1ca0024a3ae21effb889c7ffc0)
Diffstat (limited to 'source3')
-rw-r--r--source3/libads/dns.c3
-rw-r--r--source3/libsmb/namecache.c6
-rw-r--r--source3/libsmb/namequery.c3
-rw-r--r--source3/libsmb/trustdom_cache.c6
-rw-r--r--source3/torture/torture.c4
5 files changed, 8 insertions, 14 deletions
diff --git a/source3/libads/dns.c b/source3/libads/dns.c
index 3a9e849668..a8825d32e6 100644
--- a/source3/libads/dns.c
+++ b/source3/libads/dns.c
@@ -790,7 +790,6 @@ bool sitename_store(const char *realm, const char *sitename)
char *sitename_fetch(const char *realm)
{
char *sitename = NULL;
- time_t timeout;
bool ret = False;
const char *query_realm;
char *key;
@@ -807,7 +806,7 @@ char *sitename_fetch(const char *realm)
key = sitename_key(query_realm);
- ret = gencache_get( key, &sitename, &timeout );
+ ret = gencache_get( key, &sitename, NULL );
SAFE_FREE(key);
if ( !ret ) {
DEBUG(5,("sitename_fetch: No stored sitename for %s\n",
diff --git a/source3/libsmb/namecache.c b/source3/libsmb/namecache.c
index ba706e5ee2..1f462ba79a 100644
--- a/source3/libsmb/namecache.c
+++ b/source3/libsmb/namecache.c
@@ -200,7 +200,6 @@ bool namecache_fetch(const char *name,
int *num_names)
{
char *key, *value;
- time_t timeout;
/* exit now if null pointers were passed as they're required further */
if (!ip_list || !num_names) {
@@ -225,7 +224,7 @@ bool namecache_fetch(const char *name,
return False;
}
- if (!gencache_get(key, &value, &timeout)) {
+ if (!gencache_get(key, &value, NULL)) {
DEBUG(5, ("no entry for %s#%02X found.\n", name, name_type));
SAFE_FREE(key);
return False;
@@ -367,7 +366,6 @@ bool namecache_status_fetch(const char *keyname,
{
char *key = NULL;
char *value = NULL;
- time_t timeout;
if (!gencache_init())
return False;
@@ -377,7 +375,7 @@ bool namecache_status_fetch(const char *keyname,
if (!key)
return False;
- if (!gencache_get(key, &value, &timeout)) {
+ if (!gencache_get(key, &value, NULL)) {
DEBUG(5, ("namecache_status_fetch: no entry for %s found.\n",
key));
SAFE_FREE(key);
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 24d7ee1a9c..9b50d209b9 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -112,7 +112,6 @@ bool saf_delete( const char *domain )
char *saf_fetch( const char *domain )
{
char *server = NULL;
- time_t timeout;
bool ret = False;
char *key = NULL;
@@ -126,7 +125,7 @@ char *saf_fetch( const char *domain )
key = saf_key( domain );
- ret = gencache_get( key, &server, &timeout );
+ ret = gencache_get( key, &server, NULL );
SAFE_FREE( key );
diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c
index 6755de3814..92dde0c6c8 100644
--- a/source3/libsmb/trustdom_cache.c
+++ b/source3/libsmb/trustdom_cache.c
@@ -164,7 +164,6 @@ bool trustdom_cache_store(char* name, char* alt_name, const DOM_SID *sid,
bool trustdom_cache_fetch(const char* name, DOM_SID* sid)
{
char *key = NULL, *value = NULL;
- time_t timeout;
/* init the cache */
if (!gencache_init())
@@ -179,7 +178,7 @@ bool trustdom_cache_fetch(const char* name, DOM_SID* sid)
if (!key)
return False;
- if (!gencache_get(key, &value, &timeout)) {
+ if (!gencache_get(key, &value, NULL)) {
DEBUG(5, ("no entry for trusted domain %s found.\n", name));
SAFE_FREE(key);
return False;
@@ -207,14 +206,13 @@ bool trustdom_cache_fetch(const char* name, DOM_SID* sid)
uint32 trustdom_cache_fetch_timestamp( void )
{
char *value = NULL;
- time_t timeout;
uint32 timestamp;
/* init the cache */
if (!gencache_init())
return False;
- if (!gencache_get(TDOMTSKEY, &value, &timeout)) {
+ if (!gencache_get(TDOMTSKEY, &value, NULL)) {
DEBUG(5, ("no timestamp for trusted domain cache located.\n"));
SAFE_FREE(value);
return 0;
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index d8add208f5..98dd900941 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -4933,7 +4933,7 @@ static bool run_local_gencache(int dummy)
return False;
}
- if (!gencache_get("foo", &val, &tm)) {
+ if (!gencache_get("foo", &val, NULL)) {
d_printf("%s: gencache_get() failed\n", __location__);
return False;
}
@@ -4957,7 +4957,7 @@ static bool run_local_gencache(int dummy)
return False;
}
- if (gencache_get("foo", &val, &tm)) {
+ if (gencache_get("foo", &val, NULL)) {
d_printf("%s: gencache_get() on deleted entry "
"succeeded\n", __location__);
return False;