summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohit Agrawal <moagrawa@redhat.com>2016-09-29 13:35:26 +0530
committerRaghavendra G <rgowdapp@redhat.com>2017-01-09 22:32:50 -0800
commitf23f7ad5ea452e5d3e9176f393d7dee2bbe843fc (patch)
tree43a1569f22e759c3f83505a16669635f279641fc
parent0e6a8452446003e9510cfad1dbece5c0b7151fdc (diff)
socket: log the client identifier in ssl connect
Problem: client identifier is not logged in message in ssl_setup_connection Solutuion: In ssl_setup_connection xl_private is not available in rpc_transport so changed to this peerinfo.identifier. Backport of commit 2e23c62cc50037c8e61bcd9c04348409e7627181 BUG: 1383879 Signed-off-by: Mohit Agrawal <moagrawa@redhat.com> > BUG: 1380275 > Change-Id: I05006a3d63e46de8c388298c22faa9a3329eb6f3 > Signed-off-by: Mohit Agrawal <moagrawa@redhat.com> > Reviewed-on: http://review.gluster.org/15596 > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > Smoke: Gluster Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Jeff Darcy <jdarcy@redhat.com> > Reviewed-by: Atin Mukherjee <amukherj@redhat.com> > Reviewed-by: Vijay Bellur <vbellur@redhat.com> > (cherry picked from commit 2e23c62cc50037c8e61bcd9c04348409e7627181) Change-Id: I904f267937e0e12b0b1e19027c017e5d979b8197 Reviewed-on: http://review.gluster.org/15625 Tested-by: MOHIT AGRAWAL <moagrawa@redhat.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
-rw-r--r--rpc/rpc-transport/socket/src/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 4a34b45cce7..35b1455f370 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -343,14 +343,14 @@ ssl_setup_connection (rpc_transport_t *this, int server)
gf_log(this->name,GF_LOG_INFO,"peer CN = %s", peer_CN);
gf_log (this->name, GF_LOG_INFO,
"SSL verification succeeded (client: %s)",
- this->xl_private?this->xl_private->client_uid:"");
+ this->peerinfo.identifier);
return gf_strdup(peer_CN);
/* Error paths. */
ssl_error:
gf_log (this->name, GF_LOG_ERROR,
"SSL connect error (client: %s)",
- this->xl_private?this->xl_private->client_uid:"");
+ this->peerinfo.identifier);
ssl_dump_error_stack(this->name);
free_ssl:
SSL_free(priv->ssl_ssl);