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 /vswitchd/ovs-vswitchd.c | |
parent | be55976089659d082834aae58acd1173f10004e7 (diff) |
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 'vswitchd/ovs-vswitchd.c')
-rw-r--r-- | vswitchd/ovs-vswitchd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index b9a24618..626cba4f 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -128,11 +128,9 @@ parse_options(int argc, char *argv[]) DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, -#ifdef HAVE_OPENSSL - STREAM_SSL_LONG_OPTIONS + STREAM_SSL_LONG_OPTIONS, {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, -#endif {"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY}, {0, 0, 0, 0}, }; @@ -168,8 +166,6 @@ parse_options(int argc, char *argv[]) VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS LEAK_CHECKER_OPTION_HANDLERS - -#ifdef HAVE_OPENSSL STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: @@ -179,7 +175,6 @@ parse_options(int argc, char *argv[]) case OPT_BOOTSTRAP_CA_CERT: stream_ssl_set_ca_cert_file(optarg, true); break; -#endif case OPT_ENABLE_DUMMY: dummy_enable(); |