[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Wed Nov 13 11:34:03 MST 2013


The branch, master has been updated
       via  944e9fb s3-winbindd: Fix #10264, cache_traverse_validate_fn failure for NDR cache entries.
      from  06be596 random-sleep: add possiblity to override via environment variable

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


- Log -----------------------------------------------------------------
commit 944e9fbc20f125b52e047484dca1792d75561ed9
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 13 15:10:33 2013 +0100

    s3-winbindd: Fix #10264, cache_traverse_validate_fn failure for NDR cache entries.
    
    We need to increase the keysize limit for NDR queries. A wbint_LookupSids query
    for just 20 sids already hits the older limit.
    
    Guenther
    
    https://bugzilla.samba.org/show_bug.cgi?id=10264
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Wed Nov 13 19:33:46 CET 2013 on sn-devel-104

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

Summary of changes:
 source3/winbindd/winbindd_cache.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 91c19fa..267cefc 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -4065,7 +4065,8 @@ static int cache_traverse_validate_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_D
 	struct tdb_validation_status *v_state = (struct tdb_validation_status *)state;
 
 	/* Paranoia check. */
-	if (strncmp("UA/", (const char *)kbuf.dptr, 3) == 0) {
+	if (strncmp("UA/", (const char *)kbuf.dptr, 3) == 0 ||
+	    strncmp("NDR/", (const char *)kbuf.dptr, 4) == 0) {
 		max_key_len = 1024 * 1024;
 	}
 	if (kbuf.dsize > max_key_len) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list