Changeset 745 for trunk/server/source4/lib/ldb/pyldb.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/lib/ldb/pyldb.h (modified) (6 diffs)

trunk/server/source4/lib/ldb/pyldb.h

@@ -2 +2 @@
    Unix SMB/CIFS implementation.
 
-   Swig interface to ldb.
+   Python interface to ldb.
 
    Copyright (C) 2007-2008 Jelmer Vernooij <jelmer@samba.org>
@@ -27 +27 @@
 #define _PYLDB_H_
 
-#include <Python.h>
 #include <talloc.h>
 
 typedef struct {
         PyObject_HEAD
+        TALLOC_CTX *mem_ctx;
         struct ldb_context *ldb_ctx;
-        TALLOC_CTX *mem_ctx;
 } PyLdbObject;
 
-PyObject *PyLdb_FromLdbContext(struct ldb_context *ldb_ctx);
 #define PyLdb_AsLdbContext(pyobj) ((PyLdbObject *)pyobj)->ldb_ctx
 #define PyLdb_Check(ob) PyObject_TypeCheck(ob, &PyLdb)
@@ -42 +40 @@
 typedef struct {
         PyObject_HEAD
+        TALLOC_CTX *mem_ctx;
         struct ldb_dn *dn;
-        TALLOC_CTX *mem_ctx;
 } PyLdbDnObject;
 
@@ -53 +51 @@
 typedef struct {
         PyObject_HEAD
+        TALLOC_CTX *mem_ctx;
         struct ldb_message *msg;
-        TALLOC_CTX *mem_ctx;
 } PyLdbMessageObject;
 #define PyLdbMessage_Check(ob) PyObject_TypeCheck(ob, &PyLdbMessage)
@@ -61 +59 @@
 typedef struct {
         PyObject_HEAD
+        TALLOC_CTX *mem_ctx;
         struct ldb_module *mod;
-        TALLOC_CTX *mem_ctx;
 } PyLdbModuleObject;
-PyObject *PyLdbMessage_FromMessage(struct ldb_message *message);
-PyObject *PyLdbModule_FromModule(struct ldb_module *mod);
 #define PyLdbModule_AsModule(pyobj) ((PyLdbModuleObject *)pyobj)->mod
 
 typedef struct {
-        PyObject_HEAD   
+        PyObject_HEAD
+        TALLOC_CTX *mem_ctx;
         struct ldb_message_element *el;
-        TALLOC_CTX *mem_ctx;
 } PyLdbMessageElementObject;
-struct ldb_message_element *PyObject_AsMessageElement(TALLOC_CTX *mem_ctx, PyObject *obj, int flags, const char *name);
-PyObject *PyLdbMessageElement_FromMessageElement(struct ldb_message_element *, TALLOC_CTX *mem_ctx);
 #define PyLdbMessageElement_AsMessageElement(pyobj) ((PyLdbMessageElementObject *)pyobj)->el
 #define PyLdbMessageElement_Check(ob) PyObject_TypeCheck(ob, &PyLdbMessageElement)
@@ -80 +74 @@
 typedef struct {
         PyObject_HEAD
+        TALLOC_CTX *mem_ctx;
         struct ldb_parse_tree *tree;
+} PyLdbTreeObject;
+#define PyLdbTree_AsTree(pyobj) ((PyLdbTreeObject *)pyobj)->tree
+
+typedef struct {
+        PyObject_HEAD
         TALLOC_CTX *mem_ctx;
-} PyLdbTreeObject;
-PyObject *PyLdbTree_FromTree(struct ldb_parse_tree *);
-#define PyLdbTree_AsTree(pyobj) ((PyLdbTreeObject *)pyobj)->tree
+        PyObject *msgs;
+        PyObject *referals;
+        PyObject *controls;
+} PyLdbResultObject;
+
+typedef struct {
+        PyObject_HEAD
+        TALLOC_CTX *mem_ctx;
+        struct ldb_control *data;
+} PyLdbControlObject;
 
 #define PyErr_LDB_ERROR_IS_ERR_RAISE(err,ret,ldb) \