X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/39b352321e40d267678d02d13ab6de1e1e4958c6..bccee9f66efda51a5e900ea57b5a130f2e99faf1:/onak-conf.c diff --git a/onak-conf.c b/onak-conf.c index f97197c..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. */ @@ -43,8 +47,34 @@ struct onak_config config = { NULL, /* pg_dbname */ NULL, /* pg_dbuser */ NULL, /* pg_dbpass */ + + /* + * Options for dynamic backends. + */ + 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]; @@ -127,6 +157,13 @@ void readconfig(const char *configfile) { /* * Not applicable; ignored for compatibility with pksd. */ + } else if (!strncmp("db_backend ", curline, 11)) { + 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); @@ -182,4 +219,12 @@ void cleanupconfig(void) { free(config.logfile); config.logfile = NULL; } + if (config.db_backend != NULL) { + free(config.db_backend); + config.db_backend = NULL; + } + if (config.backends_dir != NULL) { + free(config.backends_dir); + config.backends_dir = NULL; + } }