sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Revert "Pass NULL to gencache_get when we are not interested in the timeout value"

Browse Source 
This reverts commit 16062dfc3d.
(This used to be commit 114ca85775)
This commit is contained in:
Volker Lendecke 2008-07-11 17:44:25 +02:00
parent cc78ea5d09
commit d3def9a18c
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/libads/dns.c
View File

@ -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",

6
source3/libsmb/namecache.c
View File

@ -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);

3
source3/libsmb/namequery.c
View File

@ -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 );

6
source3/libsmb/trustdom_cache.c
View File

@ -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;

4
source3/torture/torture.c
View File

@ -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;