From e9c3f2ef13f62eb583bd7c5dfb6b94a0a8a0fc4f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 4 Apr 2010 02:01:47 +0200 Subject: s4-python: Move ldb_set_utf8_casefold to pyldb-samba. --- source4/lib/ldb-samba/pyldb.c | 19 ++++++++++++++++++- source4/lib/ldb/tests/python/deletetest.py | 1 - 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb-samba/pyldb.c b/source4/lib/ldb-samba/pyldb.c index 54907d9ff8..bb066ed711 100644 --- a/source4/lib/ldb-samba/pyldb.c +++ b/source4/lib/ldb-samba/pyldb.c @@ -25,6 +25,8 @@ #include "lib/ldb/pyldb.h" #include "param/pyparam.h" #include "auth/credentials/pycredentials.h" +#include "ldb_wrap.h" +#include "lib/ldb-samba/ldif_handlers.h" static PyObject *pyldb_module; staticforward PyTypeObject PySambaLdb; @@ -136,15 +138,30 @@ static PyObject *py_ldb_set_opaque_integer(PyObject *self, PyObject *args) Py_RETURN_NONE; } +static PyObject *py_ldb_set_utf8_casefold(PyObject *self, PyObject *args) +{ + struct ldb_context *ldb; + + ldb = PyLdb_AsLdbContext(self); + + ldb_set_utf8_fns(ldb, NULL, wrap_casefold); + + Py_RETURN_NONE; +} + static PyMethodDef py_samba_ldb_methods[] = { { "set_loadparm", (PyCFunction)py_ldb_set_loadparm, METH_VARARGS, "ldb_set_loadparm(ldb, session_info)\n" "Set loadparm context to use when connecting." }, - { "ldb_set_credentials", (PyCFunction)py_ldb_set_credentials, METH_VARARGS, + { "set_credentials", (PyCFunction)py_ldb_set_credentials, METH_VARARGS, "ldb_set_credentials(ldb, credentials)\n" "Set credentials to use when connecting." }, { "set_opaque_integer", (PyCFunction)py_ldb_set_opaque_integer, METH_VARARGS, NULL }, + { "set_utf8_casefold", (PyCFunction)py_ldb_set_utf8_casefold, + METH_NOARGS, + "ldb_set_utf8_casefold(ldb)\n" + "Set the right Samba casefolding function for UTF8 charset." }, { NULL }, }; diff --git a/source4/lib/ldb/tests/python/deletetest.py b/source4/lib/ldb/tests/python/deletetest.py index eff92c5f33..55f34fac14 100755 --- a/source4/lib/ldb/tests/python/deletetest.py +++ b/source4/lib/ldb/tests/python/deletetest.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import getopt import optparse import sys import os -- cgit