Skip to content

Commit

Permalink
ovs-vsctl: Add the missing ssl bootstrapping option parsing.
Browse files Browse the repository at this point in the history
'man ovs-vsctl' mentions that ovs-vsctl can bootstrap itself
by getting the certificate from the server. But the option
was never parsed in the code.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
  • Loading branch information
shettyg committed Aug 21, 2015
1 parent c19ee42 commit 6ee7579
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions utilities/ovs-vsctl.c
Expand Up @@ -297,6 +297,7 @@ parse_options(int argc, char *argv[], struct shash *local_options)
OPT_NO_SYSLOG,
OPT_NO_WAIT,
OPT_DRY_RUN,
OPT_BOOTSTRAP_CA_CERT,
OPT_PEER_CA_CERT,
OPT_LOCAL,
OPT_RETRY,
Expand All @@ -320,6 +321,7 @@ parse_options(int argc, char *argv[], struct shash *local_options)
VLOG_LONG_OPTIONS,
TABLE_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS,
{"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
{"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
{NULL, 0, NULL, 0},
};
Expand Down Expand Up @@ -462,6 +464,10 @@ parse_options(int argc, char *argv[], struct shash *local_options)
stream_ssl_set_peer_ca_cert_file(optarg);
break;

case OPT_BOOTSTRAP_CA_CERT:
stream_ssl_set_ca_cert_file(optarg, true);
break;

case '?':
exit(EXIT_FAILURE);

Expand Down

0 comments on commit 6ee7579

Please sign in to comment.