Merge branch 'master' into 1.1

[meshlink] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index 814800e8969c6c62c7060f26786789ef8fb63671..92796b6bea42ed7b52e7f99d3625f2c4acacf4e7 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -440,7 +440,7 @@ int main(int argc, char *argv[], char *envp[]) {
        // First handle commands that don't involve connecting to a running tinc daemon.
 
        if(!strcasecmp(argv[optind], "generate-keys")) {
-               return !keygen(optind > argc ? atoi(argv[optind + 1]) : 1024);
+               return !keygen(optind > argc ? atoi(argv[optind + 1]) : 2048);
        }
 
        if(!strcasecmp(argv[optind], "start")) {