--- ./ctdb/tests/src/fake_ctdbd.c	2017-10-25 16:25:08 +0530
+++ ./ctdb/tests/src/fake_ctdbd.c	2017-01-11 13:25:14 +0530
@@ -108,13 +108,6 @@
 	const char *comment;
 };
 
-struct ctdb_client {
-	struct ctdb_client *prev, *next;
-	struct ctdbd_context *ctdb;
-	pid_t pid;
-	void *state;
-};
-
 struct ctdbd_context {
 	struct node_map *node_map;
 	struct interface_map *iface_map;
@@ -133,7 +126,6 @@
 	char *reclock;
 	struct ctdb_public_ip_list *known_ips;
 	struct fake_control_failure *control_failures;
-	struct ctdb_client *client_list;
 };
 
 /*
@@ -828,48 +820,6 @@
 }
 
 /*
- * Manage clients
- */
-
-static int ctdb_client_destructor(struct ctdb_client *client)
-{
-	DLIST_REMOVE(client->ctdb->client_list, client);
-	return 0;
-}
-
-static int client_add(struct ctdbd_context *ctdb, pid_t client_pid,
-		      void *client_state)
-{
-	struct ctdb_client *client;
-
-	client = talloc_zero(client_state, struct ctdb_client);
-	if (client == NULL) {
-		return ENOMEM;
-	}
-
-	client->ctdb = ctdb;
-	client->pid = client_pid;
-	client->state = client_state;
-
-	DLIST_ADD(ctdb->client_list, client);
-	talloc_set_destructor(client, ctdb_client_destructor);
-	return 0;
-}
-
-static void *client_find(struct ctdbd_context *ctdb, pid_t client_pid)
-{
-	struct ctdb_client *client;
-
-	for (client=ctdb->client_list; client != NULL; client=client->next) {
-		if (client->pid == client_pid) {
-			return client->state;
-		}
-	}
-
-	return NULL;
-}
-
-/*
  * CTDB context setup
  */
 
@@ -1193,7 +1143,6 @@
 	int fd;
 	struct ctdbd_context *ctdb;
 	int pnn;
-	pid_t pid;
 	struct comm_context *comm;
 	struct srvid_register_state *rstate;
 	int status;
@@ -1307,22 +1256,11 @@
 				   struct ctdb_req_header *header,
 				   struct ctdb_req_control *request)
 {
-	struct client_state *state = tevent_req_data(
-		req, struct client_state);
-	struct ctdbd_context *ctdb = state->ctdb;
-	struct client_state *cstate;
 	struct ctdb_reply_control reply;
 
 	reply.rdata.opcode = request->opcode;
-
-	cstate = client_find(ctdb, request->rdata.data.pid);
-	if (cstate == NULL) {
-		reply.status = -1;
-		reply.errmsg = "No client for PID";
-	} else {
-		reply.status = kill(request->rdata.data.pid, 0);
-		reply.errmsg = NULL;
-	}
+	reply.status = kill(request->rdata.data.pid, 0);
+	reply.errmsg = NULL;
 
 	client_send_control(req, header, &reply);
 }
@@ -3037,8 +2975,6 @@
 {
 	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);
@@ -3051,24 +2987,11 @@
 	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;
-
 	ret = comm_setup(state, ev, fd, client_read_handler, req,
 			 client_dead_handler, req, &state->comm);
 	if (ret != 0) {
 		tevent_req_error(req, ret);
 		return tevent_req_post(req, ev);
-	}
-
-	ret = client_add(ctdb, state->pid, state);
-	if (ret != 0) {
-		tevent_req_error(req, ret);
-		return tevent_req_post(req, ev);
 	}
 
 	DEBUG(DEBUG_INFO, ("New client fd=%d\n", fd));