sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4/dsdb: python3 api should take 'bytes'

Browse Source 
Attributes are properly represented by 'bytes' and *maybe* can be
converted into strings (if they are text).
py_dsdb_normalise_attributes currently expects strings, this is fine
in python2 however in python3 we need to actually pass a 'bytes'
class.

Signed-off-by: Noel Power <noel.power@suse.com>
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power 2018-02-22 12:49:36 +00:00 committed by Andrew Bartlett
parent 4c02d5cafe
commit 0d65c1ef65
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/dsdb/pydsdb.c
View File

@ -625,7 +625,6 @@ static PyObject *py_dsdb_normalise_attributes(PyObject *self, PyObject *args)
TALLOC_CTX *tmp_ctx; TALLOC_CTX *tmp_ctx;
WERROR werr; WERROR werr;
Py_ssize_t i; Py_ssize_t i;
Py_ssize_t _size;
PyTypeObject *py_type = NULL; PyTypeObject *py_type = NULL;
PyObject *module = NULL; PyObject *module = NULL;
@ -688,13 +687,16 @@ static PyObject *py_dsdb_normalise_attributes(PyObject *self, PyObject *args)
for (i = 0; i < el->num_values; i++) { for (i = 0; i < el->num_values; i++) {
PyObject *item = PyList_GetItem(el_list, i); PyObject *item = PyList_GetItem(el_list, i);
if (!PyStr_Check(item)) { if (!PyBytes_Check(item)) {
PyErr_Format(PyExc_TypeError, "ldif_elements should be strings"); PyErr_Format(PyExc_TypeError,
"ldif_element type should be "
PY_DESC_PY3_BYTES
);
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
return NULL; return NULL;
} }
el->values[i].data = (uint8_t *)PyStr_AsUTF8AndSize(item, &_size);; el->values[i].data = (uint8_t *)PyBytes_AsString(item);
el->values[i].length = _size; el->values[i].length = PyBytes_Size(item);
} }
} }