diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 66de29e..0b69e22 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -4028,7 +4028,9 @@ static int cache_traverse_validate_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_D
 
        /* Paranoia check. */
        if (strncmp("UA/", (const char *)kbuf.dptr, 3) == 0) {
-               max_key_len = 1024 * 1024;
+               max_key_len *= 1024;
+       } else if (strncmp("NDR/", (const char *)kbuf.dptr, 4) == 0) {
+               max_key_len *= 8;
        }
        if (kbuf.dsize > max_key_len) {
                DEBUG(0, ("cache_traverse_validate_fn: key length too large: "