set DEFAULT_SIZE=1 when no path compression

which makes it work... will track things down later.

diff --git a/src/lib/util/trie.c b/src/lib/util/trie.c
index 0889aa077d213c7ba308d9af5ddf0adb759afd46..89bf9a3a0a90aea625339a4651c347a838dd0da8 100644 (file)
--- a/src/lib/util/trie.c
+++ b/src/lib/util/trie.c
@@ -115,7 +115,10 @@ RCSID("$Id$")
 
 // @todo - make this configurable in fr_trie_t, and pass fr_trei_t to
 // all internal function.
+
+#ifndef DEFAULT_SIZE
 #define DEFAULT_SIZE   (4)
+#endif
 
 /*
  *     Macros to swap one for the other.
@@ -231,6 +234,10 @@ static fr_trie_node_t *fr_trie_node_alloc(TALLOC_CTX *ctx, int size)
                return NULL;
        }
 
+#ifndef WITH_PATH_COMPRESSION
+       if (size > DEFAULT_SIZE) size = DEFAULT_SIZE;
+#endif
+
        node_size = sizeof(fr_trie_node_t) + (sizeof(node->entry[0]) * (1 << size));
        node = talloc_zero_size(ctx, node_size);
        if (!node) return NULL;

diff --git a/src/tests/trie/nopc.mk b/src/tests/trie/nopc.mk
index ab57f21024a4235f33b8252338f39728675b7d94..a4234d83f9b1fe6f3374b2be2147972023a30497 100644 (file)
--- a/src/tests/trie/nopc.mk
+++ b/src/tests/trie/nopc.mk
@@ -1,6 +1,6 @@
 TARGET         := nopc
 
-SRC_CFLAGS     := -DTESTING -DNO_PATH_COMPRESSION
+SRC_CFLAGS     := -DTESTING -DNO_PATH_COMPRESSION -DDEFAULT_SIZE=1
 SOURCES                := nopc.c
 TGT_LDLIBS     := $(LIBS)
 TGT_PREREQS    := libfreeradius-util.a