diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-02-09 10:32:47 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-02-18 05:34:06 +0100 |
| commit | 54f0c39e5a33871847aa9fe2c070c7f638f54cc4 (patch) | |
| tree | 4c7106168cbefc55ea1e8e218f7c0ddbdbe446aa /ctdb | |
| parent | 2c7c35377e5452e37925b970253b70875a8d7470 (diff) | |
| download | samba-54f0c39e5a33871847aa9fe2c070c7f638f54cc4.tar.gz samba-54f0c39e5a33871847aa9fe2c070c7f638f54cc4.tar.xz samba-54f0c39e5a33871847aa9fe2c070c7f638f54cc4.zip | |
ctdb-client: Return a value of 1 when setting obsolete tunable variable
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/client/ctdb_client.c | 4 | ||||
| -rw-r--r-- | ctdb/server/ctdb_tunables.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 533f36f175..fc34b8a710 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -2735,12 +2735,12 @@ int ctdb_ctrl_set_tunable(struct ctdb_context *ctdb, ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_SET_TUNABLE, 0, data, NULL, NULL, &res, &timeout, NULL); talloc_free(data.dptr); - if (ret != 0 || res != 0) { + if ((ret != 0) || (res == -1)) { DEBUG(DEBUG_ERR,(__location__ " ctdb_control for set_tunable failed\n")); return -1; } - return 0; + return res; } /* diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c index 544a9e0397..e5ccf106a1 100644 --- a/ctdb/server/ctdb_tunables.c +++ b/ctdb/server/ctdb_tunables.c @@ -175,6 +175,7 @@ int32_t ctdb_control_set_tunable(struct ctdb_context *ctdb, TDB_DATA indata) DEBUG(DEBUG_WARNING, ("Setting obsolete tunable \"%s\"\n", tunable_map[i].name)); + return 1; } return 0; |