s4:auth Move struct auth_usersupplied_info to a common location

[samba.git] / lib / talloc / pytalloc.c

diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 30da9ee5c2b964d5a07f9d1ecb793de0adde4cb5..5ed88eca8897a5bcf677ddc90317b95c27e9f02b 100644 (file)
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -17,9 +17,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <Python.h>
 #include "replace.h"
 #include <talloc.h>
-#include <pytalloc.h>
+#include "pytalloc.h"
 
 /**
  * Simple dealloc for talloc-wrapping PyObjects
@@ -35,8 +36,28 @@ void py_talloc_dealloc(PyObject* self)
 /**
  * Import an existing talloc pointer into a Python object.
  */
-PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, 
+PyObject *py_talloc_steal_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, 
                                                   void *ptr)
+{
+       py_talloc_Object *ret = (py_talloc_Object *)py_type->tp_alloc(py_type, 0);
+       ret->talloc_ctx = talloc_new(NULL);
+       if (ret->talloc_ctx == NULL) {
+               return NULL;
+       }
+       if (talloc_steal(ret->talloc_ctx, mem_ctx) == NULL) {
+               return NULL;
+       }
+       ret->ptr = ptr;
+       return (PyObject *)ret;
+}
+
+
+/**
+ * Import an existing talloc pointer into a Python object, leaving the
+ * original parent, and creating a reference to the object in the python
+ * object
+ */
+PyObject *py_talloc_reference_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, void *ptr)
 {
        py_talloc_Object *ret = (py_talloc_Object *)py_type->tp_alloc(py_type, 0);
        ret->talloc_ctx = talloc_new(NULL);
@@ -58,6 +79,16 @@ PyObject *py_talloc_default_repr(PyObject *obj)
        py_talloc_Object *talloc_obj = (py_talloc_Object *)obj;
        PyTypeObject *type = (PyTypeObject*)PyObject_Type(obj);
 
-       return PyString_FromFormat("<%s talloc object at 0x%x>", 
-                                  type->tp_name, (intptr_t)talloc_obj->ptr);
+       return PyString_FromFormat("<%s talloc object at 0x%p>", 
+                                  type->tp_name, talloc_obj->ptr);
+}
+
+static void py_cobject_talloc_free(void *ptr)
+{
+       talloc_free(ptr);
+}
+
+PyObject *PyCObject_FromTallocPtr(void *ptr)
+{
+       return PyCObject_FromVoidPtr(ptr, py_cobject_talloc_free);
 }