diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-05-10 09:17:37 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-05-10 09:17:37 -0700 |
| commit | bf8f2167fd3107f5513d487a69a6568cf51afd68 (patch) | |
| tree | fe1e3fda9d4a8cb105a6e562099ea14bc913e617 /tests/test-jsonrpc.c | |
| parent | be55976089659d082834aae58acd1173f10004e7 (diff) | |
| download | openvswitch-bf8f2167fd3107f5513d487a69a6568cf51afd68.tar.gz | |
stream-ssl: Improve messages when configuring SSL if it is unsupported.
Previously, if --private-key or another option that requires SSL support
was used, but OVS was built without OpenSSL support, then OVS would fail
with an error message that the specified option was not supported. This
confused users because it made them think that the option had been removed:
http://openvswitch.org/pipermail/discuss/2011-April/005034.html
This commit improves the error message: OVS will now report that it was
built without SSL support. This should be make the problem clear to users.
Reported-by: Aaron Rosen <arosen@clemson.edu>
Feature #5325.
Diffstat (limited to 'tests/test-jsonrpc.c')
| -rw-r--r-- | tests/test-jsonrpc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c index 12bbc975e..5d93850c0 100644 --- a/tests/test-jsonrpc.c +++ b/tests/test-jsonrpc.c @@ -60,10 +60,8 @@ parse_options(int argc, char *argv[]) {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, DAEMON_LONG_OPTIONS, -#ifdef HAVE_OPENSSL {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, - STREAM_SSL_LONG_OPTIONS -#endif + STREAM_SSL_LONG_OPTIONS, {0, 0, 0, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -84,13 +82,11 @@ parse_options(int argc, char *argv[]) DAEMON_OPTION_HANDLERS -#ifdef HAVE_OPENSSL STREAM_SSL_OPTION_HANDLERS case OPT_BOOTSTRAP_CA_CERT: stream_ssl_set_ca_cert_file(optarg, true); break; -#endif case '?': exit(EXIT_FAILURE); |