Handle host config files without a public key.

[meshlink] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 65ff2272ef68e50e293ad23cda5d4045315b3d7e..79db093eeceefafa66fa193d665d4e8c3feb8861 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -580,6 +580,12 @@ bool config_write_file(meshlink_handle_t *mesh, FILE *f, const config_t *config,
                return false;
        }
 
+       if(fflush(f)) {
+               logger(mesh, MESHLINK_ERROR, "Failed to flush file: %s", strerror(errno));
+               meshlink_errno = MESHLINK_ESTORAGE;
+               return false;
+       }
+
        if(fsync(fileno(f))) {
                logger(mesh, MESHLINK_ERROR, "Failed to sync file: %s\n", strerror(errno));
                return false;
@@ -704,12 +710,6 @@ bool config_write(meshlink_handle_t *mesh, const char *conf_subdir, const char *
                return false;
        }
 
-       if(fsync(fileno(f))) {
-               logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", tmp_path, strerror(errno));
-               fclose(f);
-               return false;
-       }
-
        if(fclose(f)) {
                logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
                return false;
@@ -780,12 +780,6 @@ bool main_config_write(meshlink_handle_t *mesh, const char *conf_subdir, const c
                return false;
        }
 
-       if(fsync(fileno(f))) {
-               logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", tmp_path, strerror(errno));
-               fclose(f);
-               return false;
-       }
-
        if(rename(tmp_path, path)) {
                logger(mesh, MESHLINK_ERROR, "Failed to rename `%s' to `%s': %s", tmp_path, path, strerror(errno));
                fclose(f);
@@ -843,7 +837,7 @@ bool invitation_read(meshlink_handle_t *mesh, const char *conf_subdir, const cha
                return false;
        }
 
-       if(mesh->loop.now.tv_sec > st.st_mtime + mesh->invitation_timeout) {
+       if(mesh->loop.now.tv_sec >= st.st_mtime + mesh->invitation_timeout) {
                logger(mesh, MESHLINK_ERROR, "Peer tried to use an outdated invitation file %s\n", name);
                fclose(f);
                unlink(used_path);
@@ -889,12 +883,6 @@ bool invitation_write(meshlink_handle_t *mesh, const char *conf_subdir, const ch
                return false;
        }
 
-       if(fsync(fileno(f))) {
-               logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
-               fclose(f);
-               return false;
-       }
-
        if(fclose(f)) {
                logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
                return false;