From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 30 May 2008 06:19:22 +0000 (+1000)
Subject: two more places where the wrong type is passed to PyArg_ParseTupleAndKeywords()
X-Git-Tag: samba-4.0.0alpha4~9^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db6122ec104e80ee2e02b1170ff808b6456b780b;p=thirdparty%2Fsamba.git

two more places where the wrong type is passed to PyArg_ParseTupleAndKeywords()
---

diff --git a/source/lib/messaging/pymessaging.c b/source/lib/messaging/pymessaging.c
index 869508fca65..41c9c82b1f3 100644
--- a/source/lib/messaging/pymessaging.c
+++ b/source/lib/messaging/pymessaging.c
@@ -162,11 +162,11 @@ static void py_msg_callback_wrapper(struct messaging_context *msg, void *private
 static PyObject *py_messaging_register(PyObject *self, PyObject *args, PyObject *kwargs)
 {
 	messaging_Object *iface = (messaging_Object *)self;
-	uint32_t msg_type = -1;
+	int msg_type = -1;
 	PyObject *callback;
 	NTSTATUS status;
 	const char *kwnames[] = { "callback", "msg_type", NULL };
-
+	
 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i:send", 
 		discard_const_p(char *, kwnames), &callback, &msg_type)) {
 		return NULL;
@@ -175,8 +175,10 @@ static PyObject *py_messaging_register(PyObject *self, PyObject *args, PyObject
 	Py_INCREF(callback);
 
 	if (msg_type == -1) {
+		uint32_t msg_type32 = msg_type;
 		status = messaging_register_tmp(iface->msg_ctx, callback,
-						py_msg_callback_wrapper, &msg_type);
+						py_msg_callback_wrapper, &msg_type32);
+		msg_type = msg_type32;
 	} else {
 		status = messaging_register(iface->msg_ctx, callback,
 				    msg_type, py_msg_callback_wrapper);
@@ -192,7 +194,7 @@ static PyObject *py_messaging_register(PyObject *self, PyObject *args, PyObject
 static PyObject *py_messaging_deregister(PyObject *self, PyObject *args, PyObject *kwargs)
 {
 	messaging_Object *iface = (messaging_Object *)self;
-	uint32_t msg_type = -1;
+	int msg_type = -1;
 	PyObject *callback;
 	const char *kwnames[] = { "callback", "msg_type", NULL };