sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

s4:lib/messaging: terminate the irpc_servers_byname() result with server_id_set_disconnected() (bug #9540)

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2013-01-04 13:27:26 +01:00 committed by Andrew Bartlett
parent 2cc6f9ce7f
commit 8d9a77f864
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/lib/messaging/messaging.c
View File

@ -982,7 +982,7 @@ struct server_id *irpc_servers_byname(struct imessaging_context *msg_ctx,
for (i=0;i<count;i++) {
ret[i] = ((struct server_id *)rec.dptr)[i];
}
ret[i] = cluster_id(0, 0);
server_id_set_disconnected(&ret[i]);
free(rec.dptr);
tdb_unlock_bystring(t->tdb, name);
talloc_free(t);
@ -1419,7 +1419,7 @@ struct dcerpc_binding_handle *irpc_binding_handle_by_name(TALLOC_CTX *mem_ctx,
errno = EADDRNOTAVAIL;
return NULL;
}
if (sids[0].pid == 0) {
if (server_id_is_disconnected(&sids[0])) {
talloc_free(sids);
errno = EADDRNOTAVAIL;
return NULL;

4
source4/lib/messaging/pymessaging.c
View File

@ -247,7 +247,7 @@ static PyObject *py_irpc_servers_byname(PyObject *self, PyObject *args, PyObject
return NULL;
}
for (i = 0; ids[i].pid != 0; i++) {
for (i = 0; !server_id_is_disconnected(&ids[i]); i++) {
/* Do nothing */
}
@ -257,7 +257,7 @@ static PyObject *py_irpc_servers_byname(PyObject *self, PyObject *args, PyObject
PyErr_NoMemory();
return NULL;
}
for (i = 0; ids[i].pid; i++) {
for (i = 0; !server_id_is_disconnected(&ids[i]); i++) {
PyObject *py_server_id;
struct server_id *p_server_id = talloc(NULL, struct server_id);
if (!p_server_id) {