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

Revert "Remove another use of global_loadparm."

Browse Source 
This reverts commit ee7c2170a79f1ca9e2ad1a209d342d8fd287ec8d.

A much more correct fix will come soon.
(40ef7739f4141598a6392c203e4a2d52d972fe06 from the samba4wins tree)

metze
This commit is contained in:
Stefan Metzmacher 2009-01-18 23:20:01 +01:00
parent 3b91640fbb
commit 9d4f766ae3
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcli/nbt/libnbt.h
View File

@ -122,8 +122,6 @@ struct nbt_name_socket {
struct socket_address *); struct socket_address *);
void *private_data; void *private_data;
} unexpected; } unexpected;
uint32_t wack_timeout;
}; };

3
libcli/nbt/nbtsocket.c
View File

@ -247,7 +247,7 @@ static void nbt_name_socket_recv(struct nbt_name_socket *nbtsock)
req->received_wack = true; req->received_wack = true;
/* although there can be a timeout in the packet, w2k3 screws it up, /* although there can be a timeout in the packet, w2k3 screws it up,
so better to set it ourselves */ so better to set it ourselves */
req->timeout = nbtsock->wack_timeout; req->timeout = lp_parm_int(global_loadparm, NULL, "nbt", "wack_timeout", 30);
req->te = event_add_timed(req->nbtsock->event_ctx, req, req->te = event_add_timed(req->nbtsock->event_ctx, req,
timeval_current_ofs(req->timeout, 0), timeval_current_ofs(req->timeout, 0),
nbt_name_socket_timeout, req); nbt_name_socket_timeout, req);
@ -334,7 +334,6 @@ _PUBLIC_ struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx,
nbtsock->send_queue = NULL; nbtsock->send_queue = NULL;
nbtsock->num_pending = 0; nbtsock->num_pending = 0;
nbtsock->wack_timeout = 30;
nbtsock->incoming.handler = NULL; nbtsock->incoming.handler = NULL;
nbtsock->unexpected.handler = NULL; nbtsock->unexpected.handler = NULL;
nbtsock->iconv_convenience = iconv_convenience; nbtsock->iconv_convenience = iconv_convenience;

3
libcli/nbt/pynbt.c
View File

@ -52,8 +52,7 @@ static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject *
return NULL; return NULL;
ev = s4_event_context_init(ret->mem_ctx); ev = s4_event_context_init(ret->mem_ctx);
ret->socket = nbt_name_socket_init(ret->mem_ctx, ev, ret->socket = nbt_name_socket_init(ret->mem_ctx, ev, py_iconv_convenience(ret->mem_ctx));
py_iconv_convenience(ret->mem_ctx));
return (PyObject *)ret; return (PyObject *)ret;
} }