From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 13 Nov 2017 09:09:05 +0000 (+0100)
Subject: swanctl: Add check for conflicting short options
X-Git-Tag: 5.6.1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c87b16d256f4e0a214b68935e7de8eee816f4fb7;p=thirdparty%2Fstrongswan.git

swanctl: Add check for conflicting short options
---

diff --git a/src/swanctl/command.c b/src/swanctl/command.c
index 7f65d2b0e3..225dff6176 100644
--- a/src/swanctl/command.c
+++ b/src/swanctl/command.c
@@ -147,6 +147,15 @@ void command_register(command_t command)
 				"MAX_COMMANDS\n");
 		return;
 	}
+	for (i = 0; i < MAX_COMMANDS && cmds[i].cmd; i++)
+	{
+		if (cmds[i].op == command.op)
+		{
+			fprintf(stderr, "unable to register command --%s, short option "
+					"conflicts with --%s\n", command.cmd, cmds[i].cmd);
+			return;
+		}
+	}
 
 	cmds[registered] = command;
 	/* append default options, but not to --help */