summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/misc.i
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-25 06:38:05 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-25 06:38:05 +0200
commit521354e4b328af321ee223a77339bc045c074d18 (patch)
tree12d452f761a386b07f067e19374d11ef6fad4793 /source4/scripting/python/misc.i
parent1b5acdb93b2febab2d26862a1cd2c7614d558478 (diff)
parent74126bc6d0211a7674156dfda8ab13054b403a1d (diff)
downloadsamba-521354e4b328af321ee223a77339bc045c074d18.tar.gz
samba-521354e4b328af321ee223a77339bc045c074d18.tar.xz
samba-521354e4b328af321ee223a77339bc045c074d18.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-pyirpc
(This used to be commit 0a9330ee2a38bff13bf9af48114e6eecd962680b)
Diffstat (limited to 'source4/scripting/python/misc.i')
-rw-r--r--source4/scripting/python/misc.i7
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index 56b862552ab..1d331215b5f 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -35,7 +35,7 @@
%import "../../auth/credentials/credentials.i"
%import "../../param/param.i"
%import "../../libcli/security/security.i"
-%import "../../libcli/util/errors.i"
+%include "../../libcli/util/errors.i"
%feature("docstring") generate_random_str "S.random_password(len) -> string\n" \
"Generate random password with specified length.";
@@ -97,7 +97,6 @@ bool dsdb_set_ntds_invocation_id(struct ldb_context *ldb, const char *guid)
}
%}
-char *private_path(TALLOC_CTX* mem_ctx,
- struct loadparm_context *lp_ctx,
- const char *name);
+char *private_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
+ const char *name);