[SCM] Samba Shared Repository - branch master updated - 0b0b11e3d98b08c9097ab621a55769bff9f550c2

[Jelmer Vernooij]

The branch, master has been updated
       via  0b0b11e3d98b08c9097ab621a55769bff9f550c2 (commit)
      from  791f9e09b82b5382f6005482a4e3faa62ce30fae (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0b0b11e3d98b08c9097ab621a55769bff9f550c2
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Fri Oct 24 16:52:25 2008 +0200

    Fix the build.

-----------------------------------------------------------------------

Summary of changes:
 libcli/nbt/pynbt.c      |    4 ++--
 source4/libnet/py_net.c |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 3200482..9179245 100644
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -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;
 
diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index d8faa4f..37d51d7 100644
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -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)
 {


-- 
Samba Shared Repository