Import release 0.1.6

[secnet] / conffile.c

diff --git a/conffile.c b/conffile.c
index 061fd7a98f2c0a17d58b5423122f49eb914b5e6e..e9c84d3cb4aa82fc9a49eeaea73d6f1eb8f0827b 100644 (file)
--- a/conffile.c
+++ b/conffile.c
@@ -12,7 +12,10 @@
 #include "conffile.h"
 #include "conffile_internal.h"
 #include "util.h"
 #include "conffile.h"
 #include "conffile_internal.h"
 #include "util.h"

-#include "modules.h"
+#include "ipaddr.h"
+
+/* from modules.c */
+extern void init_builtin_modules(dict_t *dict);

 
 static struct cloc no_loc={"none",0};
 
 
 static struct cloc no_loc={"none",0};
 


@@ -783,7 +786,7 @@ void dict_read_subnet_list(dict_t *dict, string_t key, bool_t required,
        cfgfatal(loc,desc,"required parameter \"%s\" not found\n",key);
     }
     /* Count the items in the list */
        cfgfatal(loc,desc,"required parameter \"%s\" not found\n",key);
     }
     /* Count the items in the list */

-    for (li=l; li; li=li->next) e++;
+    e=list_length(l);

     if (e==0) return;
     sl->entries=e;
     sl->list=safe_malloc(sizeof(struct subnet)*e, "dict_read_subnet_list");
     if (e==0) return;
     sl->entries=e;
     sl->list=safe_malloc(sizeof(struct subnet)*e, "dict_read_subnet_list");