summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-18 23:20:01 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-19 07:05:20 +0100
commit9d4f766ae35176b0597dd359d692e4166c2314fc (patch)
tree7459690bcbdd257d354001d1cf67e3742bb4159a
parent3b91640fbb16b5ab248d2fa4d2832f61dac29944 (diff)
downloadsamba-9d4f766ae35176b0597dd359d692e4166c2314fc.tar.gz
samba-9d4f766ae35176b0597dd359d692e4166c2314fc.tar.bz2
samba-9d4f766ae35176b0597dd359d692e4166c2314fc.zip
Revert "Remove another use of global_loadparm."
This reverts commit ee7c2170a79f1ca9e2ad1a209d342d8fd287ec8d. A much more correct fix will come soon. (40ef7739f4141598a6392c203e4a2d52d972fe06 from the samba4wins tree) metze
-rw-r--r--libcli/nbt/libnbt.h2
-rw-r--r--libcli/nbt/nbtsocket.c3
-rw-r--r--libcli/nbt/pynbt.c3
3 files changed, 2 insertions, 6 deletions
diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h
index 0c4420cd40..f5191656ed 100644
--- a/libcli/nbt/libnbt.h
+++ b/libcli/nbt/libnbt.h
@@ -122,8 +122,6 @@ struct nbt_name_socket {
struct socket_address *);
void *private_data;
} unexpected;
-
- uint32_t wack_timeout;
};
diff --git a/libcli/nbt/nbtsocket.c b/libcli/nbt/nbtsocket.c
index 780e2bbc82..083cef96e8 100644
--- a/libcli/nbt/nbtsocket.c
+++ b/libcli/nbt/nbtsocket.c
@@ -247,7 +247,7 @@ static void nbt_name_socket_recv(struct nbt_name_socket *nbtsock)
req->received_wack = true;
/* although there can be a timeout in the packet, w2k3 screws it up,
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,
timeval_current_ofs(req->timeout, 0),
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->num_pending = 0;
- nbtsock->wack_timeout = 30;
nbtsock->incoming.handler = NULL;
nbtsock->unexpected.handler = NULL;
nbtsock->iconv_convenience = iconv_convenience;
diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 63ee9bb01f..9be6c79a8b 100644
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -52,8 +52,7 @@ static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject *
return NULL;
ev = s4_event_context_init(ret->mem_ctx);
- ret->socket = nbt_name_socket_init(ret->mem_ctx, ev,
- py_iconv_convenience(ret->mem_ctx));
+ ret->socket = nbt_name_socket_init(ret->mem_ctx, ev, py_iconv_convenience(ret->mem_ctx));
return (PyObject *)ret;
}