summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-08-08 19:53:53 +0000
committerLaurent Bercot <ska@appnovation.com>2023-08-08 19:53:53 +0000
commiteb54ce73503085fca8af147c166b3755a567d930 (patch)
treeaf93a6e439c97169a1cc5135f2e6169cbd3bc4e4 /src
parent04609cc2cf818d6b24f6c41a2fc6018d83ea0fdc (diff)
downloads6-networking-eb54ce73503085fca8af147c166b3755a567d930.tar.xz
Prepare for 2.5.1.4; fix s6-tlsserver -Y|-y
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src')
-rw-r--r--src/tls/s6-tlsserver.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tls/s6-tlsserver.c b/src/tls/s6-tlsserver.c
index e5215f4..533e856 100644
--- a/src/tls/s6-tlsserver.c
+++ b/src/tls/s6-tlsserver.c
@@ -47,6 +47,7 @@ struct options_s
unsigned int ruleswhat : 2 ;
unsigned int flagS : 1 ;
unsigned int flagy : 1 ;
+ unsigned int flagY : 1 ;
unsigned int flagZ : 1 ;
unsigned int onlyvars : 1 ;
unsigned int doaccess : 1 ;
@@ -79,6 +80,7 @@ struct options_s
.ruleswhat = 0, \
.flagS = 0, \
.flagy = 0, \
+ .flagY = 0, \
.flagZ = 0, \
.onlyvars = 0, \
.doaccess = 0, \
@@ -128,8 +130,8 @@ int main (int argc, char const *const *argv)
case 'x' : o.rules = l.arg ; o.ruleswhat = 2 ; o.doaccess = 1 ; break ;
case 'S' : o.flagS = 1 ; break ;
case 's' : o.flagS = 0 ; break ;
- case 'Y' : o.flagy = 0 ; break ;
- case 'y' : o.flagy = 1 ; break ;
+ case 'Y' : o.flagY = 1 ; o.flagy = 0 ; break ;
+ case 'y' : o.flagy = 1 ; o.flagY = 0 ; break ;
case 'K' : if (!uint0_scan(l.arg, &o.kimeout)) dieusage() ; break ;
case 'Z' : o.flagZ = 1 ; break ;
case 'z' : o.flagZ = 0 ; break ;
@@ -218,6 +220,7 @@ int main (int argc, char const *const *argv)
newargv[m++] = o.verbosity ? "-v2" : "-v0" ;
if (o.flagS) newargv[m++] = "-S" ;
if (o.flagy) newargv[m++] = "-y" ;
+ else if (o.flagY) newargv[m++] = "-Y" ;
if (o.kimeout)
{
newargv[m++] = "-K" ;