s4-cluster Use task_id instead of id2 to clarify server_id structure

This seems a clearer and more acceptable name.

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index f295f42d5f..63312da5d0 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -45,12 +45,12 @@ static bool server_id_from_py(PyObject *object, struct server_id *server_id)
 	}
 
 	if (PyTuple_Size(object) == 3) {
-		return PyArg_ParseTuple(object, "iii", &server_id->pid, &server_id->id2, &server_id->vnn);
+		return PyArg_ParseTuple(object, "iii", &server_id->pid, &server_id->task_id, &server_id->vnn);
 	} else {
-		int pid, id2;
-		if (!PyArg_ParseTuple(object, "ii", &pid, &id2))
+		int pid, task_id;
+		if (!PyArg_ParseTuple(object, "ii", &pid, &task_id))
 			return false;
-		*server_id = cluster_id(pid, id2);
+		*server_id = cluster_id(pid, task_id);
 		return true;
 	}
 }
@@ -159,7 +159,7 @@ static void py_msg_callback_wrapper(struct imessaging_context *msg, void *privat
 	PyObject *callback = (PyObject *)private_data;
 
 	PyObject_CallFunction(callback, discard_const_p(char, "i(iii)s#"), msg_type,
-			      server_id.pid, server_id.id2, server_id.vnn,
+			      server_id.pid, server_id.task_id, server_id.vnn,
 			      data->data, data->length);
 }
 
@@ -229,7 +229,7 @@ static PyObject *py_imessaging_server_id(PyObject *obj, void *closure)
 	imessaging_Object *iface = (imessaging_Object *)obj;
 	struct server_id server_id = imessaging_get_server_id(iface->msg_ctx);
 
-	return Py_BuildValue("(iii)", server_id.pid, server_id.id2,
+	return Py_BuildValue("(iii)", server_id.pid, server_id.task_id,
 			     server_id.vnn);
 }