summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-09-22 22:36:36 -0700
committerMatthieu Patou <mat@samba.org>2011-09-23 09:22:56 +0200
commit4383665101db5c2ddb37d5c90ee9304e468b0310 (patch)
tree0784772e87d38c721411f4a92722d5ec4ce0b616 /source4
parent766d43efde768427ee2ab7fe7f1f958a794e74da (diff)
downloadsamba-4383665101db5c2ddb37d5c90ee9304e468b0310.tar.gz
samba-4383665101db5c2ddb37d5c90ee9304e468b0310.tar.bz2
samba-4383665101db5c2ddb37d5c90ee9304e468b0310.zip
python-s4: use PyErr_SetNTSTATUS instead of PyErr_NTSTATUS_IS_ERR_RAISE as it use NT_STATUS_IS_ERROR which is not completely the same as NT_STATUS_IS_OK
Autobuild-User: Matthieu Patou <mat@samba.org> Autobuild-Date: Fri Sep 23 09:22:56 CEST 2011 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/posix/python/pyxattr_tdb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index a08557e08d..768dcbcafd 100644
--- a/source4/ntvfs/posix/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
@@ -60,8 +60,9 @@ static PyObject *py_wrap_setxattr(PyObject *self, PyObject *args)
status = push_xattr_blob_tdb_raw(eadb, mem_ctx, attribute, filename, -1,
&blob);
if (!NT_STATUS_IS_OK(status)) {
+ PyErr_SetNTSTATUS(status);
talloc_free(mem_ctx);
- PyErr_NTSTATUS_IS_ERR_RAISE(status);
+ return NULL;
}
talloc_free(mem_ctx);
Py_RETURN_NONE;
@@ -90,8 +91,9 @@ static PyObject *py_wrap_getxattr(PyObject *self, PyObject *args)
status = pull_xattr_blob_tdb_raw(eadb, mem_ctx, attribute, filename,
-1, 100, &blob);
if (!NT_STATUS_IS_OK(status) || blob.length < 0) {
+ PyErr_SetNTSTATUS(status);
talloc_free(mem_ctx);
- PyErr_NTSTATUS_IS_ERR_RAISE(status);
+ return NULL;
}
ret = PyString_FromStringAndSize((char *)blob.data, blob.length);
talloc_free(mem_ctx);