r21585: Start syncing the monster that will become 3.0.25pre1

Still todo:

* release notes
* few minor outstanding patches
* additional idmap man pages

2 files changed, 4 insertions, 4 deletions

diff --git a/source/python/py_lsa.c b/source/python/py_lsa.c
index 915223a5bb7..068190c0202 100644
--- a/source/python/py_lsa.c
+++ b/source/python/py_lsa.c
@@ -147,7 +147,7 @@ static PyObject *lsa_lookup_names(PyObject *self, PyObject *args)
 	const char **names;
 	DOM_SID *sids;
 	TALLOC_CTX *mem_ctx = NULL;
-	uint32 *name_types;
+	enum lsa_SidType *name_types;
 
 	if (!PyArg_ParseTuple(args, "O", &py_names))
 		return NULL;
diff --git a/source/python/py_smb.c b/source/python/py_smb.c
index 679c113f397..2f5d1161d87 100644
--- a/source/python/py_smb.c
+++ b/source/python/py_smb.c
@@ -43,7 +43,7 @@ static PyObject *py_smb_connect(PyObject *self, PyObject *args, PyObject *kw)
 	if (!PyArg_ParseTupleAndKeywords(args, kw, "s", kwlist, &server))
 		return NULL;
 
-	if (!(cli = cli_initialise(NULL)))
+	if (!(cli = cli_initialise()))
 		return NULL;
 
 	ZERO_STRUCT(ip);
@@ -99,7 +99,7 @@ static PyObject *py_smb_session_setup(PyObject *self, PyObject *args,
 	static char *kwlist[] = { "creds", NULL };
 	PyObject *creds;
 	char *username, *domain, *password, *errstr;
-	BOOL result;
+	NTSTATUS result;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kw, "|O", kwlist, &creds))
 		return NULL;
@@ -118,7 +118,7 @@ static PyObject *py_smb_session_setup(PyObject *self, PyObject *args,
 		return NULL;
 	}
 
-	return Py_BuildValue("i", result);
+	return Py_BuildValue("i", NT_STATUS_IS_OK(result));
 }
 
 static PyObject *py_smb_tconx(PyObject *self, PyObject *args, PyObject *kw)