From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 23 Feb 2026 10:03:52 +0000 (+0100)
Subject: swanctl: Avoid conflict between --uninstall and --uri
X-Git-Tag: 6.0.5dr1~9
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=357296a4d464a9a4264cb0bb2fd8cdb2ae2de6fc;p=thirdparty%2Fstrongswan.git

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 61f2890ed3..0423a355a3 100644
--- 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 c80d7ce8af..b7747286fd 100644
--- 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)