Fix the build.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 24 Oct 2008 14:52:25 +0000 (16:52 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 24 Oct 2008 14:52:25 +0000 (16:52 +0200)
libcli/nbt/pynbt.c
source4/libnet/py_net.c

index 3200482491c7629630aa4a27784297d218699ad4..9179245e88777bfaf3641fcf3227daa74159e4c6 100644 (file)
@@ -48,7 +48,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, lp_iconv_convenience(global_loadparm));
+       ret->socket = nbt_name_socket_init(ret->mem_ctx, ev, py_iconv_convenience(ret->mem_ctx));
        return (PyObject *)ret;
 }
 
@@ -171,7 +171,7 @@ static PyObject *py_nbt_name_query(PyObject *self, PyObject *args, PyObject *kwa
                return NULL;
        PyTuple_SetItem(ret, 0, PyString_FromString(io.out.reply_from));
 
-       py_name = PyObject_FromNBTName(node->socket, lp_iconv_convenience(global_loadparm), &io.out.name);
+       py_name = PyObject_FromNBTName(node->socket, py_iconv_convenience(node->socket), &io.out.name);
        if (py_name == NULL)
                return NULL;
 
index d8faa4fe6c53d7ce3b9a33ba8bb352184c5ddb31..37d51d78409ab8ac208c22e9e9b11979017bc2ca 100644 (file)
@@ -22,6 +22,7 @@
 #include "libnet.h"
 #include "libcli/security/security.h"
 #include "lib/events/events.h"
+#include "param/param.h"
 
 static struct libnet_context *py_net_ctx(PyObject *obj, struct event_context *ev)
 {