From e4a4e04bf87cc6460fe9790ffc4a796e60ab698c Mon Sep 17 00:00:00 2001 From: Yves Rutschle Date: Sun, 8 Jan 2017 13:00:19 +0100 Subject: [PATCH] Clarify no space after -F (Issue 108, take 2) --- sslh-main.c | 4 ++-- sslh.pod | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sslh-main.c b/sslh-main.c index 3242cc4..37e76d9 100644 --- a/sslh-main.c +++ b/sslh-main.c @@ -39,7 +39,7 @@ const char* USAGE_STRING = "sslh " VERSION "\n" \ "usage:\n" \ -"\tsslh [-v] [-i] [-V] [-f] [-n] [--transparent] [-F ]\n" +"\tsslh [-v] [-i] [-V] [-f] [-n] [--transparent] [-F]\n" "\t[-t ] [-P ] -u -p [-p ...] \n" \ "%s\n\n" /* Dynamically built list of builtin protocols */ \ "\t[--on-timeout ]\n" \ @@ -49,7 +49,7 @@ const char* USAGE_STRING = "-n: numeric output\n" \ "-u: specify under which user to run\n" \ "--transparent: behave as a transparent proxy\n" \ -"-F: use configuration file\n" \ +"-F: use configuration file (warning: no space between -F and file name!)\n" \ "--on-timeout: connect to specified address upon timeout (default: ssh address)\n" \ "-t: seconds to wait before connecting to --on-timeout address.\n" \ "-p: address and port to listen on.\n Can be used several times to bind to several addresses.\n" \ diff --git a/sslh.pod b/sslh.pod index b019da8..8b08d88 100644 --- a/sslh.pod +++ b/sslh.pod @@ -6,7 +6,7 @@ =head1 SYNOPSIS -sslh [B<-F> I] [ B<-t> I ] [B<--transparent>] [B<-p> I [B<-p> I ...] [B<--ssl> I] [B<--tls> I] [B<--ssh> I] [B<--openvpn> I] [B<--http> I] [B<--xmpp> I] [B<--tinc> I] [B<--anyprot> I] [B<--on-timeout> I] [B<-u> I] [B<-P> I] [-v] [-i] [-V] [-f] [-n] +sslh [B<-F>I] [ B<-t> I ] [B<--transparent>] [B<-p> I [B<-p> I ...] [B<--ssl> I] [B<--tls> I] [B<--ssh> I] [B<--openvpn> I] [B<--http> I] [B<--xmpp> I] [B<--tinc> I] [B<--anyprot> I] [B<--on-timeout> I] [B<-u> I] [B<-P> I] [-v] [-i] [-V] [-f] [-n] =head1 DESCRIPTION @@ -78,12 +78,15 @@ connections and LOG_ERR for failures. =over 4 -=item B<-F> I, B<--config> I +=item B<-F>I, B<--config> I Uses I as configuration file. If other command-line options are specified, they will override the configuration file's settings. +When using the shorthand version, make sure there should be +no space between B<-F> and the I. + =item B<-t> I, B<--timeout> I Timeout before forwarding the connection to the timeout