Rename tinc.texi to meshlink.texi.

[meshlink] / src / invitation.c

diff --git a/src/invitation.c b/src/invitation.c
index 3e05d8c7d7c95cbee46ceb1fc0247a6cdb3b49be..6c0b0afb825f75cd7846c42a2a715aa329eb8f45 100644 (file)
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -1,6 +1,6 @@
 /*
     invitation.c -- Create and accept invitations
-    Copyright (C) 2013-2014 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,9 +24,7 @@
 #include "ecdsa.h"
 #include "ecdsagen.h"
 #include "invitation.h"
-#include "names.h"
 #include "netutl.h"
-#include "rsagen.h"
 #include "sptps.h"
 #include "tincctl.h"
 #include "utils.h"
@@ -546,13 +544,6 @@ static bool finalize_join(void) {
        char temp_netname[32];
 
 make_names:
-       if(!confbasegiven) {
-               free(confbase);
-               confbase = NULL;
-       }
-
-       make_names();
-
        free(tinc_conf);
        free(hosts_dir);
 
@@ -720,19 +711,7 @@ make_names:
        sptps_send_record(&sptps, 1, b64key, strlen(b64key));
        free(b64key);
 
-
-       rsa_t *rsa = rsa_generate(2048, 0x1001);
-       xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
-       f = fopenmask(filename, "w", 0600);
-
-       rsa_write_pem_private_key(rsa, f);
-       fclose(f);
-
-       rsa_write_pem_public_key(rsa, fh);
-       fclose(fh);
-
        ecdsa_free(key);
-       rsa_free(rsa);
 
        check_port(name);
 
@@ -758,7 +737,6 @@ ask_netname:
 
                free(newbase);
                netname = line;
-               make_names();
        }
 
        fprintf(stderr, "Configuration stored in: %s\n", confbase);
@@ -819,11 +797,6 @@ int cmd_join(int argc, char *argv[]) {
        }
 
        // Make sure confbase exists and is accessible.
-       if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
-               fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
-               return 1;
-       }
-
        if(mkdir(confbase, 0777) && errno != EEXIST) {
                fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
                return 1;