Mirrors/proxytunnel
1
0
Fork 0
mirror of https://github.com/proxytunnel/proxytunnel.git synced 2026-01-23 02:34:59 +00:00
Code Issues Projects Releases Wiki Activity

Harmonize output of --help and manual page

Browse source 
Also fix some typos and missing newlines.
This commit is contained in:
Sven Geuer 2023-10-01 21:09:49 +02:00
parent 62f57fd865
commit 0349635635
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmdline.c
View file

@ -51,7 +51,7 @@ void cmdline_parser_print_help (void) {
// FIXME: " -c, --config=FILE Read config options from file\n"
" -i, --inetd Run from inetd (default: off)\n"
" -a, --standalone=INT Run as standalone daemon on specified port\n"
// FIXME: " -f, --nobackground Don't for tok background in standalone mode\n"
// FIXME: " -f, --nobackground Don't fork to background in standalone mode\n"
" -p, --proxy=STRING Local proxy host:port combination\n"
" -r, --remproxy=STRING Remote proxy host:port combination (using 2 proxies)\n"
" -d, --dest=STRING Destination host:port combination\n"
@ -59,17 +59,17 @@ void cmdline_parser_print_help (void) {
" -e, --encrypt SSL encrypt data between local proxy and destination\n"
" -E, --encrypt-proxy SSL encrypt data between client and local proxy\n"
" -X, --encrypt-remproxy SSL encrypt data between local and remote proxy\n"
#endif
"\n"
"Additional options for specific features:\n"
#ifdef USE_SSL
" -W, --wa-bug-29744 Workaround ASF Bugzilla 29744: if SSL is active stop\n"
" using it after CONNECT (might not work on all setups; see\n"
" /usr/share/doc/proxytunnel/README.Debian.gz)\n"
" -B, --buggy-encrypt-proxy Equivalent to -E -W, provided for backwards\n"
" compatibility\n"
" -L (legacy) enforce TLSv1 connection\n"
" -L Enforce TLSv1 connection (legacy)\n"
" -T, --no-ssl3 Do not connect using SSLv3\n"
#endif
"\n"
"Additional options for specific features:\n"
#ifdef USE_SSL
" -z, --no-check-certificate Don't verify server SSL certificate\n"
" -C, --cacert=STRING Path to trusted CA certificate or directory\n"
#endif
@ -85,7 +85,7 @@ void cmdline_parser_print_help (void) {
" -N, --ntlm Use NTLM based authentication\n"
" -t, --domain=STRING NTLM domain (default: autodetect)\n"
" -H, --header=STRING Add additional HTTP headers to send to proxy\n"
" -o STRING send custom Host Header\n"
" -o STRING Send custom Host Header\n"
#ifdef SETPROCTITLE
" -x, --proctitle=STRING Use a different process title\n"
#endif
@ -312,7 +312,7 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
case 'L':
args_info->enforcetls1_given = 1;
message("Enforcing TLSv1");
message("Enforcing TLSv1\n");
args_info->enforcetls1_flag = 1;
break;

18
docs/proxytunnel.1.adoc
View file

@ -44,16 +44,19 @@ also be used for other proxy-traversing purposes like proxy bouncing.
*-X*, *--encrypt-remproxy*::
SSL encrypt data between local and remote (secondary) proxy
== ADDITIONAL OPTIONS
*-W*, *--wa-bug-29744*::
If SSL is in use (by *-e*, *-E*, *-X* options), stop using it
immediately after the CONNECT exchange to workaround apache server
bugs. (This might not work on all setups; see
Workaround ASF Bugzilla 29744: If SSL is in use (by *-e*, *-E*, *-X*
options), stop using it immediately after the CONNECT exchange to
workaround apache server bugs. (This might not work on all setups; see
/usr/share/doc/proxytunnel/README.Debian.gz for more details.)
*-B*, *--buggy-encrypt-proxy*::
Equivalent to *-E -W*. (Provided for backwards compatibility.)
== ADDITIONAL OPTIONS
*-L*::
Enforce TLSv1 connection (legacy)
*-T*, *--no-ssl3*::
Prevent the use of SSLv3 in encrypted connections (default: enabled)
@ -99,7 +102,7 @@ also be used for other proxy-traversing purposes like proxy bouncing.
set, proxytunnel will prompt for a password
*-N*, *--ntlm*::
Use NTLM basd authentication
Use NTLM based authentication
*-t*, *--domain*=_STRING_::
Specify NTLM domain (default: autodetect)
@ -107,6 +110,9 @@ also be used for other proxy-traversing purposes like proxy bouncing.
*-H*, *--header*=_STRING_::
Add additional HTTP headers to send to proxy
*-o* _STRING_::
Send a customer Host Header
*-x*, *--proctitle*=_STRING_::
Use a different process title
@ -170,7 +176,7 @@ Host system.athome.nl
NOTE: The +ServerAliveInterval+ directive makes sure that idle connections are
not being dropped by intermediate firewalls that remove active sessions
aggresively. If you see your connection dropping out, try to lower the value
aggressively. If you see your connection dropping out, try to lower the value
even more.
To use the dynamic (SOCKS) portforwarding capability of the SSH client, you