diff options
Diffstat (limited to 'source4')
-rw-r--r-- | source4/lib/registry/pyregistry.c | 14 | ||||
-rw-r--r-- | source4/librpc/ndr/py_security.c | 8 | ||||
-rwxr-xr-x | source4/scripting/python/examples/samr.py | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/source4/lib/registry/pyregistry.c b/source4/lib/registry/pyregistry.c index 30becbb1bb..f68bfd15ef 100644 --- a/source4/lib/registry/pyregistry.c +++ b/source4/lib/registry/pyregistry.c @@ -53,7 +53,7 @@ static PyObject *py_get_predefined_key_by_name(PyObject *self, PyObject *args) result = reg_get_predefined_key_by_name(ctx, name, &key); PyErr_WERROR_IS_ERR_RAISE(result); - return py_talloc_import(&PyRegistryKey, key); + return py_talloc_steal(&PyRegistryKey, key); } static PyObject *py_key_del_abs(PyObject *self, PyObject *args) @@ -84,7 +84,7 @@ static PyObject *py_get_predefined_key(PyObject *self, PyObject *args) result = reg_get_predefined_key(ctx, hkey, &key); PyErr_WERROR_IS_ERR_RAISE(result); - return py_talloc_import(&PyRegistryKey, key); + return py_talloc_steal(&PyRegistryKey, key); } static PyObject *py_diff_apply(PyObject *self, PyObject *args) @@ -140,7 +140,7 @@ static PyObject *registry_new(PyTypeObject *type, PyObject *args, PyObject *kwar struct registry_context *ctx; result = reg_open_local(NULL, &ctx); PyErr_WERROR_IS_ERR_RAISE(result); - return py_talloc_import(&PyRegistry, ctx); + return py_talloc_steal(&PyRegistry, ctx); } static PyMethodDef registry_methods[] = { @@ -299,7 +299,7 @@ static PyObject *py_open_samba(PyObject *self, PyObject *args, PyObject *kwargs) return NULL; } - return py_talloc_import(&PyRegistry, reg_ctx); + return py_talloc_steal(&PyRegistry, reg_ctx); } static PyObject *py_open_directory(PyObject *self, PyObject *args) @@ -314,7 +314,7 @@ static PyObject *py_open_directory(PyObject *self, PyObject *args) result = reg_open_directory(NULL, location, &key); PyErr_WERROR_IS_ERR_RAISE(result); - return py_talloc_import(&PyHiveKey, key); + return py_talloc_steal(&PyHiveKey, key); } static PyObject *py_create_directory(PyObject *self, PyObject *args) @@ -329,7 +329,7 @@ static PyObject *py_create_directory(PyObject *self, PyObject *args) result = reg_create_directory(NULL, location, &key); PyErr_WERROR_IS_ERR_RAISE(result); - return py_talloc_import(&PyHiveKey, key); + return py_talloc_steal(&PyHiveKey, key); } static PyObject *py_open_ldb_file(PyObject *self, PyObject *args, PyObject *kwargs) @@ -368,7 +368,7 @@ static PyObject *py_open_ldb_file(PyObject *self, PyObject *args, PyObject *kwar tevent_context_init(NULL), lp_ctx, &key); PyErr_WERROR_IS_ERR_RAISE(result); - return py_talloc_import(&PyHiveKey, key); + return py_talloc_steal(&PyHiveKey, key); } static PyObject *py_str_regtype(PyObject *self, PyObject *args) diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c index 7ac4d34baf..8ab790d470 100644 --- a/source4/librpc/ndr/py_security.c +++ b/source4/librpc/ndr/py_security.c @@ -163,7 +163,7 @@ static PyObject *py_descriptor_sacl_del(PyObject *self, PyObject *args) static PyObject *py_descriptor_new(PyTypeObject *self, PyObject *args, PyObject *kwargs) { - return py_talloc_import(self, security_descriptor_initialise(NULL)); + return py_talloc_steal(self, security_descriptor_initialise(NULL)); } static PyObject *py_descriptor_from_sddl(PyObject *self, PyObject *args) @@ -184,7 +184,7 @@ static PyObject *py_descriptor_from_sddl(PyObject *self, PyObject *args) return NULL; } - return py_talloc_import((PyTypeObject *)self, secdesc); + return py_talloc_steal((PyTypeObject *)self, secdesc); } static PyObject *py_descriptor_as_sddl(PyObject *self, PyObject *args) @@ -316,7 +316,7 @@ static PyObject *py_token_set_privilege(PyObject *self, PyObject *args) static PyObject *py_token_new(PyTypeObject *self, PyObject *args, PyObject *kwargs) { - return py_talloc_import(self, security_token_initialise(NULL)); + return py_talloc_steal(self, security_token_initialise(NULL)); } static PyMethodDef py_token_extra_methods[] = { @@ -378,7 +378,7 @@ static PyObject *py_random_sid(PyObject *self) sid = dom_sid_parse_talloc(NULL, str); talloc_free(str); - ret = py_talloc_import(&dom_sid_Type, sid); + ret = py_talloc_steal(&dom_sid_Type, sid); return ret; } diff --git a/source4/scripting/python/examples/samr.py b/source4/scripting/python/examples/samr.py index b3ea117b40..17ac354320 100755 --- a/source4/scripting/python/examples/samr.py +++ b/source4/scripting/python/examples/samr.py @@ -24,7 +24,7 @@ import sys sys.path.insert(0, "bin/python") -from samba.dcerpc import samr, security, lsa +from samba.dcerpc import samr, security def display_lsa_string(str): return str.string |