[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  1c82ca0 s3/winbind: remove unused winbindd_check_cache_size
      from  1c8fd86 s3: Fix the charset_pull routine (bug 7531)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1c82ca01c39e24251e59d7be44390baff998f329
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Sep 19 22:57:23 2010 -0700

    s3/winbind: remove unused winbindd_check_cache_size

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

Summary of changes:
 source3/winbindd/winbindd_cache.c |   29 -----------------------------
 source3/winbindd/winbindd_proto.h |    1 -
 2 files changed, 0 insertions(+), 30 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 9c48c71..1ae0c70 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -105,35 +105,6 @@ void (*smb_panic_fn)(const char *const why) = smb_panic;
 
 static struct winbind_cache *wcache;
 
-void winbindd_check_cache_size(time_t t)
-{
-	static time_t last_check_time;
-	struct stat st;
-
-	if (last_check_time == (time_t)0)
-		last_check_time = t;
-
-	if (t - last_check_time < 60 && t - last_check_time > 0)
-		return;
-
-	if (wcache == NULL || wcache->tdb == NULL) {
-		DEBUG(0, ("Unable to check size of tdb cache - cache not open !\n"));
-		return;
-	}
-
-	if (fstat(tdb_fd(wcache->tdb), &st) == -1) {
-		DEBUG(0, ("Unable to check size of tdb cache %s!\n", strerror(errno) ));
-		return;
-	}
-
-	if (st.st_size > WINBINDD_MAX_CACHE_SIZE) {
-		DEBUG(10,("flushing cache due to size (%lu) > (%lu)\n",
-			(unsigned long)st.st_size,
-			(unsigned long)WINBINDD_MAX_CACHE_SIZE));
-		wcache_flush_cache();
-	}
-}
-
 /* get the winbind_cache structure */
 static struct winbind_cache *get_cache(struct winbindd_domain *domain)
 {
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index ae64013..f43c08f 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -81,7 +81,6 @@ bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr,
 
 /* The following definitions come from winbindd/winbindd_cache.c  */
 
-void winbindd_check_cache_size(time_t t);
 struct cache_entry *centry_start(struct winbindd_domain *domain, NTSTATUS status);
 NTSTATUS wcache_cached_creds_exist(struct winbindd_domain *domain, const struct dom_sid *sid);
 NTSTATUS wcache_get_creds(struct winbindd_domain *domain, 


-- 
Samba Shared Repository