X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=bbe26a1470f91cde0ce631312225c93f551d86f9;hb=97b2d68b9debdeaec828c9000bcca60a4a3d5817;hp=93a9320b4a3e165db6dbdd3e8ca1691b255d01db;hpb=34b03028378025ad22c8d29f70e81109cee690c2;p=onak.git diff --git a/onak-conf.c b/onak-conf.c index 93a9320..bbe26a1 100644 --- a/onak-conf.c +++ b/onak-conf.c @@ -4,6 +4,8 @@ * Jonathan McDowell * * Copyright 2002 Project Purple + * + * $Id: onak-conf.c,v 1.7 2003/06/04 20:57:11 noodles Exp $ */ #include @@ -12,6 +14,7 @@ #include #include "ll.h" +#include "log.h" #include "onak-conf.h" /* @@ -26,6 +29,7 @@ struct onak_config config = { NULL, /* adminemail */ NULL, /* mta */ NULL, /* syncsites */ + NULL, /* logfile */ /* * Options for directory backends. @@ -104,6 +108,8 @@ void readconfig(void) { } else if (!strncmp("syncsite ", curline, 9)) { config.syncsites = lladd(config.syncsites, strdup(&curline[9])); + } else if (!strncmp("logfile ", curline, 8)) { + config.logfile = strdup(&curline[8]); } else if (!strncmp("this_site ", curline, 10)) { config.thissite = strdup(&curline[10]); } else if (!strncmp("socket_name ", curline, 12) || @@ -114,14 +120,16 @@ void readconfig(void) { * Not applicable; ignored for compatibility with pksd. */ } else { - fprintf(stderr, "Unknown config line: %s\n", curline); + logthing(LOGTHING_ERROR, + "Unknown config line: %s", curline); } fgets(curline, 1023, conffile); } fclose(conffile); } else { - fprintf(stderr, "Couldn't open config file; using defaults.\n"); + logthing(LOGTHING_NOTICE, + "Couldn't open config file; using defaults."); } } @@ -162,4 +170,8 @@ void cleanupconfig(void) { llfree(config.syncsites, free); config.syncsites = NULL; } + if (config.logfile != NULL) { + free(config.logfile); + config.logfile = NULL; + } }