[SCM] Samba Shared Repository - branch v3-6-test updated

Björn Jacke bjacke at samba.org
Tue Sep 21 11:57:35 MDT 2010


The branch, v3-6-test has been updated
       via  2bc0e0230 s3: don't build krb5 locator plugin if we don't build winbind
       via  d0da459 s3/winbind: remove unused winbindd_check_cache_size (cherry picked from commit 1c82ca01c39e24251e59d7be44390baff998f329)
      from  ec3d51e Really enable core dumps in Linux

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


- Log -----------------------------------------------------------------
commit 2bc0e023044d643f98c6d18232680ffcff3cb8ea
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 21 10:52:46 2010 -0700

    s3: don't build krb5 locator plugin if we don't build winbind
    
    this fixes bug #7329
    (cherry picked from commit 81d257e8aef096c4f6ef79d20543aaf287dc9e1a)

commit d0da4590046daf20f8c4f2a8f234c99599c43beb
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
    (cherry picked from commit 1c82ca01c39e24251e59d7be44390baff998f329)

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

Summary of changes:
 source3/configure.in              |   26 ++++++++++++++------------
 source3/winbindd/winbindd_cache.c |   29 -----------------------------
 source3/winbindd/winbindd_proto.h |    1 -
 3 files changed, 14 insertions(+), 42 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index faf0858..28ca2ef 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3705,18 +3705,6 @@ if test x"$with_ads_support" != x"no"; then
     CPPFLAGS=$ac_save_CPPFLAGS
     LDFLAGS=$ac_save_LDFLAGS
   fi
-  AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [],
-[[#ifdef HAVE_KRB5_H
- #include <krb5.h>
- #endif
-]])
-
-  if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then
-	WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT"
-	if test x"$BLDSHARED" = x"true" ; then
-		EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR"
-	fi
-  fi
 
   # check for new heimdal KRB5_DEPRECATED handling
 
@@ -6266,6 +6254,20 @@ if test x"$HAVE_WINBIND" = x"yes"; then
 		INSTALL_PAM_MODULES="installpammodules"
 		UNINSTALL_PAM_MODULES="uninstallpammodules"
 	fi
+
+	# we use winbind, check for krb5 locate_plugin support:
+	AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [],
+		[[#ifdef HAVE_KRB5_H
+		 #include <krb5.h>
+		 #endif
+	]])
+	if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then
+		WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT"
+		if test x"$BLDSHARED" = x"true" ; then
+			EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR"
+		fi
+	fi
+	# end of krb5 locate_plugin check
 else
         AC_MSG_RESULT(no$winbind_no_reason)
 fi
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 5d12c2b..4c6fbf3 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 5e49dcd..e5b453d 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


More information about the samba-cvs mailing list