Resolve the local host name before generating the invitation file.

[tinc] / src / invitation.c

diff --git a/src/invitation.c b/src/invitation.c
index e5085ce..550fb5d 100644 (file)
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -32,12 +32,6 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#ifdef HAVE_MINGW
-#define SCRIPTEXTENSION ".bat"
-#else
-#define SCRIPTEXTENSION ""
-#endif
-
 int addressfamily = AF_UNSPEC;
 
 char *get_my_hostname() {
@@ -362,6 +356,9 @@ int cmd_invite(int argc, char *argv[]) {
        if(!f)
                abort();
 
+       // Get the local address
+       char *address = get_my_hostname();
+
        // Fill in the details.
        fprintf(f, "Name = %s\n", argv[1]);
        if(netname)
@@ -376,7 +373,6 @@ int cmd_invite(int argc, char *argv[]) {
        fclose(f);
 
        // Create an URL from the local address, key hash and cookie
-       char *address = get_my_hostname();
        printf("%s/%s%s\n", address, hash, cookie);
        free(filename);
        free(address);
@@ -519,12 +515,12 @@ make_names:
                goto make_names;
        }       
 
-       if(mkdir(confbase, 0755) && errno != EEXIST) {
+       if(mkdir(confbase, 0777) && errno != EEXIST) {
                fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
                return false;
        }
 
-       if(mkdir(hosts_dir, 0755) && errno != EEXIST) {
+       if(mkdir(hosts_dir, 0777) && errno != EEXIST) {
                fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
                return false;
        }
@@ -652,12 +648,7 @@ make_names:
                return false;
 
        xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
-       f = fopen(filename, "w");
-
-#ifdef HAVE_FCHMOD
-       /* Make it unreadable for others. */
-       fchmod(fileno(f), 0600);
-#endif
+       f = fopenmask(filename, "w", 0600);
 
        if(!ecdsa_write_pem_private_key(key, f)) {
                fprintf(stderr, "Error writing private key!\n");
@@ -676,12 +667,7 @@ make_names:
 
        rsa_t *rsa = rsa_generate(2048, 0x1001);
        xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
-       f = fopen(filename, "w");
-
-#ifdef HAVE_FCHMOD
-       /* Make it unreadable for others. */
-       fchmod(fileno(f), 0600);
-#endif
+       f = fopenmask(filename, "w", 0600);
 
        rsa_write_pem_private_key(rsa, f);
        fclose(f);
@@ -772,7 +758,12 @@ int cmd_join(int argc, char *argv[]) {
        }
 
        // Make sure confbase exists and is accessible.
-       if(mkdir(confbase, 0755) && errno != EEXIST) {
+       if(strcmp(confdir, confbase) && 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;
        }
@@ -886,7 +877,7 @@ int cmd_join(int argc, char *argv[]) {
                return 1;
        }
 
-       // Check if the hash of the key he have us matches the hash in the URL.
+       // Check if the hash of the key he gave us matches the hash in the URL.
        char *fingerprint = line + 2;
        digest_t *digest = digest_open_by_name("sha256", 18);
        if(!digest)