r22817: grab Steve's --with-python fix and update release notes

5 files changed, 18 insertions, 11 deletions

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7d95b25048d..8a0b11d8da8 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -165,6 +165,10 @@ o   Steve French <sfrench@us.ibm.com>
       specified.
 
 
+o   Steve Langasek <vorlon@debian.org>
+    * BUG 4600: Fix compilation of --with-python.
+
+
 o   Volker Lendecke <vl@samba.org>
     * Fix memory corruption bug in string_replace().
     * Fix valgrind error in parse_domain_user().
@@ -586,9 +590,9 @@ o   Gomati Mohanan <gomati.mohanan@in.ibm.com>
     * Work on NFSv4 ACL VFS plugin.
 
 
-o   Lars Mueller <lmuelle@samba.org>
+o   Lars Mueller <lars@samba.org>
     * Provide better feedback about deprecated use of multiple passdb
-      backends.
+      backends.  Use the first backend to have at least this one working.
     * Fix make install to include smbmount, et. al. docs.
     * Merge more proto_exists dependency fixes from SAMBA_3_0.
     * Makefile cleanups.
diff --git a/examples/pdb/README b/examples/pdb/README
index baceb8e6009..692d32225d2 100644
--- a/examples/pdb/README
+++ b/examples/pdb/README
@@ -14,3 +14,7 @@ debugger.
 
 New passdb plugins should go into the samba lib directory, (/usr/lib/samba/pdb/
 for most distributions). An example would be: /usr/lib/samba/pdb/test.so
+
+Be aware that the SQL and XML based passdb modules have been removed since the
+3.0.23 release.  More information of external support for SQL passdb modules
+can be found at http://pdbsql.sourceforge.net/.
diff --git a/source/python/py_ntsec.c b/source/python/py_ntsec.c
index 38886f679e0..f832b22fe01 100644
--- a/source/python/py_ntsec.c
+++ b/source/python/py_ntsec.c
@@ -60,7 +60,7 @@ BOOL py_from_ACE(PyObject **dict, SEC_ACE *ace)
 
 	*dict = Py_BuildValue("{sisisi}", "type", ace->type,
 	    			"flags", ace->flags,
-				"mask", ace->info.mask);
+				"mask", ace->access_mask);
 
 	if (py_from_SID(&obj, &ace->trustee)) {
 		PyDict_SetItemString(*dict, "trustee", obj);
@@ -103,7 +103,7 @@ BOOL py_to_ACE(SEC_ACE *ace, PyObject *dict)
 	    !PyInt_Check(obj))
 		return False;
 
-	sec_access.mask = PyInt_AsLong(obj);
+	sec_access = PyInt_AsLong(obj);
 
 	init_sec_ace(ace, &trustee, ace_type, sec_access, ace_flags);
 
@@ -130,7 +130,7 @@ BOOL py_from_ACL(PyObject **dict, SEC_ACL *acl)
 	for (i = 0; i < acl->num_aces; i++) {
 		PyObject *obj;
 
-		if (py_from_ACE(&obj, &acl->ace[i]))
+		if (py_from_ACE(&obj, &acl->aces[i]))
 			PyList_SetItem(ace_list, i, obj);
 	}
 
@@ -157,16 +157,16 @@ BOOL py_to_ACL(SEC_ACL *acl, PyObject *dict, TALLOC_CTX *mem_ctx)
 	
 	acl->num_aces = PyList_Size(obj);
 
-	acl->ace = _talloc(mem_ctx, acl->num_aces * sizeof(SEC_ACE));
+	acl->aces = _talloc(mem_ctx, acl->num_aces * sizeof(SEC_ACE));
 	acl->size = SEC_ACL_HEADER_SIZE;
 
 	for (i = 0; i < acl->num_aces; i++) {
 		PyObject *py_ace = PyList_GetItem(obj, i);
 
-		if (!py_to_ACE(&acl->ace[i], py_ace))
+		if (!py_to_ACE(&acl->aces[i], py_ace))
 			return False;
 
-		acl->size += acl->ace[i].size;
+		acl->size += acl->aces[i].size;
 	}
 
 	return True;
@@ -191,7 +191,7 @@ BOOL py_from_SECDESC(PyObject **dict, SEC_DESC *sd)
 		Py_DECREF(obj);
 	}
 
-	if (py_from_SID(&obj, sd->grp_sid)) {
+	if (py_from_SID(&obj, sd->group_sid)) {
 		PyDict_SetItemString(*dict, "group_sid", obj);
 		Py_DECREF(obj);
 	}
diff --git a/source/python/py_spoolss_printers_conv.c b/source/python/py_spoolss_printers_conv.c
index 4ab030d9619..a36291f62d1 100644
--- a/source/python/py_spoolss_printers_conv.c
+++ b/source/python/py_spoolss_printers_conv.c
@@ -103,7 +103,6 @@ struct pyconv py_PRINTER_INFO_2[] = {
 };	
 
 struct pyconv py_PRINTER_INFO_3[] = {
-	{ "flags", PY_UINT32, offsetof(PRINTER_INFO_3, flags) },
 	{ NULL }
 };	
 
diff --git a/source/python/py_srvsvc.c b/source/python/py_srvsvc.c
index 03ed7fd84b1..4e5649bdb87 100644
--- a/source/python/py_srvsvc.c
+++ b/source/python/py_srvsvc.c
@@ -122,7 +122,7 @@ PyObject *srvsvc_netservergetinfo(PyObject *self, PyObject *args,
 
 	status = rpccli_srvsvc_net_srv_get_info(cli->pipe_list, mem_ctx, level, &ctr);
 
-	if (!NT_STATUS_IS_OK(status)) {
+	if (!W_ERROR_IS_OK(status)) {
 		PyErr_SetObject(srvsvc_error, py_werror_tuple(status));
 		goto done;
 	}