projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preserve IPv6 scope_id in edges.
[tinc]
/
src
/
invitation.c
diff --git
a/src/invitation.c
b/src/invitation.c
index
35e8e49
..
08afe78
100644
(file)
--- a/
src/invitation.c
+++ b/
src/invitation.c
@@
-392,7
+392,7
@@
int cmd_invite(int argc, char *argv[]) {
// Fill in the details.
fprintf(f, "Name = %s\n", argv[1]);
// Fill in the details.
fprintf(f, "Name = %s\n", argv[1]);
- if(
netname
)
+ if(
check_netname(netname, true)
)
fprintf(f, "NetName = %s\n", netname);
fprintf(f, "ConnectTo = %s\n", myname);
fprintf(f, "NetName = %s\n", netname);
fprintf(f, "ConnectTo = %s\n", myname);
@@
-541,12
+541,17
@@
static bool finalize_join(void) {
}
if(!check_id(name)) {
}
if(!check_id(name)) {
- fprintf(stderr, "Invalid Name found in invitation
: %s!\n", name
);
+ fprintf(stderr, "Invalid Name found in invitation
!\n"
);
return false;
}
return false;
}
- if(!netname)
+ if(!netname)
{
netname = grep(data, "NetName");
netname = grep(data, "NetName");
+ if(netname && !check_netname(netname, true)) {
+ fprintf(stderr, "Unsafe NetName found in invitation!\n");
+ return false;
+ }
+ }
bool ask_netname = false;
char temp_netname[32];
bool ask_netname = false;
char temp_netname[32];