summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-07-11 17:44:25 +0200
committerVolker Lendecke <vl@samba.org>2008-07-11 17:53:25 +0200
commitd3def9a18cc701573530154ed420278f007f06a3 (patch)
treea69446c4eb869be0174120dcd66becbf8221005c /source3
parentcc78ea5d09f2d8e338f0626fb1215f06ee7e1bbe (diff)
downloadsamba-d3def9a18cc701573530154ed420278f007f06a3.tar.gz
samba-d3def9a18cc701573530154ed420278f007f06a3.tar.bz2
samba-d3def9a18cc701573530154ed420278f007f06a3.zip
Revert "Pass NULL to gencache_get when we are not interested in the timeout value"
This reverts commit 16062dfc3dcc8f1ca0024a3ae21effb889c7ffc0. (This used to be commit 114ca8577568cdb5a81d8734f1d1d096f1b36c36)
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, 14 insertions, 8 deletions
diff --git a/source3/libads/dns.c b/source3/libads/dns.c
index a8825d32e6..3a9e849668 100644
--- a/source3/libads/dns.c
+++ b/source3/libads/dns.c
@@ -790,6 +790,7 @@ 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;
@@ -806,7 +807,7 @@ char *sitename_fetch(const char *realm)
key = sitename_key(query_realm);
- ret = gencache_get( key, &sitename, NULL );
+ ret = gencache_get( key, &sitename, &timeout );
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 1f462ba79a..ba706e5ee2 100644
--- a/source3/libsmb/namecache.c
+++ b/source3/libsmb/namecache.c
@@ -200,6 +200,7 @@ 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) {
@@ -224,7 +225,7 @@ bool namecache_fetch(const char *name,
return False;
}
- if (!gencache_get(key, &value, NULL)) {
+ if (!gencache_get(key, &value, &timeout)) {
DEBUG(5, ("no entry for %s#%02X found.\n", name, name_type));
SAFE_FREE(key);
return False;
@@ -366,6 +367,7 @@ bool namecache_status_fetch(const char *keyname,
{
char *key = NULL;
char *value = NULL;
+ time_t timeout;
if (!gencache_init())
return False;
@@ -375,7 +377,7 @@ bool namecache_status_fetch(const char *keyname,
if (!key)
return False;
- if (!gencache_get(key, &value, NULL)) {
+ if (!gencache_get(key, &value, &timeout)) {
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 9b50d209b9..24d7ee1a9c 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -112,6 +112,7 @@ bool saf_delete( const char *domain )
char *saf_fetch( const char *domain )
{
char *server = NULL;
+ time_t timeout;
bool ret = False;
char *key = NULL;
@@ -125,7 +126,7 @@ char *saf_fetch( const char *domain )
key = saf_key( domain );
- ret = gencache_get( key, &server, NULL );
+ ret = gencache_get( key, &server, &timeout );
SAFE_FREE( key );
diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c
index 92dde0c6c8..6755de3814 100644
--- a/source3/libsmb/trustdom_cache.c
+++ b/source3/libsmb/trustdom_cache.c
@@ -164,6 +164,7 @@ 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())
@@ -178,7 +179,7 @@ bool trustdom_cache_fetch(const char* name, DOM_SID* sid)
if (!key)
return False;
- if (!gencache_get(key, &value, NULL)) {
+ if (!gencache_get(key, &value, &timeout)) {
DEBUG(5, ("no entry for trusted domain %s found.\n", name));
SAFE_FREE(key);
return False;
@@ -206,13 +207,14 @@ 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, NULL)) {
+ if (!gencache_get(TDOMTSKEY, &value, &timeout)) {
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 98dd900941..d8add208f5 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, NULL)) {
+ if (!gencache_get("foo", &val, &tm)) {
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, NULL)) {
+ if (gencache_get("foo", &val, &tm)) {
d_printf("%s: gencache_get() on deleted entry "
"succeeded\n", __location__);
return False;