Use full key id in key id retrieval test + add separate short key id test

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index ec61cd2332b1eea0805f9052cf0b3a96e7b37117..e3085e1996be9e1fa6ec7690ea8f70fdf7e10951 100644 (file)
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -28,7 +28,7 @@
 #include "log.h"
 #include "onak-conf.h"
 
-extern struct dbfuncs DBFUNCS;
+extern struct onak_dbctx *DBINIT(bool readonly);
 
 /*
  *     config - Runtime configuration for onak.
@@ -65,7 +65,7 @@ struct onak_config config = {
        NULL,                   /* db_backend */
        NULL,                   /* backends_dir */
 
-       &DBFUNCS,               /* Default dbfuncs struct */
+       DBINIT,                 /* Default db initialisation function */
 
        true,                   /* Check packet sig hashes */
 };
@@ -92,10 +92,28 @@ void readconfig(const char *configfile) {
        FILE *conffile;
        char  curline[1024];
        int   i;
+       char *dir, *conf;
+       size_t len;
 
        curline[1023] = 0;
        if (configfile == NULL) {
-               conffile = fopen(CONFIGFILE, "r");
+               conffile = NULL;
+               if ((dir = getenv("XDG_CONFIG_HOME")) != NULL) {
+                       len = strlen(dir) + 1 + 9 + 1; /* dir + / + onak.conf + NUL */
+                       conf = malloc(len);
+                       snprintf(conf, len, "%s/onak.conf", dir);
+                       conffile = fopen(conf, "r");
+                       free(conf);
+               } else if ((dir = getenv("HOME")) != NULL) {
+                       len = strlen(dir) + 18 + 1; /* dir + /.config/onak.conf + NUL */
+                       conf = malloc(len);
+                       snprintf(conf, len, "%s/.config/onak.conf", dir);
+                       conffile = fopen(conf, "r");
+                       free(conf);
+               }
+               if (conffile == NULL) {
+                       conffile = fopen(CONFIGFILE, "r");
+               }
        } else {
                conffile = fopen(configfile, "r");
        }