Don't enable -fstack-protector-all.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 0085598..858992c 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -86,10 +86,8 @@ bool node_read_ecdsa_public_key(node_t *n) {
 
        fp = fopen(pubname, "r");
 
-       if(!fp) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA public key file `%s': %s", pubname, strerror(errno));
+       if(!fp)
                goto exit;
-       }
 
        n->ecdsa = ecdsa_read_pem_public_key(fp);
        fclose(fp);
@@ -673,10 +671,14 @@ static bool setup_myself(void) {
 
        myself->options |= PROT_MINOR << 24;
 
-       get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
-
-       if(experimental && !read_ecdsa_private_key())
-               return false;
+       if(!get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental)) {
+               experimental = read_ecdsa_private_key();
+               if(!experimental)
+                       logger(DEBUG_ALWAYS, LOG_WARNING, "Support for SPTPS disabled.");
+       } else {
+               if(experimental && !read_ecdsa_private_key())
+                       return false;
+       }
 
        if(!read_rsa_private_key())
                return false;