]> git.meshlink.io Git - meshlink/commitdiff
Don't complain about garbage if we skipped importing a host file.
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 14 Jan 2013 11:59:17 +0000 (12:59 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 14 Jan 2013 11:59:17 +0000 (12:59 +0100)
src/tincctl.c

index dd0bbcc220677d97bfbc1f83cacb677e54d18ed9..3b006605317f47655aaece03fccee8b20390767a 100644 (file)
@@ -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");