[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  a68eb37... s4:librpc/rpc: the python bindings should use !NT_STATUS_IS_OK instead of NT_STATUS_IS_ERR
       via  59b1078... s4:librpc/rpc: make PyErr_SetDCERPCStatus() static
      from  84c901a... s4:"samdb_server_site_name" uses - proof for out of memory

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


- Log -----------------------------------------------------------------
commit a68eb378a584c638d81f2e1ec645a318e37f103f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Apr 13 09:07:21 2010 +0200

    s4:librpc/rpc: the python bindings should use !NT_STATUS_IS_OK instead of NT_STATUS_IS_ERR
    
    Everything but NT_STATUS_OK is an error here.
    
    metze

commit 59b1078ec5a074bb812546329a12ea3941ab11ef
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Apr 13 09:06:38 2010 +0200

    s4:librpc/rpc: make PyErr_SetDCERPCStatus() static
    
    metze

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

Summary of changes:
 source4/librpc/rpc/pyrpc.c |   12 +++++++-----
 source4/librpc/rpc/pyrpc.h |    2 --
 2 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c
index 9a6aa0d..718c749 100644
--- a/source4/librpc/rpc/pyrpc.c
+++ b/source4/librpc/rpc/pyrpc.c
@@ -26,6 +26,8 @@
 #include "param/pyparam.h"
 #include "auth/credentials/pycredentials.h"
 
+static void PyErr_SetDCERPCStatus(struct dcerpc_pipe *p, NTSTATUS status);
+
 static PyObject *py_dcerpc_run_function(dcerpc_InterfaceObject *iface,
 					const struct PyNdrRpcMethodDef *md,
 					PyObject *args, PyObject *kwargs)
@@ -58,7 +60,7 @@ static PyObject *py_dcerpc_run_function(dcerpc_InterfaceObject *iface,
 	}
 
 	status = md->call(iface->binding_handle, mem_ctx, r);
-	if (NT_STATUS_IS_ERR(status)) {
+	if (!NT_STATUS_IS_OK(status)) {
 		PyErr_SetDCERPCStatus(iface->pipe, status);
 		talloc_free(mem_ctx);
 		return NULL;
@@ -203,7 +205,7 @@ static PyMemberDef dcerpc_interface_members[] = {
 	{ NULL }
 };
 
-void PyErr_SetDCERPCStatus(struct dcerpc_pipe *p, NTSTATUS status)
+static void PyErr_SetDCERPCStatus(struct dcerpc_pipe *p, NTSTATUS status)
 {
 	if (p != NULL && NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
 		const char *errstr = dcerpc_errstr(NULL, p->last_fault_code);
@@ -246,7 +248,7 @@ static PyObject *py_iface_request(PyObject *self, PyObject *args, PyObject *kwar
 	status = dcerpc_request(iface->pipe, object?&object_guid:NULL,
 				opnum, mem_ctx, &data_in, &data_out);
 
-	if (NT_STATUS_IS_ERR(status)) {
+	if (!NT_STATUS_IS_OK(status)) {
 		PyErr_SetDCERPCStatus(iface->pipe, status);
 		talloc_free(mem_ctx);
 		return NULL;
@@ -286,7 +288,7 @@ static PyObject *py_iface_alter_context(PyObject *self, PyObject *args, PyObject
 	status = dcerpc_alter_context(iface->pipe, iface->pipe, &abstract_syntax, 
 				      &transfer_syntax);
 
-	if (NT_STATUS_IS_ERR(status)) {
+	if (!NT_STATUS_IS_OK(status)) {
 		PyErr_SetDCERPCStatus(iface->pipe, status);
 		return NULL;
 	}
@@ -447,7 +449,7 @@ static PyObject *dcerpc_interface_new(PyTypeObject *self, PyObject *args, PyObje
 			     table, credentials, event_ctx, lp_ctx);
 	}
 
-	if (NT_STATUS_IS_ERR(status)) {
+	if (!NT_STATUS_IS_OK(status)) {
 		PyErr_SetDCERPCStatus(ret->pipe, status);
 		talloc_free(mem_ctx);
 		return NULL;
diff --git a/source4/librpc/rpc/pyrpc.h b/source4/librpc/rpc/pyrpc.h
index 0cc70e8..9d8822c 100644
--- a/source4/librpc/rpc/pyrpc.h
+++ b/source4/librpc/rpc/pyrpc.h
@@ -53,8 +53,6 @@ PyAPI_DATA(PyTypeObject) dcerpc_InterfaceType;
 #define PyErr_SetNdrError(err) \
 		PyErr_SetObject(PyExc_RuntimeError, PyErr_FromNdrError(err))
 
-void PyErr_SetDCERPCStatus(struct dcerpc_pipe *p, NTSTATUS status);
-
 typedef NTSTATUS (*py_dcerpc_call_fn) (struct dcerpc_binding_handle *, TALLOC_CTX *, void *);
 typedef bool (*py_data_pack_fn) (PyObject *args, PyObject *kwargs, void *r);
 typedef PyObject *(*py_data_unpack_fn) (void *r);


-- 
Samba Shared Repository