projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c90c431
)
Don't complain about garbage if we skipped importing a host file.
author
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 14 Jan 2013 11:59:17 +0000
(12:59 +0100)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 14 Jan 2013 11:59:17 +0000
(12:59 +0100)
src/tincctl.c
patch
|
blob
|
history
diff --git
a/src/tincctl.c
b/src/tincctl.c
index
dd0bbcc
..
3b00660
100644
(file)
--- a/
src/tincctl.c
+++ b/
src/tincctl.c
@@
-1857,6
+1857,8
@@
static int cmd_import(int argc, char *argv[]) {
while(fgets(buf, sizeof buf, in)) {
if(sscanf(buf, "Name = %s", name) == 1) {
+ firstline = false;
+
if(!check_id(name)) {
fprintf(stderr, "Invalid Name in input!\n");
return 1;
@@
-1881,7
+1883,6
@@
static int cmd_import(int argc, char *argv[]) {
}
count++;
- firstline = false;
continue;
} else if(firstline) {
fprintf(stderr, "Junk at the beginning of the input, ignoring.\n");