svn commit: samba r22817 - in branches/SAMBA_3_0_RELEASE: .
examples/pdb source/python
jerry at samba.org
jerry at samba.org
Sat May 12 19:33:49 GMT 2007
Author: jerry
Date: 2007-05-12 19:33:48 +0000 (Sat, 12 May 2007)
New Revision: 22817
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22817
Log:
grab Steve's --with-python fix and update release notes
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/examples/pdb/README
branches/SAMBA_3_0_RELEASE/source/python/py_ntsec.c
branches/SAMBA_3_0_RELEASE/source/python/py_spoolss_printers_conv.c
branches/SAMBA_3_0_RELEASE/source/python/py_srvsvc.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-05-12 17:37:11 UTC (rev 22816)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-05-12 19:33:48 UTC (rev 22817)
@@ -165,6 +165,10 @@
specified.
+o Steve Langasek <vorlon at debian.org>
+ * BUG 4600: Fix compilation of --with-python.
+
+
o Volker Lendecke <vl at samba.org>
* Fix memory corruption bug in string_replace().
* Fix valgrind error in parse_domain_user().
@@ -586,9 +590,9 @@
* Work on NFSv4 ACL VFS plugin.
-o Lars Mueller <lmuelle at samba.org>
+o Lars Mueller <lars at 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.
Modified: branches/SAMBA_3_0_RELEASE/examples/pdb/README
===================================================================
--- branches/SAMBA_3_0_RELEASE/examples/pdb/README 2007-05-12 17:37:11 UTC (rev 22816)
+++ branches/SAMBA_3_0_RELEASE/examples/pdb/README 2007-05-12 19:33:48 UTC (rev 22817)
@@ -14,3 +14,7 @@
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/.
Modified: branches/SAMBA_3_0_RELEASE/source/python/py_ntsec.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/python/py_ntsec.c 2007-05-12 17:37:11 UTC (rev 22816)
+++ branches/SAMBA_3_0_RELEASE/source/python/py_ntsec.c 2007-05-12 19:33:48 UTC (rev 22817)
@@ -60,7 +60,7 @@
*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 @@
!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 @@
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 @@
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 @@
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);
}
Modified: branches/SAMBA_3_0_RELEASE/source/python/py_spoolss_printers_conv.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/python/py_spoolss_printers_conv.c 2007-05-12 17:37:11 UTC (rev 22816)
+++ branches/SAMBA_3_0_RELEASE/source/python/py_spoolss_printers_conv.c 2007-05-12 19:33:48 UTC (rev 22817)
@@ -103,7 +103,6 @@
};
struct pyconv py_PRINTER_INFO_3[] = {
- { "flags", PY_UINT32, offsetof(PRINTER_INFO_3, flags) },
{ NULL }
};
Modified: branches/SAMBA_3_0_RELEASE/source/python/py_srvsvc.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/python/py_srvsvc.c 2007-05-12 17:37:11 UTC (rev 22816)
+++ branches/SAMBA_3_0_RELEASE/source/python/py_srvsvc.c 2007-05-12 19:33:48 UTC (rev 22817)
@@ -122,7 +122,7 @@
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;
}
More information about the samba-cvs
mailing list