From 35128a93e7b1efd10f691e1f3ef12a48116c1c0c Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 8 Jun 2018 22:31:48 +1000 Subject: ctdb-tests: Switch fake_ctdbd to use ctdb_get_peer_pid() Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs (cherry picked from commit 05a908d71c4b7484ba0243fa51bc05c79c8fb357) --- ctdb/tests/src/fake_ctdbd.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'ctdb') diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c index 2f4e87f6f6c..ebb8bec9c12 100644 --- a/ctdb/tests/src/fake_ctdbd.c +++ b/ctdb/tests/src/fake_ctdbd.c @@ -40,6 +40,7 @@ #include "common/logging.h" #include "common/tunable.h" #include "common/srvid.h" +#include "common/system.h" #include "ipalloc_read_known_ips.h" @@ -3050,8 +3051,6 @@ static struct tevent_req *client_send(TALLOC_CTX *mem_ctx, { struct tevent_req *req; struct client_state *state; - struct ucred cr; - socklen_t crl = sizeof(struct ucred); int ret; req = tevent_req_create(mem_ctx, &state, struct client_state); @@ -3064,12 +3063,7 @@ static struct tevent_req *client_send(TALLOC_CTX *mem_ctx, state->ctdb = ctdb; state->pnn = pnn; - ret = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cr, &crl); - if (ret != 0) { - tevent_req_error(req, ret); - return tevent_req_post(req, ev); - } - state->pid = cr.pid; + (void) ctdb_get_peer_pid(fd, &state->pid); ret = comm_setup(state, ev, fd, client_read_handler, req, client_dead_handler, req, &state->comm); -- cgit v1.2.1