Merge branch 'master' into 1.1

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index ecffed9..c033e22 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -229,7 +229,7 @@ static bool read_rsa_private_key(void) {
                result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
                free(n);
                free(d);
-               return true;
+               return result;
        }
 
        /* Else, check for PrivateKeyFile statement and read it */
@@ -916,6 +916,8 @@ static bool setup_myself(void) {
                return false;
        }
 
+       last_config_check = time(NULL);
+
        return true;
 }