Bump Debian Standards-Version to 3.9.6.0

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index a29a58bfc7979df54957028a24cbc5b8734c72e9..ccad3c5a78f800dde720e8562456fab44d119a19 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 */
 };
@@ -118,7 +118,12 @@ void readconfig(const char *configfile) {
                conffile = fopen(configfile, "r");
        }
        if (conffile != NULL) {
-               fgets(curline, 1023, conffile);
+               if (!fgets(curline, 1023, conffile)) {
+                       logthing(LOGTHING_CRITICAL,
+                               "Problem reading configuration file.");
+                       fclose(conffile);
+                       return;
+               }
 
                while (!feof(conffile)) {
                        for (i = strlen(curline) - 1;
@@ -203,7 +208,12 @@ void readconfig(const char *configfile) {
                                "Unknown config line: %s", curline);
                }
 
-                       fgets(curline, 1023, conffile);
+                       if (!fgets(curline, 1023, conffile) &&
+                                       !feof(conffile)) {
+                               logthing(LOGTHING_CRITICAL,
+                                       "Problem reading configuration file.");
+                               break;
+                       }
                }
                fclose(conffile);
        } else {