summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-04-04 00:40:01 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-04-04 00:40:01 +0200
commit2a67eda98f88f132443bc2b81ca2686bcc1775a6 (patch)
treee97353e4510d4dbd8443de8e93aa9ce3a379c4a2 /source4/scripting/python
parentccd954f2a7534cc27afd17b23e2fc838e10cf6b3 (diff)
downloadsamba-2a67eda98f88f132443bc2b81ca2686bcc1775a6.tar.gz
samba-2a67eda98f88f132443bc2b81ca2686bcc1775a6.tar.bz2
samba-2a67eda98f88f132443bc2b81ca2686bcc1775a6.zip
s4-python: Move set_opaque_integer -> dsdb.
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/pyglue.c62
-rw-r--r--source4/scripting/python/samba/__init__.py2
2 files changed, 1 insertions, 63 deletions
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c
index 852231f681..d852b3db6a 100644
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -277,63 +277,6 @@ static PyObject *py_dsdb_set_ntds_invocation_id(PyObject *self, PyObject *args)
Py_RETURN_NONE;
}
-static PyObject *py_dsdb_set_opaque_integer(PyObject *self, PyObject *args)
-{
- PyObject *py_ldb;
- int value;
- int *old_val, *new_val;
- char *py_opaque_name, *opaque_name_talloc;
- struct ldb_context *ldb;
- TALLOC_CTX *tmp_ctx;
-
- if (!PyArg_ParseTuple(args, "Osi", &py_ldb, &py_opaque_name, &value))
- return NULL;
-
- PyErr_LDB_OR_RAISE(py_ldb, ldb);
-
- /* see if we have a cached copy */
- old_val = (int *)ldb_get_opaque(ldb,
- py_opaque_name);
-
- if (old_val) {
- *old_val = value;
- Py_RETURN_NONE;
- }
-
- tmp_ctx = talloc_new(ldb);
- if (tmp_ctx == NULL) {
- goto failed;
- }
-
- new_val = talloc(tmp_ctx, int);
- if (!new_val) {
- goto failed;
- }
-
- opaque_name_talloc = talloc_strdup(tmp_ctx, py_opaque_name);
- if (!opaque_name_talloc) {
- goto failed;
- }
-
- *new_val = value;
-
- /* cache the domain_sid in the ldb */
- if (ldb_set_opaque(ldb, opaque_name_talloc, new_val) != LDB_SUCCESS) {
- goto failed;
- }
-
- talloc_steal(ldb, new_val);
- talloc_steal(ldb, opaque_name_talloc);
- talloc_free(tmp_ctx);
-
- Py_RETURN_NONE;
-
-failed:
- talloc_free(tmp_ctx);
- PyErr_SetString(PyExc_RuntimeError, "Failed to set opaque integer into the ldb!\n");
- return NULL;
-}
-
static PyObject *py_dsdb_set_global_schema(PyObject *self, PyObject *args)
{
PyObject *py_ldb;
@@ -486,11 +429,8 @@ static PyObject *py_dsdb_load_partition_usn(PyObject *self, PyObject *args)
return result;
-
}
-
-
static PyObject *py_samdb_ntds_invocation_id(PyObject *self, PyObject *args)
{
PyObject *py_ldb, *result;
@@ -642,8 +582,6 @@ static PyMethodDef py_misc_methods[] = {
"Set the right Samba casefolding function for UTF8 charset." },
{ "dsdb_set_ntds_invocation_id", (PyCFunction)py_dsdb_set_ntds_invocation_id, METH_VARARGS,
NULL },
- { "dsdb_set_opaque_integer", (PyCFunction)py_dsdb_set_opaque_integer, METH_VARARGS,
- NULL },
{ "dsdb_set_global_schema", (PyCFunction)py_dsdb_set_global_schema, METH_VARARGS,
NULL },
{ "dsdb_set_schema_from_ldif", (PyCFunction)py_dsdb_set_schema_from_ldif, METH_VARARGS,
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index dd876f910d..d122523f61 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -321,7 +321,7 @@ class Ldb(ldb.Ldb):
:param name: The name for the opaque value
:param value: The integer value
"""
- glue.dsdb_set_opaque_integer(self, name, value)
+ dsdb.dsdb_set_opaque_integer(self, name, value)
def substitute_var(text, values):