[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  766d43e pys4: really return an exception if the status if not correct
      from  f0f91d0 Fix bug #8477 - Map to guest can return uninitialized blob of data.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 766d43efde768427ee2ab7fe7f1f958a794e74da
Author: Matthieu Patou <mat at matws.net>
Date:   Thu Sep 22 19:31:32 2011 -0700

    pys4: really return an exception if the status if not correct
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Fri Sep 23 06:06:57 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/ntvfs/posix/python/pyxattr_tdb.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index 2b28aca..a08557e 100644
--- a/source4/ntvfs/posix/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
@@ -60,9 +60,8 @@ 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_FromNTSTATUS(status);
 		talloc_free(mem_ctx);
-		return NULL;
+		PyErr_NTSTATUS_IS_ERR_RAISE(status);
 	}
 	talloc_free(mem_ctx);
 	Py_RETURN_NONE;
@@ -91,9 +90,8 @@ 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_FromNTSTATUS(status);
 		talloc_free(mem_ctx);
-		return NULL;
+		PyErr_NTSTATUS_IS_ERR_RAISE(status);
 	}
 	ret = PyString_FromStringAndSize((char *)blob.data, blob.length);
 	talloc_free(mem_ctx);


-- 
Samba Shared Repository