diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-17 23:21:05 +0000 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-07-02 02:47:05 -0700 |
| commit | caa8a4ea50734378e7e19f70b39a837c58e9d229 (patch) | |
| tree | a06a99e143a1dd8c99cc10e84e9d3bca72a63cf7 /rpc/rpc-lib | |
| parent | 831efecf927788f26b630cb82d5d6ff4af411a3d (diff) | |
rpc/auth: allow SSL identity to be used for authorization
Access to a volume is now controlled by the following options, based on
whether SSL is enabled or not.
* server.ssl-allow: get identity from certificate, no password needed
* auth.allow: get identity and matching password from command line
It is not possible to allow both simultaneously, since the connection
itself is either using SSL or it isn't.
Change-Id: I5a5be66520f56778563d62f4b3ab35c66cc41ac0
BUG: 1114604
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/3695
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'rpc/rpc-lib')
| -rw-r--r-- | rpc/rpc-lib/src/rpc-transport.c | 4 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpc-transport.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c index c24d4108403..cf7f903056a 100644 --- a/rpc/rpc-lib/src/rpc-transport.c +++ b/rpc/rpc-lib/src/rpc-transport.c @@ -447,6 +447,10 @@ rpc_transport_destroy (rpc_transport_t *this) if (this->dl_handle) dlclose (this->dl_handle); + if (this->ssl_name) { + GF_FREE(this->ssl_name); + } + GF_FREE (this); fail: return ret; diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h index 2db9072ae49..117d5e1e8ce 100644 --- a/rpc/rpc-lib/src/rpc-transport.h +++ b/rpc/rpc-lib/src/rpc-transport.h @@ -214,6 +214,7 @@ struct rpc_transport { struct list_head list; int bind_insecure; void *dl_handle; /* handle of dlopen() */ + char *ssl_name; }; struct rpc_transport_ops { |