]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
ipl2tp: Print help even on systems without l2tp support
authorPhil Sutter <phil@nwl.cc>
Wed, 24 Feb 2016 08:12:47 +0000 (09:12 +0100)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 2 Mar 2016 17:33:20 +0000 (09:33 -0800)
Signed-off-by: Phil Sutter <phil@nwl.cc>
ip/ipl2tp.c

index f050880eef02aa024d8bae94ab1fa1fb290c0bd9..3e3b21ddfb7fe66e2ae039a5c6d9f682026f9e87 100644 (file)
@@ -720,6 +720,9 @@ static int do_show(int argc, char **argv)
 
 int do_ipl2tp(int argc, char **argv)
 {
+       if (argc < 1 || !matches(*argv, "help"))
+               usage();
+
        if (genl_family < 0) {
                if (rtnl_open_byproto(&genl_rth, 0, NETLINK_GENERIC) < 0) {
                        fprintf(stderr, "Cannot open generic netlink socket\n");
@@ -731,9 +734,6 @@ int do_ipl2tp(int argc, char **argv)
                        exit(1);
        }
 
-       if (argc < 1)
-               usage();
-
        if (matches(*argv, "add") == 0)
                return do_add(argc-1, argv+1);
        if (matches(*argv, "delete") == 0)
@@ -742,8 +742,6 @@ int do_ipl2tp(int argc, char **argv)
            matches(*argv, "lst") == 0 ||
            matches(*argv, "list") == 0)
                return do_show(argc-1, argv+1);
-       if (matches(*argv, "help") == 0)
-               usage();
 
        fprintf(stderr, "Command \"%s\" is unknown, try \"ip l2tp help\".\n", *argv);
        exit(-1);