iproute2: Fix batch-mode for mrules.

The do_multirule logic was broken in batch mode because
it expected the preferred_family to be AF_INET or AF_INET6,
but it then assigned it to RTNL_FAMILY_IPMR or RTNL_FAMILY_IP6MR.
So, the next iteration of the batch processing, it failed
the check for AF_INET or AF_INET6.

Signed-off-by: Ben Greear <greearb@candelatech.com>

diff --git a/ip/iprule.c b/ip/iprule.c
index 9c8c6ef6ec31098342a51d2dfcbdf835ea443d05..d3b97e2ab590f15b4cf69cd0770d657e9e90c4a9 100644 (file)
--- a/ip/iprule.c
+++ b/ip/iprule.c
@@ -446,8 +446,12 @@ int do_multirule(int argc, char **argv)
        case AF_INET6:
                preferred_family = RTNL_FAMILY_IP6MR;
                break;
+       case RTNL_FAMILY_IPMR:
+       case RTNL_FAMILY_IP6MR:
+               break;
        default:
-               fprintf(stderr, "Multicast rules are only supported for IPv4/IPv6\n");
+               fprintf(stderr, "Multicast rules are only supported for IPv4/IPv6, was: %i\n",
+                       preferred_family);
                exit(-1);
        }