X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=9fc749bcfc9fb76934f9f47303ec3336976269fa;hb=ed1d0878afe53032a4b63e87afd4a435015cf5de;hp=5f2b135103f2b761313aabe3f1c66c5228617d8e;hpb=f0e7e6b03e34e69cac5b01a2d943ad3b9b59d36c;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 5f2b1351..9fc749bc 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -246,7 +246,7 @@ static void disable_old_keys(const char *filename, const char *what) {
 
 	while(fgets(buf, sizeof buf, r)) {
 		if(!block && !strncmp(buf, "-----BEGIN ", 11)) {
-			if((strstr(buf, " RSA ") && strstr(what, "RSA"))) {
+			if((strstr(buf, " ED25519 ") && strstr(what, "Ed25519")) || (strstr(buf, " RSA ") && strstr(what, "RSA"))) {
 				disabled = true;
 				block = true;
 			}
@@ -1613,7 +1613,7 @@ static int cmd_config(int argc, char *argv[]) {
 	if(action < -1) {
 		if(!found)
 			fprintf(stderr, "No matching configuration variables found.\n");
-		return 0;
+		return 1;
 	}
 
 	// Make sure we wrote everything...
@@ -1626,7 +1626,7 @@ static int cmd_config(int argc, char *argv[]) {
 	if(action < 0 && !removed) {
 		remove(tmpfile);
 		fprintf(stderr, "No configuration variables deleted.\n");
-		return *value != 0;
+		return 1;
 	}
 
 	// Replace the configuration file with the new one