projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix db4 backend - we weren't actually providing a suitable dbfuncs struct.
[onak.git]
/
onak-conf.c
diff --git
a/onak-conf.c
b/onak-conf.c
index f97197cf72694c58167d53ade6b1bb2e205f78f8..70990f87b174ab5565be42d9cf54088265bae512 100644
(file)
--- a/
onak-conf.c
+++ b/
onak-conf.c
@@
-17,6
+17,8
@@
#include "log.h"
#include "onak-conf.h"
#include "log.h"
#include "onak-conf.h"
+extern struct dbfuncs DBFUNCS;
+
/*
* config - Runtime configuration for onak.
*
/*
* config - Runtime configuration for onak.
*
@@
-43,6
+45,14
@@
struct onak_config config = {
NULL, /* pg_dbname */
NULL, /* pg_dbuser */
NULL, /* pg_dbpass */
NULL, /* pg_dbname */
NULL, /* pg_dbuser */
NULL, /* pg_dbpass */
+
+ /*
+ * Options for dynamic backends.
+ */
+ NULL, /* db_backend */
+ NULL, /* backends_dir */
+
+ &DBFUNCS, /* Default dbfuncs struct */
};
void readconfig(const char *configfile) {
};
void readconfig(const char *configfile) {
@@
-127,6
+137,10
@@
void readconfig(const char *configfile) {
/*
* Not applicable; ignored for compatibility with pksd.
*/
/*
* 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 {
logthing(LOGTHING_ERROR,
"Unknown config line: %s", curline);
} else {
logthing(LOGTHING_ERROR,
"Unknown config line: %s", curline);
@@
-182,4
+196,12
@@
void cleanupconfig(void) {
free(config.logfile);
config.logfile = NULL;
}
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;
+ }
}
}