[Pkg-samba-maint] [samba] 23/29: s3-winbindd: Fix #10264, cache_traverse_validate_fn failure for NDR cache entries.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch samba_4.1
in repository samba.

commit 5df543b844af4908b6a467afa12ed9ae3275d921
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
    (cherry picked from commit 944e9fbc20f125b52e047484dca1792d75561ed9)
---
 source3/winbindd/winbindd_cache.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 7252927..fe05759 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -4064,7 +4064,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) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git