From caa8a4ea50734378e7e19f70b39a837c58e9d229 Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Thu, 17 Apr 2014 23:21:05 +0000 Subject: 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 Reviewed-on: http://review.gluster.org/3695 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- rpc/rpc-lib/src/rpc-transport.c | 4 ++++ rpc/rpc-lib/src/rpc-transport.h | 1 + 2 files changed, 5 insertions(+) (limited to 'rpc/rpc-lib') 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 { -- cgit