]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
ip: Preserve original portocol family in batch mode
authorAntti Paila <antti.paila@gmail.com>
Fri, 31 Jul 2015 10:55:31 +0000 (13:55 +0300)
committerStephen Hemminger <shemming@brocade.com>
Sat, 1 Aug 2015 01:10:14 +0000 (18:10 -0700)
Reset the 'preferred_family' global variable
to its initially set value before each batch
file command is processed.

Signed-off-by: Antti Paila <antti.paila@gmail.com>
ip/ip.c

diff --git a/ip/ip.c b/ip/ip.c
index 3d993b9e4967da8a80b8993d3476916abbd742b1..0cf743f71119737f692d745d3499d3b8060a370b 100644 (file)
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -118,6 +118,7 @@ static int batch(const char *name)
        char *line = NULL;
        size_t len = 0;
        int ret = EXIT_SUCCESS;
+       int orig_family = preferred_family;
 
        batch_mode = 1;
 
@@ -140,6 +141,8 @@ static int batch(const char *name)
                char *largv[100];
                int largc;
 
+               preferred_family = orig_family;
+
                largc = makeargs(line, largv, 100);
                if (largc == 0)
                        continue;       /* blank line */