swanctl: Avoid conflict between --uninstall and --uri

Also update the man page (including the -V change in the previous commit
and documenting the global options).

diff --git a/src/swanctl/commands/install.c b/src/swanctl/commands/install.c
index 61f2890ed3a015f3982add327e9314521bbb439f..0423a355a355a34e544d9afd99ba3294dae16b24 100644 (file)
--- a/src/swanctl/commands/install.c
+++ b/src/swanctl/commands/install.c
@@ -105,7 +105,7 @@ static int install(vici_conn_t *conn)
 static void __attribute__ ((constructor))reg_uninstall()
 {
        command_register((command_t) {
-               uninstall, 'u', "uninstall", "uninstall a trap or shunt policy",
+               uninstall, 'U', "uninstall", "uninstall a trap or shunt policy",
                {"--child <name> [--ike <name>] [--raw|--pretty]"},
                {
                        {"help",                'h', 0, "show usage information"},

diff --git a/src/swanctl/swanctl.8.in b/src/swanctl/swanctl.8.in
index c80d7ce8afced1b44b3fd3e4e996a624db70f0dc..b7747286fdf63108302f13d277f77946273bc3a3 100644 (file)
--- a/src/swanctl/swanctl.8.in
+++ b/src/swanctl/swanctl.8.in
@@ -49,7 +49,7 @@ redirect an IKE_SA
 .B "\-p, \-\-install"
 install a trap or shunt policy
 .TP
-.B "\-u, \-\-uninstall"
+.B "\-U, \-\-uninstall"
 uninstall a trap or shunt policy
 .TP
 .B "\-l, \-\-list\-sas"
@@ -100,10 +100,20 @@ flush cached certificates
 .B "\-r, \-\-reload\-settings"
 reload strongswan.conf(5) configuration
 .TP
-.B "\-v, \-\-version"
+.B "\-V, \-\-version"
 show daemon version information
 .TP
 .B "\-h, \-\-help"
-show usage information
+show usage, version and plugin information
+.SH GENERAL OPTIONS
+.TP
+.B "\-v, \-\-debug"
+set debug level, default: 1
+.TP
+.B "\-+, \-\-options"
+read command line options from file
+.TP
+.B "\-u, \-\-uri"
+service URI to connect to
 .SH SEE ALSO
 .BR swanctl.conf (5)