[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3080-g454cb85

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  454cb852e06fa3d8bdd0eebb3ebdb24b3d74ecd0 (commit)
       via  7a5a575ffe5196caecedc93970a25abfbe6f8059 (commit)
      from  2954b2be563149380e1fae7fe088b98d6cbd42e7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 454cb852e06fa3d8bdd0eebb3ebdb24b3d74ecd0
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 3 16:44:13 2008 +0200

    Remove an unused variable

commit 7a5a575ffe5196caecedc93970a25abfbe6f8059
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 3 16:24:27 2008 +0200

    Remove gencache_[un]lock_entry
    
    Günther agreed that it might be unnecessary in dsgetdcname_cache_store() :-)

-----------------------------------------------------------------------

Summary of changes:
 source/include/proto.h      |    2 --
 source/lib/gencache.c       |   25 -------------------------
 source/libsmb/dsgetdcname.c |   12 ++----------
 source/passdb/lookup_sid.c  |    1 -
 4 files changed, 2 insertions(+), 38 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index ae5481d..85efe24 100644
--- a/source/include/proto.h
+++ b/source/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/source/lib/gencache.c b/source/lib/gencache.c
index 1b4342a..a55b2ab 100644
--- a/source/lib/gencache.c
+++ b/source/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/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index 2a445cb..afc8703 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/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;
 }
 
 /****************************************************************
diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c
index 4e11bb8..777793c 100644
--- a/source/passdb/lookup_sid.c
+++ b/source/passdb/lookup_sid.c
@@ -1393,7 +1393,6 @@ bool sid_to_uid(const DOM_SID *psid, uid_t *puid)
 
 bool sid_to_gid(const DOM_SID *psid, gid_t *pgid)
 {
-	uint32 rid;
 	uid_t uid;
 
 	if (fetch_gid_from_cache(pgid, psid))


-- 
Samba Shared Repository