diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:57:03 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:57:03 +0200 |
commit | 27dce768d3801409a734f24765ea92e67ffbd014 (patch) | |
tree | b55ed17bb224df5396d6ec930e54c34506f8f04b /source4/lib/registry/registry.i | |
parent | 61013deff80dbe3a3dfaa7b5060609500f1f63fa (diff) | |
download | samba-27dce768d3801409a734f24765ea92e67ffbd014.tar.gz samba-27dce768d3801409a734f24765ea92e67ffbd014.tar.bz2 samba-27dce768d3801409a734f24765ea92e67ffbd014.zip |
Remove more usages of global_loadparm.
Diffstat (limited to 'source4/lib/registry/registry.i')
-rw-r--r-- | source4/lib/registry/registry.i | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source4/lib/registry/registry.i b/source4/lib/registry/registry.i index fe3a81d889..b33b99c0c2 100644 --- a/source4/lib/registry/registry.i +++ b/source4/lib/registry/registry.i @@ -31,6 +31,7 @@ #include "registry.h" #include "param/param.h" #include "events/events.h" +#include "scripting/python/modules.h" typedef struct registry_context reg; typedef struct hive_key hive_key; @@ -62,6 +63,14 @@ const char *str_regtype(int type); $result = SWIG_NewPointerObj(*$1, SWIGTYPE_p_registry_context, 0); } +%typemap(in,noblock=1) struct smb_iconv_convenience * { + $1 = py_iconv_convenience(NULL); +} + +%typemap(freearg,noblock=1) struct smb_iconv_convenience * { + talloc_free($1); +} + %rename(Registry) reg_open_local; WERROR reg_open_local(TALLOC_CTX *parent_ctx, struct registry_context **ctx); @@ -111,7 +120,7 @@ typedef struct registry_context { %feature("docstring") diff_apply "S.diff_apply(filename) -> None\n" "Apply the diff from the specified file"; - WERROR diff_apply(const char *filename); + WERROR diff_apply(struct smb_iconv_convenience *ic, const char *filename); WERROR generate_diff(struct registry_context *ctx2, const struct reg_diff_callbacks *callbacks, void *callback_data); |