diff options
| -rwxr-xr-x | source4/script/tests/test_swig.sh | 1 | ||||
| -rw-r--r-- | source4/scripting/swig/Ldb.py | 15 | ||||
| -rw-r--r-- | source4/scripting/swig/ldb.i | 70 | ||||
| -rwxr-xr-x | source4/scripting/swig/torture/torture_ldb.py | 6 |
4 files changed, 81 insertions, 11 deletions
diff --git a/source4/script/tests/test_swig.sh b/source4/script/tests/test_swig.sh index 3c02d2fa69..5fc609dba4 100755 --- a/source4/script/tests/test_swig.sh +++ b/source4/script/tests/test_swig.sh @@ -13,6 +13,7 @@ incdir=`dirname $0` failed=0 export PYTHONPATH=scripting/swig:$PYTHONPATH +export LD_LIBRARY_PATH=bin:$LD_LIBRARY_PATH scripting/swig/torture/torture_tdb.py || failed=`expr $failed + 1` scripting/swig/torture/torture_ldb.py || failed=`expr $failed + 1` diff --git a/source4/scripting/swig/Ldb.py b/source4/scripting/swig/Ldb.py index fe105bdb09..705a790fef 100644 --- a/source4/scripting/swig/Ldb.py +++ b/source4/scripting/swig/Ldb.py @@ -23,4 +23,17 @@ import ldb class Ldb: - pass + + def __init__(self): + self.mem_ctx = ldb.talloc_init('python ldb') + self.ldb_ctx = ldb.init(self.mem_ctx) + + def __del__(self): + ldb.talloc_free(self.mem_ctx) + + def connect(self, url, flags = 0): + ldb.connect(self.ldb_ctx, url, flags, None) + + def search(self, expression): + return ldb.search(self.ldb_ctx, None, ldb.LDB_SCOPE_DEFAULT, + expression, None); diff --git a/source4/scripting/swig/ldb.i b/source4/scripting/swig/ldb.i index 5f11b6d2ec..f7c3b5d709 100644 --- a/source4/scripting/swig/ldb.i +++ b/source4/scripting/swig/ldb.i @@ -54,10 +54,11 @@ typedef unsigned long long uint64_t; typedef long long int64_t; #include "lib/ldb/include/ldb.h" +#include "lib/talloc/talloc.h" %} -/* The ldb functions will crash if a NULL tdb is passed */ +/* The ldb functions will crash if a NULL ldb is passed */ %include exception.i @@ -67,22 +68,71 @@ typedef long long int64_t; "ldb context must be non-NULL"); } -/* Throw an IOError exception if tdb_open() or tdb_open_ex() returns NULL */ +/* Use talloc_init() to create a parameter to pass to ldb_init(). Don't + forget to free it using talloc_free() afterwards. */ -%exception { - $action - if (result == NULL) { - PyErr_SetFromErrno(PyExc_IOError); - SWIG_fail; +TALLOC_CTX *talloc_init(char *name); +int talloc_free(TALLOC_CTX *ptr); + +/* In and out typemaps for struct ldb_val. This is converted to and from + the Python string datatype. */ + +%typemap(in) struct ldb_val { + if (!PyString_Check($input)) { + PyErr_SetString(PyExc_TypeError, "string arg expected"); + return NULL; + } + $1.length = PyString_Size($input); + $1.data = PyString_AsString($input); +} + +%typemap(out) struct ldb_val { + if ($1.data == NULL && $1.length == 0) { + $result = Py_None; + } else { + $result = PyString_FromStringAndSize($1.data, $1.length); } } +enum ldb_scope {LDB_SCOPE_DEFAULT=-1, + LDB_SCOPE_BASE=0, + LDB_SCOPE_ONELEVEL=1, + LDB_SCOPE_SUBTREE=2}; + +/* Typemap for passing a struct ldb_result by reference */ + +%typemap(in, numinputs=0) struct ldb_result **OUT (struct ldb_result *temp_ldb_result) { + $1 = &temp_ldb_result; +} + +%typemap(argout) struct ldb_result ** { + unsigned int i; + + /* XXX: Handle resultobj by throwing an exception if required */ + + resultobj = PyList_New((*$1)->count); + + for (i = 0; i < (*$1)->count; i++) { + PyList_SetItem(resultobj, i, SWIG_NewPointerObj(*$1, SWIGTYPE_p_ldb_message, 0)); + } +} + +%types(struct ldb_result *); + +struct ldb_message { + struct ldb_dn *dn; + unsigned int num_elements; + struct ldb_message_element *elements; + void *private_data; /* private to the backend */ +}; + +/* Wrap ldb functions */ %rename ldb_init init; -struct ldb_context *ldb_init(void *mem_ctx); +struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx); %rename ldb_connect connect; int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[]); -%rename ldb_request request; -int ldb_request(struct ldb_context *ldb, struct ldb_request *request); +%rename ldb_search search; +int ldb_search(struct ldb_context *ldb, const struct ldb_dn *base, enum ldb_scope scope, const char *expression, const char * const *attrs, struct ldb_result **OUT); diff --git a/source4/scripting/swig/torture/torture_ldb.py b/source4/scripting/swig/torture/torture_ldb.py index 76ff43bbea..c9a3ded6da 100755 --- a/source4/scripting/swig/torture/torture_ldb.py +++ b/source4/scripting/swig/torture/torture_ldb.py @@ -6,3 +6,9 @@ def fail(msg): print 'FAILED:', msg sys.exit(1) +l = Ldb.Ldb() + +l.connect('tdb:///tmp/foo.ldb') +result = l.search('(dn=*)') + +print result |