Use /dev/tap0 by default on FreeBSD and NetBSD when using Mode = switch.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 148e13e..4f03db6 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -337,16 +337,9 @@ static void indicator(int a, int b, void *p) {
 static bool keygen(int bits) {
        RSA *rsa_key;
        FILE *f;
-       char *name = NULL;
+       char *name = get_name();
        char *filename;
 
-       get_config_string(lookup_config(config_tree, "Name"), &name);
-
-       if(name && !check_id(name)) {
-               fprintf(stderr, "Invalid name for myself!\n");
-               return false;
-       }
-
        fprintf(stderr, "Generating %d bits keys:\n", bits);
        rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
 
@@ -386,8 +379,7 @@ static bool keygen(int bits) {
        PEM_write_RSAPublicKey(f, rsa_key);
        fclose(f);
        free(filename);
-       if(name)
-               free(name);
+       free(name);
 
        return true;
 }