diff options
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/lib/gencache.c | 25 | ||||
| -rw-r--r-- | source3/libsmb/dsgetdcname.c | 12 |
3 files changed, 2 insertions, 37 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index ae5481dc31..85efe24a36 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -606,8 +606,6 @@ bool gencache_get_data_blob(const char *keystr, DATA_BLOB *blob, bool *expired); bool gencache_set_data_blob(const char *keystr, const DATA_BLOB *blob, time_t timeout); void gencache_iterate(void (*fn)(const char* key, const char *value, time_t timeout, void* dptr), void* data, const char* keystr_pattern); -int gencache_lock_entry( const char *key ); -void gencache_unlock_entry( const char *key ); /* The following definitions come from lib/genrand.c */ diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c index 1b4342a62b..a55b2ab9ba 100644 --- a/source3/lib/gencache.c +++ b/source3/lib/gencache.c @@ -484,28 +484,3 @@ void gencache_iterate(void (*fn)(const char* key, const char *value, time_t time tdb_search_list_free(first_node); } - -/******************************************************************** - lock a key -********************************************************************/ - -int gencache_lock_entry( const char *key ) -{ - if (!gencache_init()) - return -1; - - return tdb_lock_bystring(cache, key); -} - -/******************************************************************** - unlock a key -********************************************************************/ - -void gencache_unlock_entry( const char *key ) -{ - if (!gencache_init()) - return; - - tdb_unlock_bystring(cache, key); - return; -} diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c index 2a445cbd5a..afc87030d0 100644 --- a/source3/libsmb/dsgetdcname.c +++ b/source3/libsmb/dsgetdcname.c @@ -159,7 +159,6 @@ static NTSTATUS dsgetdcname_cache_store(TALLOC_CTX *mem_ctx, { time_t expire_time; char *key; - bool ret = false; if (!gencache_init()) { return NT_STATUS_INTERNAL_DB_ERROR; @@ -172,15 +171,8 @@ static NTSTATUS dsgetdcname_cache_store(TALLOC_CTX *mem_ctx, expire_time = time(NULL) + DSGETDCNAME_CACHE_TTL; - if (gencache_lock_entry(key) != 0) { - return NT_STATUS_LOCK_NOT_GRANTED; - } - - ret = gencache_set_data_blob(key, blob, expire_time); - - gencache_unlock_entry(key); - - return ret ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; + return gencache_set_data_blob(key, blob, expire_time) + ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } /**************************************************************** |