From 017fbcdd101b3e8503ce643202fdbaa6d076a995 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 17 Jan 2011 16:21:28 +1100 Subject: s4-pyauth Use py_talloc_get_type() for greater talloc binding safety This does a talloc check of the returned pointer before casting it. Andrew Bartlett --- source4/auth/gensec/pygensec.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'source4/auth/gensec') diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c index e16ba37ca9..483a50cfcd 100644 --- a/source4/auth/gensec/pygensec.c +++ b/source4/auth/gensec/pygensec.c @@ -24,6 +24,7 @@ #include "scripting/python/modules.h" #include "lib/talloc/pytalloc.h" #include +#include "librpc/rpc/pyrpc_util.h" static PyObject *py_get_name_by_authtype(PyObject *self, PyObject *args) { @@ -34,7 +35,7 @@ static PyObject *py_get_name_by_authtype(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "i", &type)) return NULL; - security = (struct gensec_security *)py_talloc_get_ptr(self); + security = py_talloc_get_type(self, struct gensec_security); name = gensec_get_name_by_authtype(security, type); if (name == NULL) @@ -132,7 +133,8 @@ static PyObject *py_gensec_start_client(PyTypeObject *type, PyObject *args, PyOb static PyObject *py_gensec_session_info(PyObject *self) { NTSTATUS status; - struct gensec_security *security = (struct gensec_security *)py_talloc_get_ptr(self); + PyObject *py_session_info; + struct gensec_security *security = py_talloc_get_type(self, struct gensec_security); struct auth_session_info *info; if (security->ops == NULL) { PyErr_SetString(PyExc_RuntimeError, "no mechanism selected"); @@ -144,14 +146,15 @@ static PyObject *py_gensec_session_info(PyObject *self) return NULL; } - /* FIXME */ - Py_RETURN_NONE; + py_session_info = py_return_ndr_struct("samba.auth", "session_info", + info, info); + return py_session_info; } static PyObject *py_gensec_start_mech_by_name(PyObject *self, PyObject *args) { char *name; - struct gensec_security *security = (struct gensec_security *)py_talloc_get_ptr(self); + struct gensec_security *security = py_talloc_get_type(self, struct gensec_security); NTSTATUS status; if (!PyArg_ParseTuple(args, "s", &name)) @@ -169,7 +172,7 @@ static PyObject *py_gensec_start_mech_by_name(PyObject *self, PyObject *args) static PyObject *py_gensec_start_mech_by_authtype(PyObject *self, PyObject *args) { int authtype, level; - struct gensec_security *security = (struct gensec_security *)py_talloc_get_ptr(self); + struct gensec_security *security = py_talloc_get_type(self, struct gensec_security); NTSTATUS status; if (!PyArg_ParseTuple(args, "ii", &authtype, &level)) return NULL; -- cgit