[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  4c79fbf... ldb:python bindings - make the intention by Jelmer ("int" vs. "enum") more clear
       via  aa46400... Revert "ldb python bindungs - better use the "enum ldb_scope" for the search scope rather than "int""
      from  354038f... s3/docs: Document new pdbedit -K option.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4c79fbfbe57d56e9795e85537f00dd023eec78d4
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Tue Oct 27 19:11:15 2009 +0100

    ldb:python bindings - make the intention by Jelmer ("int" vs. "enum") more clear

commit aa46400cb217c3869729433d2439e6ce3146ca84
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Tue Oct 27 19:07:53 2009 +0100

    Revert "ldb python bindungs - better use the "enum ldb_scope" for the search scope rather than "int""
    
    This reverts commit 4f8826ff7f4789c5b5f363b733a42053f72aa526.
    
    Jelmer pointed out that the "enum"s don't work so well in combination with python.

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/pyldb.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index 136cd47..901d121 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;
-	enum ldb_scope scope = LDB_SCOPE_DEFAULT;
+	int scope = LDB_SCOPE_DEFAULT;
 	char *expr = NULL;
 	PyObject *py_attrs = Py_None;
 	PyObject *py_controls = Py_None;
@@ -1020,6 +1020,7 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwar
 	struct ldb_dn *base;
 	PyObject *py_ret;
 
+	/* type "int" rather than "enum" for "scope" is intentional */
 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OizOO",
 					 discard_const_p(char *, kwnames),
 					 &py_base, &scope, &expr, &py_attrs, &py_controls))
@@ -1348,13 +1349,13 @@ 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;
-	enum ldb_scope scope;
+	int ret, scope;
 	struct ldb_request *req;
 	const char * const kwnames[] = { "base", "scope", "tree", "attrs", NULL };
 	struct ldb_module *mod;
 	const char * const*attrs;
 
+	/* type "int" rather than "enum" for "scope" is intentional */
 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OiOO",
 					 discard_const_p(char *, kwnames),
 					 &py_base, &scope, &py_tree, &py_attrs))


-- 
Samba Shared Repository