From 31288d654552736ee96a0c7edbbc0b0cdcf1a3f5 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 14 Sep 2004 12:19:59 +0000 Subject: r2336: Add another conversion function to allow union arms that contain structures not pointers to structures. Do some renaming of hand-written functions as a result. Include lsa interface before samr interface as samr depends on some lsa structures. Build up a nice hashed index of interfaces, functions, structs and unions. Add test for samr_Connect5() function which contains a union. (This used to be commit 30f068164a5125f84a34f28ed0f2586a2bdec7e4) --- source4/scripting/swig/dcerpc.i | 8 ++++---- source4/scripting/swig/torture/samr.py | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) (limited to 'source4/scripting') diff --git a/source4/scripting/swig/dcerpc.i b/source4/scripting/swig/dcerpc.i index 6ad8f8b631..7679b773f4 100644 --- a/source4/scripting/swig/dcerpc.i +++ b/source4/scripting/swig/dcerpc.i @@ -127,7 +127,7 @@ PyObject *policy_handle_to_python(struct policy_handle *handle) return PyString_FromStringAndSize((char *)handle, sizeof(*handle)); } -struct security_descriptor *security_descriptor_from_python(TALLOC_CTX *mem_ctx, PyObject *obj) +struct security_descriptor *security_descriptor_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj) { return NULL; } @@ -137,7 +137,7 @@ PyObject *security_descriptor_to_python(struct security_descriptor *obj) return Py_None; } -struct dom_sid2 *dom_sid2_from_python(TALLOC_CTX *mem_ctx, PyObject *obj) +struct dom_sid2 *dom_sid2_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj) { return NULL; } @@ -163,7 +163,7 @@ PyObject *string_to_python(char *obj) return PyString_FromString(obj); } -struct samr_Password *samr_Password_from_python(TALLOC_CTX *mem_ctx, PyObject *obj) +struct samr_Password *samr_Password_ptr_from_python(TALLOC_CTX *mem_ctx, PyObject *obj) { return NULL; } @@ -228,5 +228,5 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT, const char *username, const char *password); -%include "librpc/gen_ndr/samr.i" %include "librpc/gen_ndr/lsa.i" +%include "librpc/gen_ndr/samr.i" diff --git a/source4/scripting/swig/torture/samr.py b/source4/scripting/swig/torture/samr.py index d7edbbcef5..ca9c7e9597 100755 --- a/source4/scripting/swig/torture/samr.py +++ b/source4/scripting/swig/torture/samr.py @@ -42,6 +42,19 @@ def test_Connect(handle): result = dcerpc.samr_Connect4(pipe, r) dcerpc.samr_Close(pipe, result) + + print 'testing samr_Connect5' + + r = {} + r['system_name'] = None + r['access_mask'] = 0x02000000 + r['level'] = 1 + r['info'] = {} + r['info']['info1'] = {} + r['info']['info1']['unknown1'] = 0 + r['info']['info1']['unknown2'] = 0 + + result = dcerpc.samr_Connect5(pipe, r) # Connect to server -- cgit