[PATCH] conf: Fix getopt_long() optstring for current semantics of -D, -S, -p

[Stefano Brivio <sbrivio@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]

Declaring them as required_argument in the longopts array specifies
validation, but doesn't affect how optind is increased after parsing
their values.

Currently, passing one of these options as last option causes pasta
to handle their own values as path to a binary to execute.

Fixes: aae2a9bbf7d1 ("conf: Use "-D none" and "-S none" instead of missing empty option arguments")
Fixes: bf95322fc1ef ("conf: Make the argument to --pcap option mandatory")
Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>
---
 conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf.c b/conf.c
index e6d1c62..2edb4ae 100644
--- a/conf.c
+++ b/conf.c
@@ -1094,9 +1094,9 @@ void conf(struct ctx *c, int argc, char **argv)
 		const char *optstring;
 
 		if (c->mode == MODE_PASST)
-			optstring = "dqfehs:p::P:m:a:n:M:g:i:D::S::46t:u:";
+			optstring = "dqfehs:p:P:m:a:n:M:g:i:D:S:46t:u:";
 		else
-			optstring = "dqfehI:p::P:m:a:n:M:g:i:D::S::46t:u:T:U:";
+			optstring = "dqfehI:p:P:m:a:n:M:g:i:D:S:46t:u:T:U:";
 
 		name = getopt_long(argc, argv, optstring, options, NULL);
 
-- 
@@ -1094,9 +1094,9 @@ void conf(struct ctx *c, int argc, char **argv)
 		const char *optstring;
 
 		if (c->mode == MODE_PASST)
-			optstring = "dqfehs:p::P:m:a:n:M:g:i:D::S::46t:u:";
+			optstring = "dqfehs:p:P:m:a:n:M:g:i:D:S:46t:u:";
 		else
-			optstring = "dqfehI:p::P:m:a:n:M:g:i:D::S::46t:u:T:U:";
+			optstring = "dqfehI:p:P:m:a:n:M:g:i:D:S:46t:u:T:U:";
 
 		name = getopt_long(argc, argv, optstring, options, NULL);
 
-- 
2.35.1