diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-02 10:53:18 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 07:37:07 +0200 |
| commit | 4c8de5ab135d7d8462e264f616225122945c7682 (patch) | |
| tree | 17ab048dcdf8f6a112f92604268fa609941a19d1 /source4/lib/messaging | |
| parent | b0578d8a180d76bc7884b116a0081973a73b78cf (diff) | |
| download | samba-4c8de5ab135d7d8462e264f616225122945c7682.tar.gz samba-4c8de5ab135d7d8462e264f616225122945c7682.tar.bz2 samba-4c8de5ab135d7d8462e264f616225122945c7682.zip | |
s4-cluster Rename server_id.node -> vnn to match Samba3
Diffstat (limited to 'source4/lib/messaging')
| -rw-r--r-- | source4/lib/messaging/pymessaging.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c index 017b6f91a2..a58176dc07 100644 --- a/source4/lib/messaging/pymessaging.c +++ b/source4/lib/messaging/pymessaging.c @@ -45,7 +45,7 @@ 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->node); + return PyArg_ParseTuple(object, "iii", &server_id->pid, &server_id->id2, &server_id->vnn); } else { int pid, id2; if (!PyArg_ParseTuple(object, "ii", &pid, &id2)) @@ -158,8 +158,8 @@ static void py_msg_callback_wrapper(struct messaging_context *msg, void *private { 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.node, + PyObject_CallFunction(callback, discard_const_p(char, "i(iii)s#"), msg_type, + server_id.pid, server_id.id2, server_id.vnn, data->data, data->length); } @@ -230,7 +230,7 @@ static PyObject *py_messaging_server_id(PyObject *obj, void *closure) struct server_id server_id = messaging_get_server_id(iface->msg_ctx); return Py_BuildValue("(iii)", server_id.pid, server_id.id2, - server_id.node); + server_id.vnn); } static PyGetSetDef py_messaging_getset[] = { |