summaryrefslogtreecommitdiff
path: root/ctdb/client
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2016-08-10 17:18:55 +1000
committerMartin Schwenke <martins@samba.org>2016-08-17 23:00:25 +0200
commit94018302fd75c079369fff9492c1e09408e848af (patch)
tree9a7bcff2a2b9ade78f9f8054af41dc379e592a42 /ctdb/client
parent0de52420b8735a50e8681655a49c59d3dab8a61f (diff)
downloadsamba-94018302fd75c079369fff9492c1e09408e848af.tar.gz
ctdb-client: Fix CID 1362725 Unchecked return value from library
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12157 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/client')
-rw-r--r--ctdb/client/ctdb_client.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index bad38b682a3..c67eb2c1de1 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -276,6 +276,7 @@ done:
int ctdb_socket_connect(struct ctdb_context *ctdb)
{
struct sockaddr_un addr;
+ int ret;
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
@@ -294,7 +295,17 @@ int ctdb_socket_connect(struct ctdb_context *ctdb)
return -1;
}
- set_blocking(ctdb->daemon.sd, false);
+ ret = set_blocking(ctdb->daemon.sd, false);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,
+ (__location__
+ " failed to set socket non-blocking (%s)\n",
+ strerror(errno)));
+ close(ctdb->daemon.sd);
+ ctdb->daemon.sd = -1;
+ return -1;
+ }
+
set_close_on_exec(ctdb->daemon.sd);
ctdb->daemon.queue = ctdb_queue_setup(ctdb, ctdb, ctdb->daemon.sd,