X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/ec6d9d2d119c9b215103c13bcc5b9b44bd24b997..2f1e9ae7c4d8f893de7ffe03fcb36b905ffe0f96:/onak-conf.c diff --git a/onak-conf.c b/onak-conf.c index 0958502..5f07e02 100644 --- a/onak-conf.c +++ b/onak-conf.c @@ -17,6 +17,8 @@ #include "log.h" #include "onak-conf.h" +extern struct dbfuncs DBFUNCS; + /* * config - Runtime configuration for onak. * @@ -31,6 +33,8 @@ struct onak_config config = { NULL, /* syncsites */ NULL, /* logfile */ + false, /* use_keyd */ + /* * Options for directory backends. */ @@ -49,8 +53,28 @@ struct onak_config config = { */ NULL, /* db_backend */ NULL, /* backends_dir */ + + &DBFUNCS, /* Default dbfuncs struct */ }; +bool parsebool(char *str, bool fallback) +{ + if (!strcasecmp(str, "false") || !strcasecmp(str, "no") || + !strcasecmp(str, "0")) { + return false; + } else if (!strcasecmp(str, "true") || !strcasecmp(str, "yes") || + !strcasecmp(str, "1")) { + return true; + } else { + logthing(LOGTHING_CRITICAL, + "Couldn't parse %s as a boolean config variable, " + "returning fallback of '%s'.", + str, + fallback ? "true" : "false"); + return fallback; + } +} + void readconfig(const char *configfile) { FILE *conffile; char curline[1024]; @@ -137,6 +161,9 @@ void readconfig(const char *configfile) { config.db_backend = strdup(&curline[11]); } else if (!strncmp("backends_dir ", curline, 13)) { config.backends_dir = strdup(&curline[13]); + } else if (!strncmp("use_keyd ", curline, 9)) { + config.use_keyd = parsebool(&curline[9], + config.use_keyd); } else { logthing(LOGTHING_ERROR, "Unknown config line: %s", curline);