+/* Copyright (c) 2007-2008, UNINETT AS
+ * Copyright (c) 2011-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
+
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include "debug.h"
#include "gconfig.h"
-void listconfig(struct gconffile **cf, char *block, int compact) {
+int listconfig(struct gconffile **cf, char *block, int compact) {
char *opt = NULL, *val = NULL;
int conftype;
for (;;) {
free(opt);
free(val);
- getconfigline(cf, block, &opt, &val, &conftype);
- if (!opt)
- return;
+ if (!getconfigline(cf, block, &opt, &val, &conftype))
+ return -1;
+ if (!opt)
+ return 0; /* Success. */
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;
}
break;
case CONF_CBK:
printf("%s %s {%s", opt, val, compact ? "" : "\n");
- listconfig(cf, val, compact);
+ if (listconfig(cf, val, compact))
+ return -1;
printf("}\n");
break;
default:
printf("Unsupported config type\n");
+ return -1;
}
}
+
+ return 0; /* Success. */
}
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) {
goto usage;
cfs = openconfigfile(argv[optind]);
- listconfig(&cfs, NULL, compact);
- return 0;
+ return listconfig(&cfs, NULL, compact);
usage:
debug(DBG_ERR, "Usage:\n%s [ -c ] configfile", argv[0]);
exit(1);
}
+
+/* Local Variables: */
+/* c-file-style: "stroustrup" */
+/* End: */