projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo.
[tinc]
/
src
/
invitation.c
diff --git
a/src/invitation.c
b/src/invitation.c
index
cc6cbd4
..
3102e41
100644
(file)
--- a/
src/invitation.c
+++ b/
src/invitation.c
@@
-84,7
+84,7
@@
char *get_my_hostname() {
char *port = NULL;
char *hostport = NULL;
char *name = get_my_name(false);
char *port = NULL;
char *hostport = NULL;
char *name = get_my_name(false);
- char filename[PATH_MAX];
+ char filename[PATH_MAX]
= {0}
;
// Use first Address statement in own host config file
if(check_id(name)) {
// Use first Address statement in own host config file
if(check_id(name)) {
@@
-182,7
+182,7
@@
again:
hostname = xstrdup(line);
save:
hostname = xstrdup(line);
save:
- if(filename) {
+ if(
*
filename) {
FILE *f = fopen(filename, "a");
if(f) {
fprintf(f, "\nAddress = %s\n", hostname);
FILE *f = fopen(filename, "a");
if(f) {
fprintf(f, "\nAddress = %s\n", hostname);
@@
-335,7
+335,11
@@
int cmd_invite(int argc, char *argv[]) {
return 1;
}
chmod(filename, 0600);
return 1;
}
chmod(filename, 0600);
- ecdsa_write_pem_private_key(key, f);
+ if(!ecdsa_write_pem_private_key(key, f)) {
+ fprintf(stderr, "Could not write ECDSA private key\n");
+ fclose(f);
+ return 1;
+ }
fclose(f);
if(connect_tincd(false))
fclose(f);
if(connect_tincd(false))
@@
-551,7
+555,7
@@
make_names:
confbase = NULL;
}
confbase = NULL;
}
- make_names();
+ make_names(
false
);
free(tinc_conf);
free(hosts_dir);
free(tinc_conf);
free(hosts_dir);
@@
-704,6
+708,8
@@
make_names:
snprintf(filename, sizeof filename, "%s" SLASH "ed25519_key.priv", confbase);
f = fopenmask(filename, "w", 0600);
snprintf(filename, sizeof filename, "%s" SLASH "ed25519_key.priv", confbase);
f = fopenmask(filename, "w", 0600);
+ if(!f)
+ return false;
if(!ecdsa_write_pem_private_key(key, f)) {
fprintf(stderr, "Error writing private key!\n");
if(!ecdsa_write_pem_private_key(key, f)) {
fprintf(stderr, "Error writing private key!\n");
@@
-725,10
+731,14
@@
make_names:
snprintf(filename, sizeof filename, "%s" SLASH "rsa_key.priv", confbase);
f = fopenmask(filename, "w", 0600);
snprintf(filename, sizeof filename, "%s" SLASH "rsa_key.priv", confbase);
f = fopenmask(filename, "w", 0600);
- rsa_write_pem_private_key(rsa, f);
+ if(!f || !rsa_write_pem_private_key(rsa, f)) {
+ fprintf(stderr, "Could not write private RSA key\n");
+ } else if(!rsa_write_pem_public_key(rsa, fh)) {
+ fprintf(stderr, "Could not write public RSA key\n");
+ }
+
fclose(f);
fclose(f);
- rsa_write_pem_public_key(rsa, fh);
fclose(fh);
rsa_free(rsa);
fclose(fh);
rsa_free(rsa);
@@
-756,7
+766,7
@@
ask_netname:
}
netname = line;
}
netname = line;
- make_names();
+ make_names(
false
);
}
fprintf(stderr, "Configuration stored in: %s\n", confbase);
}
fprintf(stderr, "Configuration stored in: %s\n", confbase);