You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/05/11 14:53:09 UTC
svn commit: r1678746 - in /subversion/trunk/subversion: svn/svn.c
svnbench/svnbench.c svnmucc/svnmucc.c svnrdump/svnrdump.c svnsync/svnsync.c
tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Author: rhuijben
Date: Mon May 11 12:53:08 2015
New Revision: 1678746
URL: http://svn.apache.org/r1678746
Log:
Following up on r1630117 and r1678734, extend --trust-server-cert-failures.
Suggested by:
stsp
brane
* subversion/svn/svn.c
(svn_cl__options): Extend docs.
* subversion/svnbench/svnbench.c
(svn_cl__options): Extend docs.
* subversion/svnmucc/svnmucc.c
(help): Extend docs.
* subversion/svnrdump/svnrdump.c
(svnrdump__options): Extend docs.
* subversion/svnsync/svnsync.c
(svnsync_options): Extend docs.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Update expected result.
Modified:
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/svnbench/svnbench.c
subversion/trunk/subversion/svnmucc/svnmucc.c
subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/trunk/subversion/svnsync/svnsync.c
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1678746&r1=1678745&r2=1678746&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Mon May 11 12:53:08 2015
@@ -245,11 +245,17 @@ const apr_getopt_option_t svn_cl__option
{"trust-server-cert-failures", opt_trust_server_cert_failures, 1,
N_("with --non-interactive, accept SSL server\n"
" "
- "certificates with failures; ARG is comma-\n"
+ "certificates with failures; ARG is comma-separated\n"
" "
- "separated list of 'unknown-ca', 'cn-mismatch',\n"
+ "list of 'unknown-ca' (Unknown Authority),\n"
" "
- "'expired', 'not-yet-valid', and 'other'.")},
+ "'cn-mismatch' (Hostname mismatch), 'expired'\n"
+ " "
+ "(Expired certificate), 'not-yet-valid' (Not yet\n"
+ " "
+ "valid certificate) and 'other' (all other not\n"
+ " "
+ "separately classified certificate errors).")},
{"non-interactive", opt_non_interactive, 0,
N_("do no interactive prompting (default is to prompt\n"
" "
Modified: subversion/trunk/subversion/svnbench/svnbench.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnbench/svnbench.c?rev=1678746&r1=1678745&r2=1678746&view=diff
==============================================================================
--- subversion/trunk/subversion/svnbench/svnbench.c (original)
+++ subversion/trunk/subversion/svnbench/svnbench.c Mon May 11 12:53:08 2015
@@ -129,11 +129,17 @@ const apr_getopt_option_t svn_cl__option
{"trust-server-cert-failures", opt_trust_server_cert_failures, 1,
N_("with --non-interactive, accept SSL server\n"
" "
- "certificates with failures; ARG is comma-\n"
+ "certificates with failures; ARG is comma-separated\n"
" "
- "separated list of 'unknown-ca', 'cn-mismatch',\n"
+ "list of 'unknown-ca' (Unknown Authority),\n"
" "
- "'expired', 'not-yet-valid', and 'other'.\n")},
+ "'cn-mismatch' (Hostname mismatch), 'expired'\n"
+ " "
+ "(Expired certificate), 'not-yet-valid' (Not yet\n"
+ " "
+ "valid certificate) and 'other' (all other not\n"
+ " "
+ "separately classified certificate errors).")},
{"non-interactive", opt_non_interactive, 0,
N_("do no interactive prompting")},
{"config-dir", opt_config_dir, 1,
Modified: subversion/trunk/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1678746&r1=1678745&r2=1678746&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Mon May 11 12:53:08 2015
@@ -298,10 +298,12 @@ help(FILE *stream, apr_pool_t *pool)
" --trust-server-cert : deprecated;\n"
" same as --trust-server-cert-failures=unknown-ca\n"
" --trust-server-cert-failures ARG\n"
- " Accept SSL server certificates with failures;\n"
- " ARG is comma-separated list of 'unknown-ca',\n"
- " 'cn-mismatch', 'expired', 'not-yet-valid' and\n"
- " 'other'.\n"
+ " certificates with failures; ARG is comma-separated\n"
+ " list of 'unknown-ca' (Unknown Authority),\n"
+ " 'cn-mismatch' (Hostname mismatch), 'expired'\n"
+ " (Expired certificate),'not-yet-valid' (Not yet\n"
+ " valid certificate) and 'other' (all other not\n"
+ " separately classified certificate errors).\n"
" -X [--extra-args] ARG : append arguments from file ARG (one per line;\n"
" use \"-\" to read from standard input)\n"
" --config-dir ARG : use ARG to override the config directory\n"
Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1678746&r1=1678745&r2=1678746&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Mon May 11 12:53:08 2015
@@ -163,11 +163,17 @@ static const apr_getopt_option_t svnrdum
{"trust-server-cert-failures", opt_trust_server_cert_failures, 1,
N_("with --non-interactive, accept SSL server\n"
" "
- "certificates with failures; ARG is comma-\n"
+ "certificates with failures; ARG is comma-separated\n"
" "
- "separated list of 'unknown-ca', 'cn-mismatch',\n"
+ "list of 'unknown-ca' (Unknown Authority),\n"
" "
- "'expired', 'not-yet-valid', and 'other'.")},
+ "'cn-mismatch' (Hostname mismatch), 'expired'\n"
+ " "
+ "(Expired certificate), 'not-yet-valid' (Not yet\n"
+ " "
+ "valid certificate) and 'other' (all other not\n"
+ " "
+ "separately classified certificate errors).")},
{0, 0, 0, 0}
};
Modified: subversion/trunk/subversion/svnsync/svnsync.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/svnsync.c?rev=1678746&r1=1678745&r2=1678746&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/svnsync.c (original)
+++ subversion/trunk/subversion/svnsync/svnsync.c Mon May 11 12:53:08 2015
@@ -202,11 +202,17 @@ static const apr_getopt_option_t svnsync
{"trust-server-cert-failures", svnsync_opt_trust_server_cert_failures, 1,
N_("with --non-interactive, accept SSL server\n"
" "
- "certificates with failures; ARG is comma-\n"
+ "certificates with failures; ARG is comma-separated\n"
" "
- "separated list of 'unknown-ca', 'cn-mismatch',\n"
+ "list of 'unknown-ca' (Unknown Authority),\n"
" "
- "'expired', 'not-yet-valid', and 'other'.")},
+ "'cn-mismatch' (Hostname mismatch), 'expired'\n"
+ " "
+ "(Expired certificate), 'not-yet-valid' (Not yet\n"
+ " "
+ "valid certificate) and 'other' (all other not\n"
+ " "
+ "separately classified certificate errors).")},
{"source-username", svnsync_opt_source_username, 1,
N_("connect to source repository with username ARG") },
{"source-password", svnsync_opt_source_password, 1,
Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1678746&r1=1678745&r2=1678746&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Mon May 11 12:53:08 2015
@@ -125,9 +125,12 @@ Global options:
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
- certificates with failures; ARG is comma-
- separated list of 'unknown-ca', 'cn-mismatch',
- 'expired', 'not-yet-valid', and 'other'.
+ certificates with failures; ARG is comma-separated
+ list of 'unknown-ca' (Unknown Authority),
+ 'cn-mismatch' (Hostname mismatch), 'expired'
+ (Expired certificate), 'not-yet-valid' (Not yet
+ valid certificate) and 'other' (all other not
+ separately classified certificate errors).
--config-dir ARG : read user configuration files from directory ARG
--config-option ARG : set user configuration option in the format:
FILE:SECTION:OPTION=[VALUE]
@@ -212,9 +215,12 @@ Global options:
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
- certificates with failures; ARG is comma-
- separated list of 'unknown-ca', 'cn-mismatch',
- 'expired', 'not-yet-valid', and 'other'.
+ certificates with failures; ARG is comma-separated
+ list of 'unknown-ca' (Unknown Authority),
+ 'cn-mismatch' (Hostname mismatch), 'expired'
+ (Expired certificate), 'not-yet-valid' (Not yet
+ valid certificate) and 'other' (all other not
+ separately classified certificate errors).
--config-dir ARG : read user configuration files from directory ARG
--config-option ARG : set user configuration option in the format:
FILE:SECTION:OPTION=[VALUE]