pluto: Added --debug-kernel as alias for --debug-klips.
authorTobias Brunner <tobias@strongswan.org>
Mon, 16 Aug 2010 12:59:23 +0000 (14:59 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 2 Sep 2010 17:04:24 +0000 (19:04 +0200)
src/pluto/pluto.8
src/pluto/plutomain.c
src/whack/whack.c

index b80d137..636ad63 100644 (file)
@@ -37,7 +37,7 @@ ipsec pluto
 [\-\-debug\(hyemitting]
 [\-\-debug\(hycontrol]
 [\-\-debug\(hylifecycle]
-[\-\-debug\(hyklips]
+[\-\-debug\(hykernel]
 [\-\-debug\(hydns]
 [\-\-debug\(hyoppo]
 [\-\-debug\(hyprivate]
@@ -209,7 +209,7 @@ ipsec whack
 [\-\-debug\(hyemitting]
 [\-\-debug\(hycontrol]
 [\-\-debug\(hylifecycle]
-[\-\-debug\(hyklips]
+[\-\-debug\(hykernel]
 [\-\-debug\(hydns]
 [\-\-debug\(hyoppo]
 [\-\-debug\(hyprivate]
index b3649e3..e4aad76 100644 (file)
@@ -130,7 +130,7 @@ static void usage(const char *mess)
                        " \\\n\t"
                        "[--debug-control]"
                        " [--debug-lifecycle]"
-                       " [--debug-klips]"
+                       " [--debug-kernel]"
                        " [--debug-dns]"
                        " \\\n\t"
                        "[--debug-oppo]"
@@ -339,6 +339,7 @@ int main(int argc, char **argv)
                        { "debug-control", no_argument, NULL, DBG_CONTROL + DBG_OFFSET },
                        { "debug-lifecycle", no_argument, NULL, DBG_LIFECYCLE + DBG_OFFSET },
                        { "debug-klips", no_argument, NULL, DBG_KERNEL + DBG_OFFSET },
+                       { "debug-kernel", no_argument, NULL, DBG_KERNEL + DBG_OFFSET },
                        { "debug-dns", no_argument, NULL, DBG_DNS + DBG_OFFSET },
                        { "debug-oppo", no_argument, NULL, DBG_OPPO + DBG_OFFSET },
                        { "debug-controlmore", no_argument, NULL, DBG_CONTROLMORE + DBG_OFFSET },
index 643e4be..c5fe3b4 100644 (file)
@@ -471,7 +471,7 @@ enum {
        DBGOPT_EMITTING,    /* same order as DBG_* */
        DBGOPT_CONTROL,     /* same order as DBG_* */
        DBGOPT_LIFECYCLE,   /* same order as DBG_* */
-       DBGOPT_KLIPS,       /* same order as DBG_* */
+       DBGOPT_KERNEL,      /* same order as DBG_* */
        DBGOPT_DNS,         /* same order as DBG_* */
        DBGOPT_NATT,        /* same order as DBG_* */
        DBGOPT_OPPO,        /* same order as DBG_* */
@@ -659,7 +659,8 @@ static const struct option long_opts[] = {
        { "debug-emitting", no_argument, NULL, DBGOPT_EMITTING + OO },
        { "debug-control", no_argument, NULL, DBGOPT_CONTROL + OO },
        { "debug-lifecycle", no_argument, NULL, DBGOPT_LIFECYCLE + OO },
-       { "debug-klips", no_argument, NULL, DBGOPT_KLIPS + OO },
+       { "debug-klips", no_argument, NULL, DBGOPT_KERNEL + OO },
+       { "debug-kernel", no_argument, NULL, DBGOPT_KERNEL + OO },
        { "debug-dns", no_argument, NULL, DBGOPT_DNS + OO },
        { "debug-natt", no_argument, NULL, DBGOPT_NATT + OO },
        { "debug-oppo", no_argument, NULL, DBGOPT_OPPO + OO },
@@ -1595,7 +1596,7 @@ int main(int argc, char **argv)
                case DBGOPT_EMITTING:   /* --debug-emitting */
                case DBGOPT_CONTROL:    /* --debug-control */
                case DBGOPT_LIFECYCLE:  /* --debug-lifecycle */
-               case DBGOPT_KLIPS:      /* --debug-klips */
+               case DBGOPT_KERNEL:     /* --debug-kernel, --debug-klips */
                case DBGOPT_DNS:        /* --debug-dns */
                case DBGOPT_NATT:       /* --debug-natt */
                case DBGOPT_OPPO:       /* --debug-oppo */