The branch, master has been updated via a22d7db... wafsamba: Only try to build manpages if XSLTPROC was actually found. via 41cdac9... pyldb: Remove duplicate copy of function. from 38dfc48... ldb: Remove unexisting and mistyped function from header
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a22d7db30813127690d5c3758e7abfa8805e76c9 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon May 31 20:44:30 2010 +0200 wafsamba: Only try to build manpages if XSLTPROC was actually found. commit 41cdac9c3e5b2e9eea3067892a3e60b4bff67154 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon May 31 20:44:12 2010 +0200 pyldb: Remove duplicate copy of function. ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/wafsamba.py | 4 ++-- source4/lib/ldb/pyldb.c | 28 ---------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index a9b81f4..13f3f8c 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -213,7 +213,7 @@ def SAMBA_LIBRARY(bld, libname, source, if pc_files is not None: bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) - if manpages is not None and 'XSLTPROC' in bld.env: + if manpages is not None and 'XSLTPROC' in bld.env and bld.env['XSLTPROC']: bld.MANPAGES(manpages) @@ -304,7 +304,7 @@ def SAMBA_BINARY(bld, binname, source, if subsystem_name is not None: bld.TARGET_ALIAS(subsystem_name, binname) - if manpages is not None and 'XSLTPROC' in bld.env: + if manpages is not None and 'XSLTPROC' in bld.env and bld.env['XSLTPROC']: bld.MANPAGES(manpages) Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c index ce149cc..fd7584d 100644 --- a/source4/lib/ldb/pyldb.c +++ b/source4/lib/ldb/pyldb.c @@ -81,34 +81,6 @@ static PyObject *PyObject_FromLdbValue(struct ldb_context *ldb_ctx, } /** - * Obtain a ldb DN from a Python object. - * - * @param mem_ctx Memory context - * @param object Python object - * @param ldb_ctx LDB context - * @return Whether or not the conversion succeeded - */ -bool PyObject_AsDn(TALLOC_CTX *mem_ctx, PyObject *object, - struct ldb_context *ldb_ctx, struct ldb_dn **dn) -{ - struct ldb_dn *odn; - - if (ldb_ctx != NULL && PyString_Check(object)) { - odn = ldb_dn_new(mem_ctx, ldb_ctx, PyString_AsString(object)); - *dn = odn; - return true; - } - - if (PyLdbDn_Check(object)) { - *dn = PyLdbDn_AsDn(object); - return true; - } - - PyErr_SetString(PyExc_TypeError, "Expected DN"); - return false; -} - -/** * Create a Python object from a ldb_result. * * @param result LDB result to convert -- Samba Shared Repository