diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-04-25 14:05:30 -0400 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2016-04-25 21:26:22 -0700 |
| commit | 2dc22adbf3361bdab10924943371492cc2817d8a (patch) | |
| tree | 9080432ca3851aeb0a2ac3de5bc0eb5071342649 /xlators | |
| parent | 0a43265f1b10c35506fe82a525aa0fa43af6c0cd (diff) | |
glusterd: SSL certificate depth volume option is incorrect
Between 3.7.1 and 3.7.2 a typo was introduced changing the string
ssl-cert-depth to ssl-cetificate-depth. [sic]
rpc/rpc-transport/socket/src/socket.c still expects the string
ssl-cert-depth.
Also replace a couple errant tabs with spaces.
Change-Id: I0621258470bd831c97008b56123a9dc7029d73f1
BUG: 1330248
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/14066
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 62a4f31cd69..50ca60a2e6c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1608,7 +1608,7 @@ brick_graph_add_bitrot_stub (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, dict_t *set_dict, glusterd_brickinfo_t *brickinfo) { xlator_t *xl = NULL; - int ret = -1; + int ret = -1; if (!graph || !volinfo || !set_dict || !brickinfo) goto out; @@ -2242,7 +2242,7 @@ brick_graph_add_server (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, RPC_SET_OPT(xl, SSL_PRIVATE_KEY_OPT,"ssl-private-key", return -1); RPC_SET_OPT(xl, SSL_CA_LIST_OPT, "ssl-ca-list", return -1); RPC_SET_OPT(xl, SSL_CRL_PATH_OPT, "ssl-crl-path", return -1); - RPC_SET_OPT(xl, SSL_CERT_DEPTH_OPT, "ssl-cetificate-depth", return -1); + RPC_SET_OPT(xl, SSL_CERT_DEPTH_OPT, "ssl-cert-depth", return -1); RPC_SET_OPT(xl, SSL_CIPHER_LIST_OPT,"ssl-cipher-list", return -1); RPC_SET_OPT(xl, SSL_DH_PARAM_OPT, "ssl-dh-param", return -1); RPC_SET_OPT(xl, SSL_EC_CURVE_OPT, "ssl-ec-curve", return -1); @@ -2341,7 +2341,7 @@ brick_graph_add_pump (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, return -1); RPC_SET_OPT(rbxl, SSL_CRL_PATH_OPT, "ssl-crl-path", return -1); - RPC_SET_OPT(rbxl, SSL_CERT_DEPTH_OPT, "ssl-cetificate-depth", + RPC_SET_OPT(rbxl, SSL_CERT_DEPTH_OPT, "ssl-cert-depth", return -1); RPC_SET_OPT(rbxl, SSL_CIPHER_LIST_OPT,"ssl-cipher-list", return -1); @@ -2414,7 +2414,7 @@ static volgen_brick_xlator_t server_graph_table[] = { {brick_graph_add_pump, NULL}, {brick_graph_add_locks, "locks"}, {brick_graph_add_acl, "acl"}, - {brick_graph_add_bitrot_stub, "bitrot-stub"}, + {brick_graph_add_bitrot_stub, "bitrot-stub"}, {brick_graph_add_changelog, "changelog"}, #if USE_GFDB /* changetimerecorder depends on gfdb */ {brick_graph_add_changetimerecorder, "changetimerecorder"}, @@ -2937,7 +2937,7 @@ volgen_graph_build_client (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, RPC_SET_OPT(xl, SSL_PRIVATE_KEY_OPT,"ssl-private-key", goto err); RPC_SET_OPT(xl, SSL_CA_LIST_OPT, "ssl-ca-list", goto err); RPC_SET_OPT(xl, SSL_CRL_PATH_OPT, "ssl-crl-path", goto err); - RPC_SET_OPT(xl, SSL_CERT_DEPTH_OPT, "ssl-cetificate-depth", goto err); + RPC_SET_OPT(xl, SSL_CERT_DEPTH_OPT, "ssl-cert-depth", goto err); RPC_SET_OPT(xl, SSL_CIPHER_LIST_OPT,"ssl-cipher-list", goto err); RPC_SET_OPT(xl, SSL_DH_PARAM_OPT, "ssl-dh-param", goto err); RPC_SET_OPT(xl, SSL_EC_CURVE_OPT, "ssl-ec-curve", goto err); @@ -5620,7 +5620,7 @@ glusterd_snapdsvc_generate_volfile (volgen_graph_t *graph, RPC_SET_OPT(xl, SSL_PRIVATE_KEY_OPT,"ssl-private-key", return -1); RPC_SET_OPT(xl, SSL_CA_LIST_OPT, "ssl-ca-list", return -1); RPC_SET_OPT(xl, SSL_CRL_PATH_OPT, "ssl-crl-path", return -1); - RPC_SET_OPT(xl, SSL_CERT_DEPTH_OPT, "ssl-cetificate-depth", return -1); + RPC_SET_OPT(xl, SSL_CERT_DEPTH_OPT, "ssl-cert-depth", return -1); RPC_SET_OPT(xl, SSL_CIPHER_LIST_OPT,"ssl-cipher-list", return -1); RPC_SET_OPT(xl, SSL_DH_PARAM_OPT, "ssl-dh-param", return -1); RPC_SET_OPT(xl, SSL_EC_CURVE_OPT, "ssl-ec-curve", return -1); |