The branch, master has been updated via 4a272b83af6 s3:passdb: Use discard_const_p() in py_passdb via 2a6e7f3a5f7 s4:dsdb: Use const char in py_dsdb_garbage_collect_tombstones() via 50fdf67b344 s4:librpc: Use discard_const_p for ndr/py_misc via 0595129b8e3 libldb: Fix const char in pyldb from 483d5ea5c88 CI: Autobuild: Remove build_samba_ad_dc_2_py3 CI job
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 4a272b83af6958a436821daacaa3876dd991e6ba Author: Andreas Schneider <a...@samba.org> Date: Mon Nov 12 18:27:44 2018 +0100 s3:passdb: Use discard_const_p() in py_passdb Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Uri Simchoni <u...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Wed Nov 14 11:46:06 CET 2018 on sn-devel-144 commit 2a6e7f3a5f76a74464161666b38c35e3f9aa1386 Author: Andreas Schneider <a...@samba.org> Date: Mon Nov 12 18:20:49 2018 +0100 s4:dsdb: Use const char in py_dsdb_garbage_collect_tombstones() Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Uri Simchoni <u...@samba.org> commit 50fdf67b3442d1690c312c5e34eee92e03cf6da9 Author: Andreas Schneider <a...@samba.org> Date: Mon Nov 12 18:19:51 2018 +0100 s4:librpc: Use discard_const_p for ndr/py_misc Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Uri Simchoni <u...@samba.org> commit 0595129b8e36a62dd46d543e33866cda8293f2a9 Author: Andreas Schneider <a...@samba.org> Date: Mon Nov 12 17:19:21 2018 +0100 libldb: Fix const char in pyldb ../lib/ldb/pyldb.c: In function ‘PyDict_AsMessage’: ../lib/ldb/pyldb.c:90:22: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] #define PyStr_AsUTF8 PyUnicode_AsUTF8 ^~~~~~~~~~~~~~~~ ../lib/ldb/pyldb.c:1359:19: note: in expansion of macro ‘PyStr_AsUTF8’ char *key_str = PyStr_AsUTF8(key); ^~~~~~~~~~~~ ../lib/ldb/pyldb.c: In function ‘py_ldb_msg_getitem_helper’: ../lib/ldb/pyldb.c:3336:7: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] name = PyStr_AsUTF8(py_name); ^ ../lib/ldb/pyldb.c: In function ‘py_ldb_msg_setitem’: ../lib/ldb/pyldb.c:3502:12: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] attr_name = PyStr_AsUTF8(name); ^ Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Uri Simchoni <u...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/ldb/pyldb.c | 6 +++--- source3/passdb/py_passdb.c | 4 ++-- source4/dsdb/pydsdb.c | 2 +- source4/librpc/ndr/py_misc.c | 8 +++++--- 4 files changed, 11 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c index 3ed9d303e44..b417d4cf754 100644 --- a/lib/ldb/pyldb.c +++ b/lib/ldb/pyldb.c @@ -1356,7 +1356,7 @@ static struct ldb_message *PyDict_AsMessage(TALLOC_CTX *mem_ctx, } while (PyDict_Next(py_obj, &dict_pos, &key, &value)) { - char *key_str = PyStr_AsUTF8(key); + const char *key_str = PyStr_AsUTF8(key); if (ldb_attr_cmp(key_str, "dn") != 0) { msg_el = PyObject_AsMessageElement(msg->elements, value, mod_flags, key_str); @@ -3331,7 +3331,7 @@ static PyObject *py_ldb_msg_keys(PyLdbMessageObject *self) static PyObject *py_ldb_msg_getitem_helper(PyLdbMessageObject *self, PyObject *py_name) { struct ldb_message_element *el; - char *name; + const char *name; struct ldb_message *msg = pyldb_Message_AsMessage(self); name = PyStr_AsUTF8(py_name); if (name == NULL) { @@ -3497,7 +3497,7 @@ static PyObject *py_ldb_msg_iter(PyLdbMessageObject *self) static int py_ldb_msg_setitem(PyLdbMessageObject *self, PyObject *name, PyObject *value) { - char *attr_name; + const char *attr_name; attr_name = PyStr_AsUTF8(name); if (attr_name == NULL) { diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c index 1bcf3f667ec..3d8012f2c06 100644 --- a/source3/passdb/py_passdb.c +++ b/source3/passdb/py_passdb.c @@ -3081,10 +3081,10 @@ static PyObject *py_pdb_set_trusted_domain(PyObject *self, PyObject *args) } py_tmp = PyDict_GetItemString(py_td_info, "domain_name"); - td_info.domain_name = PyStr_AsString(py_tmp); + td_info.domain_name = discard_const_p(char, PyStr_AsString(py_tmp)); py_tmp = PyDict_GetItemString(py_td_info, "netbios_name"); - td_info.netbios_name = PyStr_AsString(py_tmp); + td_info.netbios_name = discard_const_p(char, PyStr_AsString(py_tmp)); py_tmp = PyDict_GetItemString(py_td_info, "security_identifier"); td_info.security_identifier = *pytalloc_get_type(py_tmp, struct dom_sid); diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c index 36cc80d4535..7bbceb35a92 100644 --- a/source4/dsdb/pydsdb.c +++ b/source4/dsdb/pydsdb.c @@ -1276,7 +1276,7 @@ static PyObject *py_dsdb_garbage_collect_tombstones(PyObject *self, PyObject *ar length = PyList_GET_SIZE(py_list_dn); for (i = 0; i < length; i++) { - char *part_str = PyStr_AsString(PyList_GetItem(py_list_dn, i)); + const char *part_str = PyStr_AsString(PyList_GetItem(py_list_dn, i)); struct ldb_dn *p; struct dsdb_ldb_dn_list_node *node; diff --git a/source4/librpc/ndr/py_misc.c b/source4/librpc/ndr/py_misc.c index 6c0b8b2af14..181f19aec92 100644 --- a/source4/librpc/ndr/py_misc.c +++ b/source4/librpc/ndr/py_misc.c @@ -104,10 +104,12 @@ static int py_GUID_init(PyObject *self, PyObject *args, PyObject *kwargs) if (!IsPy3Bytes(str)) { guid_val.data = - (uint8_t *)PyStr_AsUTF8AndSize(str, - &_size); + discard_const_p(uint8_t, + PyStr_AsUTF8AndSize(str, &_size)); } else { - guid_val.data = (uint8_t *)PyBytes_AsString(str); + guid_val.data = + discard_const_p(uint8_t, + PyBytes_AsString(str)); _size = PyBytes_Size(str); } guid_val.length = _size; -- Samba Shared Repository