[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

Hi Matthias,

On Fri, Oct 23, 2009 at 07:28:04AM -0500, Matthias Dieter Wallnöfer wrote:
> The branch, master has been updated
>        via  4f8826f... ldb python bindungs - better use the "enum ldb_scope" for the search scope rather than "int"
>       from  b9a3f1d... s3: Fix crash in pam_winbind, another reference to freed memory.
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
> 
> 
> - Log -----------------------------------------------------------------
> commit 4f8826ff7f4789c5b5f363b733a42053f72aa526
> Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
> Date:   Fri Oct 23 14:26:41 2009 +0200
> 
>     ldb python bindungs - better use the "enum ldb_scope" for the search scope rather than "int"
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  source4/lib/ldb/pyldb.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
> index d4a369c..136cd47 100644
> --- a/source4/lib/ldb/pyldb.c
> +++ b/source4/lib/ldb/pyldb.c
> @@ -1006,7 +1006,7 @@ static PyObject *py_ldb_schema_format_value(PyLdbObject *self, PyObject *args)
>  static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwargs)
>  {
>  	PyObject *py_base = Py_None;
> -	int scope = LDB_SCOPE_DEFAULT;
> +	enum ldb_scope scope = LDB_SCOPE_DEFAULT;
>  	char *expr = NULL;
>  	PyObject *py_attrs = Py_None;
>  	PyObject *py_controls = Py_None;
> @@ -1348,7 +1348,8 @@ static PyObject *py_ldb_module_del_transaction(PyLdbModuleObject *self)
>  static PyObject *py_ldb_module_search(PyLdbModuleObject *self, PyObject *args, PyObject *kwargs)
>  {
>  	PyObject *py_base, *py_tree, *py_attrs, *py_ret;
> -	int ret, scope;
> +	int ret;
> +	enum ldb_scope scope;
>  	struct ldb_request *req;
>  	const char * const kwnames[] = { "base", "scope", "tree", "attrs", NULL };
>  	struct ldb_module *mod;
> 
Please revert this - this is intentional. PyArg_ParseTupleAndKeywords parses 
and sets an integer, not an ldb_scope enum. The values it reads are not 
necessarily valid ldb_scope values.

Cheers,

Jelmer