ctdb-tunables: Fix the implementation of LIST_TUNABLES control

Do not assume the first tunable is not obsolete.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c
index ef552bd6973055c1178d7d442c242ae4d209ea02..87dc58ca751b3b7d60c1c28e562789977f1dd26f 100644 (file)
--- a/ctdb/server/ctdb_tunables.c
+++ b/ctdb/server/ctdb_tunables.c
@@ -199,18 +199,20 @@ int32_t ctdb_control_list_tunables(struct ctdb_context *ctdb, TDB_DATA *outdata)
        int i;
        struct ctdb_control_list_tunable *t;
 
-       list = talloc_strdup(outdata, tunable_map[0].name);
-       CTDB_NO_MEMORY(ctdb, list);
-
-       for (i=1;i<ARRAY_SIZE(tunable_map);i++) {
+       for (i=0; i<ARRAY_SIZE(tunable_map); i++) {
                if (tunable_map[i].obsolete) {
                        continue;
                }
-               list = talloc_asprintf_append(list, ":%s", tunable_map[i].name);
-               CTDB_NO_MEMORY(ctdb, list);             
+               if (list == NULL) {
+                       list = talloc_strdup(outdata, tunable_map[i].name);
+               } else {
+                       list = talloc_asprintf_append(list, ":%s",
+                                                     tunable_map[i].name);
+               }
+               CTDB_NO_MEMORY(ctdb, list);
        }
 
-       outdata->dsize = offsetof(struct ctdb_control_list_tunable, data) + 
+       outdata->dsize = offsetof(struct ctdb_control_list_tunable, data) +
                strlen(list) + 1;
        outdata->dptr = talloc_size(outdata, outdata->dsize);
        CTDB_NO_MEMORY(ctdb, outdata->dptr);
@@ -221,5 +223,5 @@ int32_t ctdb_control_list_tunables(struct ctdb_context *ctdb, TDB_DATA *outdata)
        memcpy(t->data, list, t->length);
        talloc_free(list);
 
-       return 0;       
+       return 0;
 }