Add config option to specify keyd socket directory

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index e3085e1996be9e1fa6ec7690ea8f70fdf7e10951..02ccf2db8f4aa34e85e29217a196b397193892e6 100644 (file)
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -45,6 +45,7 @@ struct onak_config config = {
        NULL,                   /* logfile */
 
        false,                  /* use_keyd */
+       ".",                    /* sock_dir */
 
        /*
         * Options for directory backends.
@@ -118,7 +119,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 +209,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 {