From: Martin Schwenke <martin@meltin.net>
Date: Wed, 20 Jul 2016 04:46:58 +0000 (+1000)
Subject: ctdb-client: Fix incorrect variable reference
X-Git-Tag: tdb-1.3.10~310
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f57bcc01d973516beaedfbd2c1ef552322e4779;p=thirdparty%2Fsamba.git

ctdb-client: Fix incorrect variable reference

The point of this code is almost certainly to return non-zero when
state->errormsg is set.  So, return state->status if non-zero, -1
otherwise.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 7e98499b69b..19502be1841 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -1178,7 +1178,7 @@ int ctdb_control_recv(struct ctdb_context *ctdb,
 			state->async.fn(state);
 		}
 		talloc_free(tmp_ctx);
-		return (status == 0 ? -1 : state->status);
+		return (state->status == 0 ? -1 : state->status);
 	}
 
 	if (outdata) {