j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Don't complain about garbage if we skipped importing a host file.

Browse source
This commit is contained in:
Guus Sliepen 2013-01-14 12:59:17 +01:00
parent c90c431bc9
commit cad86108f3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/tincctl.c
View file

@ -1857,6 +1857,8 @@ static int cmd_import(int argc, char *argv[]) {
while(fgets(buf, sizeof buf, in)) { while(fgets(buf, sizeof buf, in)) {
if(sscanf(buf, "Name = %s", name) == 1) { if(sscanf(buf, "Name = %s", name) == 1) {
firstline = false;
if(!check_id(name)) { if(!check_id(name)) {
fprintf(stderr, "Invalid Name in input!\n"); fprintf(stderr, "Invalid Name in input!\n");
return 1; return 1;
@ -1881,7 +1883,6 @@ static int cmd_import(int argc, char *argv[]) {
} }
count++; count++;
firstline = false;
continue; continue;
} else if(firstline) { } else if(firstline) {
fprintf(stderr, "Junk at the beginning of the input, ignoring.\n"); fprintf(stderr, "Junk at the beginning of the input, ignoring.\n");