sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

Make error handling in ldb more consistant.

Browse Source 
This change ensures we give an immidiate error if the DN won't parse.

Also clean up strcmp use to be more standard.

Andrew Bartlett
(This used to be commit 1b15f374a89b99f3c43d9c2ce06dde9c67383e66)
This commit is contained in:
Andrew Bartlett 2008-03-11 14:20:42 +11:00
parent db06d932c8
commit 7da5ec17e6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/lib/ldb/ldb.i
View File

@ -258,6 +258,9 @@ int ldb_dn_from_pyobject(TALLOC_CTX *mem_ctx, PyObject *object,
struct ldb_dn *odn;
if (ldb_ctx != NULL && PyString_Check(object)) {
*dn = ldb_dn_new(mem_ctx, ldb_ctx, PyString_AsString(object));
if (!*dn) {
return SWIG_ERROR;
}
return 0;
}
ret = SWIG_ConvertPtr(object, (void **)&odn, SWIGTYPE_p_ldb_dn,
@ -566,7 +569,7 @@ PyObject *PyExc_LdbError;
$1->elements = talloc_zero_array($1, struct ldb_message_element, PyDict_Size($input));
msg_pos = dict_pos = 0;
while (PyDict_Next($input, &dict_pos, &key, &value)) {
if (!strcmp(PyString_AsString(key), "dn")) {
if (strcmp(PyString_AsString(key), "dn") == 0) {
/* using argp0 (magic SWIG value) here is a hack */
if (ldb_dn_from_pyobject($1, value, argp1, &$1->dn) != 0) {
SWIG_exception(SWIG_TypeError, "unable to import dn object");