Ready for radsecproxy-1.5.

[libradsec.git] / catgconf.c

diff --git a/catgconf.c b/catgconf.c
index dc0f312..5cdec68 100644 (file)
--- a/catgconf.c
+++ b/catgconf.c
@@ -6,16 +6,18 @@
 #include "gconfig.h"
 
 void listconfig(struct gconffile **cf, char *block, int compact) {
-    char *opt, *val;
+    char *opt = NULL, *val = NULL;
     int conftype;
 
     for (;;) {
+       free(opt);
+       free(val);
        getconfigline(cf, block, &opt, &val, &conftype);
        if (!opt)
            return;
 
        if (conftype == CONF_STR && !strcasecmp(opt, "include")) {
-           if (!pushgconffiles(cf, val))
+           if (!pushgconfpaths(cf, val))
                debugx(1, DBG_ERR, "failed to include config file %s", val);
            continue;
        }
@@ -42,7 +44,7 @@ int main(int argc, char **argv) {
     int c, compact = 0;
     struct gconffile *cfs;
 
-    debug_init("catgconf");
+    debug_init("radsecproxy-conf");
     debug_set_level(DBG_WARN);
 
     while ((c = getopt(argc, argv, "c")) != -1) {
@@ -65,3 +67,7 @@ usage:
     debug(DBG_ERR, "Usage:\n%s [ -c ] configfile", argv[0]);
     exit(1);
 }
+
+/* Local Variables: */
+/* c-file-style: "stroustrup" */
+/* End: */