summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-24 13:13:27 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-24 13:13:27 +0200
commit8b06312f7eeff5ea8625677478792888774bd2be (patch)
treecd1d662f3e7e43a0c5ed667d396592f6aa6c941a /source4/lib
parent5d146d0178d7da8d8f14f340dacb5b01fd03fab8 (diff)
downloadsamba-8b06312f7eeff5ea8625677478792888774bd2be.tar.gz
samba-8b06312f7eeff5ea8625677478792888774bd2be.tar.bz2
samba-8b06312f7eeff5ea8625677478792888774bd2be.zip
Eliminate another instance of global_loadparm.
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/messaging/pymessaging.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 621a2fe349..fb23214bca 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include <Python.h>
+#include "scripting/python/modules.h"
#include "libcli/util/pyerrors.h"
#include "librpc/rpc/pyrpc.h"
#include "lib/messaging/irpc.h"
@@ -347,12 +348,12 @@ PyObject *py_irpc_connect(PyTypeObject *self, PyObject *args, PyObject *kwargs)
ret->msg_ctx = messaging_init(ret->mem_ctx,
messaging_path,
server_id,
- lp_iconv_convenience(global_loadparm),
+ py_iconv_convenience(ret->mem_ctx),
ev);
} else {
ret->msg_ctx = messaging_client_init(ret->mem_ctx,
messaging_path,
- lp_iconv_convenience(global_loadparm),
+ py_iconv_convenience(ret->mem_ctx),
ev);
}